From 2c2d2bbff3943e06f0a62c9589b53697c75aabe9 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Tue, 11 Jun 2019 16:49:05 +0000 Subject: Docs: CI - link videos --- doc/ci/README.md | 8 ++++---- .../ci_cd_for_external_repos/github_integration.md | 22 ++++++++++++---------- doc/ci/ci_cd_for_external_repos/index.md | 4 ++-- doc/ci/examples/README.md | 6 ++++++ doc/ci/introduction/index.md | 3 +++ doc/integration/jenkins.md | 5 +++++ 6 files changed, 32 insertions(+), 16 deletions(-) diff --git a/doc/ci/README.md b/doc/ci/README.md index 52830a99961..8b70699cdb5 100644 --- a/doc/ci/README.md +++ b/doc/ci/README.md @@ -29,11 +29,11 @@ the development cycle, ensuring that all the code deployed to production complies with the code standards you established for your app. -For a: +For a complete overview of these methodologies and GitLab CI/CD, +read the [Introduction to CI/CD with GitLab](introduction/index.md). -- Complete overview of these methodologies and GitLab CI/CD, - read the [Introduction to CI/CD with GitLab](introduction/index.md). -- Video demonstration of GitLab CI/CD, see [Demo: CI/CD with GitLab](https://www.youtube.com/watch?v=1iXFbchozdY). + +For a video demonstration of GitLab CI/CD, see [Demo: CI/CD with GitLab](https://www.youtube.com/watch?v=1iXFbchozdY). ## Getting started diff --git a/doc/ci/ci_cd_for_external_repos/github_integration.md b/doc/ci/ci_cd_for_external_repos/github_integration.md index 612dcc93bc1..2a8ddb610f9 100644 --- a/doc/ci/ci_cd_for_external_repos/github_integration.md +++ b/doc/ci/ci_cd_for_external_repos/github_integration.md @@ -5,24 +5,17 @@ type: howto # Using GitLab CI/CD with a GitHub repository **[PREMIUM]** GitLab CI/CD can be used with **GitHub.com** and **GitHub Enterprise** by -creating a [CI/CD project](https://docs.gitlab.com/ee/user/project/ci_cd_for_external_repo.html) to connect your GitHub repository to +creating a [CI/CD project](index.md) to connect your GitHub repository to GitLab. -NOTE: **Note:** -To use **GitHub Enterprise** with **GitLab.com** you should use the -manual method. + +Watch a video on [Using GitLab CI/CD pipelines with GitHub repositories](https://www.youtube.com/watch?v=qgl3F2j-1cI). ## Connect with GitHub integration If the [GitHub integration](../../integration/github.md) has been enabled by your GitLab administrator: -NOTE: **Note:** -Due to a 10-token limitation on the [GitHub OAuth Implementation](https://developer.github.com/apps/building-oauth-apps/authorizing-oauth-apps/#creating-multiple-tokens-for-oauth-apps), -if you import more than 10 times, your oldest imported project's token will be -revoked. See issue [#9147](https://gitlab.com/gitlab-org/gitlab-ee/issues/9147) -for more information. - 1. In GitLab create a **CI/CD for external repo** project and select **GitHub**. @@ -42,6 +35,12 @@ GitLab will: 1. Enable [GitHub project integration](https://docs.gitlab.com/ee/user/project/integrations/github.html). 1. Create a web hook on GitHub to notify GitLab of new commits. +CAUTION: **Caution:** +Due to a 10-token limitation on the [GitHub OAuth Implementation](https://developer.github.com/apps/building-oauth-apps/authorizing-oauth-apps/#creating-multiple-tokens-for-oauth-apps), +if you import more than 10 times, your oldest imported project's token will be +revoked. See issue [#9147](https://gitlab.com/gitlab-org/gitlab-ee/issues/9147) +for more information. + ## Connect with Personal Access Token NOTE: **Note:** @@ -79,6 +78,9 @@ GitLab will: ## Connect manually +NOTE: **Note:** +To use **GitHub Enterprise** with **GitLab.com** use this method. + If the [GitHub integration](../../integration/github.md) is not enabled, or is enabled for a different GitHub instance, you GitLab CI/CD can be manually enabled for your repository: diff --git a/doc/ci/ci_cd_for_external_repos/index.md b/doc/ci/ci_cd_for_external_repos/index.md index 5de88412121..d46e451c609 100644 --- a/doc/ci/ci_cd_for_external_repos/index.md +++ b/doc/ci/ci_cd_for_external_repos/index.md @@ -4,12 +4,12 @@ type: index, howto # GitLab CI/CD for external repositories **[PREMIUM]** +>[Introduced][ee-4642] in [GitLab Premium][eep] 10.6. + NOTE: **Note:** This feature [is available for free](https://about.gitlab.com/2019/03/21/six-more-months-ci-cd-github/) to GitLab.com users until September 22nd, 2019. ->[Introduced][ee-4642] in [GitLab Premium][eep] 10.6. - GitLab CI/CD can be used with: - [GitHub](github_integration.md). diff --git a/doc/ci/examples/README.md b/doc/ci/examples/README.md index 11b9fa368ed..d2ea30839a4 100644 --- a/doc/ci/examples/README.md +++ b/doc/ci/examples/README.md @@ -63,6 +63,12 @@ For examples of setting up GitLab CI/CD for cloud-based environments, see: - [How to autoscale continuous deployment with GitLab Runner on DigitalOcean](https://about.gitlab.com/2018/06/19/autoscale-continuous-deployment-gitlab-runner-digital-ocean/) - [How to create a CI/CD pipeline with Auto Deploy to Kubernetes using GitLab and Helm](https://about.gitlab.com/2017/09/21/how-to-create-ci-cd-pipeline-with-autodeploy-to-kubernetes-using-gitlab-and-helm/) + +See also the following video overviews: + +- [Containers, Schedulers, and GitLab CI](https://www.youtube.com/watch?v=d-9awBxEbvQ). +- [Deploying to IBM Cloud with GitLab CI/CD](https://www.youtube.com/watch?v=6ZF4vgKMd-g). + ### Customer stories For some customer experiences with GitLab CI/CD, see: diff --git a/doc/ci/introduction/index.md b/doc/ci/introduction/index.md index bd2b9b099f2..1687716df2e 100644 --- a/doc/ci/introduction/index.md +++ b/doc/ci/introduction/index.md @@ -205,6 +205,9 @@ With GitLab CI/CD you can also: To see all CI/CD features, navigate back to the [CI/CD index](../README.md). + +Watch the video [GitLab CI Live Demo](https://www.youtube.com/watch?v=pBe4t1CD8Fc) with a deeper overview of GitLab CI/CD. + ### Setting up GitLab CI/CD for the first time To get started with GitLab CI/CD, you need to familiarize yourself diff --git a/doc/integration/jenkins.md b/doc/integration/jenkins.md index f60333aa07c..afe1268555a 100644 --- a/doc/integration/jenkins.md +++ b/doc/integration/jenkins.md @@ -19,6 +19,9 @@ GitLab's Jenkins integration allows you to trigger a Jenkins build when you push code to a repository, or when a merge request is created. Additionally, it shows the pipeline status on merge requests widgets and on the project's home page. + +For a video overview, see [Migrating from Jenkins to GitLab](https://www.youtube.com/watch?v=RlEVGOpYF5Y). + ## Use cases - Suppose you are new to GitLab, and want to keep using Jenkins until you prepare @@ -30,6 +33,8 @@ running with Jenkins, but view the results in your project's repository in GitLa therefore, you opt for keep using Jenkins to build your apps. Show the results of your pipelines directly in GitLab. +For a real use case, read the blog post [Continuous integration: From Jenkins to GitLab using Docker](https://about.gitlab.com/2017/07/27/docker-my-precious/). + ## Requirements * [Jenkins GitLab Plugin](https://wiki.jenkins.io/display/JENKINS/GitLab+Plugin) -- cgit v1.2.1