summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Pundsack <mpundsack@gitlab.com>2017-09-07 14:15:03 -0500
committerMark Pundsack <mpundsack@gitlab.com>2017-09-07 14:15:03 -0500
commit164db12ed3ad3d1cc8f761738f323a30202af3da (patch)
tree58bfa17c662ec614feb969ce8010c11b8506b48f
parent45b65ac8653e3a99276ead028852329ee88005f7 (diff)
downloadgitlab-ce-docs/autodevops.tar.gz
Minor changesdocs/autodevops
-rw-r--r--doc/topics/autodevops/index.md24
-rw-r--r--doc/topics/autodevops/quick_start_guide.md6
2 files changed, 16 insertions, 14 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index fcb9cb90b3a..e9f81c23eb0 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -3,8 +3,8 @@
> [Introduced][ce-37115] in GitLab 10.0. Auto DevOps is currently in Beta and
**not recommended for production use**. Access to the container registry is only
available while the Pipeline is running. Restarting a pod, scaling a service, or
-other actions which require on-going access **will fail**. On-going secure
-access is planned for a subsequent release.
+other actions which require on-going access **will fail** even for public
+projects. On-going secure access is planned for a subsequent release.
Auto DevOps brings best practices to your project in an easy and default way. A
typical web project starts with Continuous Integration (CI), then adds automated
@@ -135,11 +135,12 @@ tests, it's up to you to add them.
### Auto Code Quality
-In the Auto Code Quality step, the open source `codeclimate` image runs static
-analysis and other code checks on the current code, creating a report that is
-uploaded as an artifact. In GitLab EE, differences between source and target
-branches are shown in the merge request widget. *GitLab is in no way affiliated
-with Code Climate.*
+In the Auto Code Quality step, the open source
+[`codeclimate`](https://hub.docker.com/r/codeclimate/codeclimate/) image runs
+static analysis and other code checks on the current code, creating a report
+that is uploaded as an artifact. In GitLab EE, differences between source and
+target branches are shown in the merge request widget. *GitLab is in no way
+affiliated with Code Climate.*
### Auto Review Apps
@@ -243,7 +244,7 @@ file in it, Auto DevOps will detect the chart and use it instead of the default
chart. This can be a great way to control exactly how your application is
deployed.
-**Project variable** - Create a project variable `AUTO_DEPLOY_CHART` with the
+**Project variable** - Create a project variable `AUTO_DEVOPS_CHART` with the
URL of a custom chart to use.
### Enable staging, canaries, and more with custom `.gitlab-ci.yml`
@@ -251,9 +252,10 @@ URL of a custom chart to use.
If you want to modify the CI/CD pipeline used by Auto DevOps, you can copy the
Auto DevOps template into your project's repo and edit as you see fit.
-From your project home page, click on the `Set up CI` button and select
-"Auto DevOps" from the template dropdown. You will then be able to edit or add
-any jobs needed.
+From your project home page, click on the `Set up CI` button, or click on the `+`
+button and `New file` and pick `.gitlab-ci.yml` as the template type, or view an
+existing `.gitlab-ci.yml` file. Then select "Auto DevOps" from the template
+dropdown. You will then be able to edit or add any jobs needed.
For example, if you want deploys to go to a staging environment instead of
directly to a production environment, you can enable the `staging` job by
diff --git a/doc/topics/autodevops/quick_start_guide.md b/doc/topics/autodevops/quick_start_guide.md
index 4ebae402ad2..2c6c3928945 100644
--- a/doc/topics/autodevops/quick_start_guide.md
+++ b/doc/topics/autodevops/quick_start_guide.md
@@ -1,7 +1,7 @@
# Auto DevOps: quick start guide
> [Introduced][ce-37115] in GitLab 10.0. Auto DevOps is currently in Beta and
-not recommended for production use.
+**not recommended for production use**.
This is a step-by-step guide to deploying a project hosted on GitLab.com to
Google Cloud, using Auto DevOps.
@@ -48,7 +48,7 @@ Once you have the Kubernetes Dashboard interface running, you should visit `Secr
![connect to cluster](img/guide_secret.png)
-You need to copy-paste the ca.crt and token into your project on GitLab.com in the Kubernetes integration page under project `Settings` > `Integrations` > `Project services` > `Kubernetes`. Don't actually copy the namespace though. Each project should have a unique namespace, and by leaving it blank, GitLab will create one for you.
+You need to copy-paste the ca.crt and token into your project on GitLab.com in the Kubernetes integration page under project **Settings** > **Integrations** > **Project services** > **Kubernetes**. Don't actually copy the namespace though. Each project should have a unique namespace, and by leaving it blank, GitLab will create one for you.
![connect to cluster](img/guide_integration.png)
@@ -84,7 +84,7 @@ Use `nslookup minimal-ruby-app-staging.<yourdomain>` to confirm that domain is a
## Set up Auto DevOps
-In your GitLab.com project, go to "Settings" > "CI/CD" and find the Auto DevOps section. Select "Enable Auto DevOps", add in your base domain, and save.
+In your GitLab.com project, go to **Settings** > **CI/CD** and find the Auto DevOps section. Select "Enable Auto DevOps", add in your base domain, and save.
![auto devops settings](img/auto_devops_settings.png)