Commit 930e98ac authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'selhorn-remove-spaces-cicd' into 'master'

Removed extra spaces between CI and CD

See merge request gitlab-org/gitlab!56048
parents 92b2eb67 3dd49854
...@@ -42,7 +42,7 @@ Some credentials are required to be able to run `aws` commands: ...@@ -42,7 +42,7 @@ Some credentials are required to be able to run `aws` commands:
NOTE: NOTE:
A new **Access key ID** and **Secret access key** are generated. Please take a note of them right away. A new **Access key ID** and **Secret access key** are generated. Please take a note of them right away.
1. In your GitLab project, go to **Settings > CI / CD**. Set the following as 1. In your GitLab project, go to **Settings > CI/CD**. Set the following as
[CI/CD variables](../variables/README.md) [CI/CD variables](../variables/README.md)
(see table below): (see table below):
......
...@@ -116,7 +116,7 @@ We also use two secure variables: ...@@ -116,7 +116,7 @@ We also use two secure variables:
## Storing API keys ## Storing API keys
To add secure variables, navigate to your project's To add secure variables, navigate to your project's
**Settings > CI / CD > Variables**. The variables that are defined **Settings > CI/CD > Variables**. The variables that are defined
in the project settings are sent along with the build script to the runner. in the project settings are sent along with the build script to the runner.
The secure variables are stored out of the repository. Never store secrets in The secure variables are stored out of the repository. Never store secrets in
your project's `.gitlab-ci.yml`. It is also important that the secret's value your project's `.gitlab-ci.yml`. It is also important that the secret's value
......
...@@ -91,7 +91,7 @@ As part of publishing a package, semantic-release increases the version number i ...@@ -91,7 +91,7 @@ As part of publishing a package, semantic-release increases the version number i
1. Navigate to **Project > Settings > Access Tokens**. 1. Navigate to **Project > Settings > Access Tokens**.
1. Give the token a name, and select the `api` scope. 1. Give the token a name, and select the `api` scope.
1. Click **Create project access token** and copy its value. 1. Click **Create project access token** and copy its value.
1. Navigate to **Project > Settings > CI / CD > Variables**. 1. Navigate to **Project > Settings > CI/CD > Variables**.
1. Click **Add Variable**. 1. Click **Add Variable**.
1. In the **Key** field, enter `GITLAB_TOKEN`. In the **Value** field, paste the token created above. Check the **Mask variable** option and click **Add variable**. 1. In the **Key** field, enter `GITLAB_TOKEN`. In the **Value** field, paste the token created above. Check the **Mask variable** option and click **Add variable**.
......
...@@ -314,7 +314,7 @@ Some features are not implemented yet. For example, support for environments. ...@@ -314,7 +314,7 @@ Some features are not implemented yet. For example, support for environments.
You can trigger a pipeline in your project whenever a pipeline finishes for a new You can trigger a pipeline in your project whenever a pipeline finishes for a new
tag in a different project: tag in a different project:
1. Go to the project's **Settings > CI / CD** page, and expand the **Pipeline subscriptions** section. 1. Go to the project's **Settings > CI/CD** page, and expand the **Pipeline subscriptions** section.
1. Enter the project you want to subscribe to, in the format `<namespace>/<project>`. 1. Enter the project you want to subscribe to, in the format `<namespace>/<project>`.
For example, if the project is `https://gitlab.com/gitlab-org/gitlab`, use `gitlab-org/gitlab`. For example, if the project is `https://gitlab.com/gitlab-org/gitlab`, use `gitlab-org/gitlab`.
1. Click subscribe. 1. Click subscribe.
......
...@@ -36,7 +36,7 @@ Otherwise the pipeline is not created. ...@@ -36,7 +36,7 @@ Otherwise the pipeline is not created.
To schedule a pipeline for project: To schedule a pipeline for project:
1. Navigate to the project's **CI / CD > Schedules** page. 1. Navigate to the project's **CI/CD > Schedules** page.
1. Click the **New schedule** button. 1. Click the **New schedule** button.
1. Fill in the **Schedule a new pipeline** form. 1. Fill in the **Schedule a new pipeline** form.
1. Click the **Save pipeline schedule** button. 1. Click the **Save pipeline schedule** button.
......
...@@ -82,7 +82,7 @@ directory. If needed, you can specify an alternate path and filename, including ...@@ -82,7 +82,7 @@ directory. If needed, you can specify an alternate path and filename, including
To customize the path: To customize the path:
1. Go to the project's **Settings > CI / CD**. 1. Go to the project's **Settings > CI/CD**.
1. Expand the **General pipelines** section. 1. Expand the **General pipelines** section.
1. Provide a value in the **CI/CD configuration file** field. 1. Provide a value in the **CI/CD configuration file** field.
1. Click **Save changes**. 1. Click **Save changes**.
...@@ -120,7 +120,7 @@ able to edit it. ...@@ -120,7 +120,7 @@ able to edit it.
If you use test coverage in your code, GitLab can capture its output in the If you use test coverage in your code, GitLab can capture its output in the
job log using a regular expression. job log using a regular expression.
In your project, go to **Settings > CI / CD** and expand the **General pipelines** In your project, go to **Settings > CI/CD** and expand the **General pipelines**
section. Enter the regular expression in the **Test coverage parsing** field. section. Enter the regular expression in the **Test coverage parsing** field.
Leave blank if you want to disable it or enter a Ruby regular expression. You Leave blank if you want to disable it or enter a Ruby regular expression. You
...@@ -225,7 +225,7 @@ If **Public pipelines** is disabled: ...@@ -225,7 +225,7 @@ If **Public pipelines** is disabled:
You can set pending or running pipelines to cancel automatically when a new pipeline runs on the same branch. You can enable this in the project settings: You can set pending or running pipelines to cancel automatically when a new pipeline runs on the same branch. You can enable this in the project settings:
1. Go to **Settings > CI / CD**. 1. Go to **Settings > CI/CD**.
1. Expand **General Pipelines**. 1. Expand **General Pipelines**.
1. Check the **Auto-cancel redundant pipelines** checkbox. 1. Check the **Auto-cancel redundant pipelines** checkbox.
1. Click **Save changes**. 1. Click **Save changes**.
...@@ -245,7 +245,7 @@ newer one, which may not be what you want. ...@@ -245,7 +245,7 @@ newer one, which may not be what you want.
To avoid this scenario: To avoid this scenario:
1. Go to **Settings > CI / CD**. 1. Go to **Settings > CI/CD**.
1. Expand **General pipelines**. 1. Expand **General pipelines**.
1. Check the **Skip outdated deployment jobs** checkbox. 1. Check the **Skip outdated deployment jobs** checkbox.
1. Click **Save changes**. 1. Click **Save changes**.
......
...@@ -38,7 +38,7 @@ multiple projects. ...@@ -38,7 +38,7 @@ multiple projects.
If you are using a self-managed instance of GitLab: If you are using a self-managed instance of GitLab:
- Your administrator can install and register shared runners by - Your administrator can install and register shared runners by
going to your project's **Settings > CI / CD**, expanding the **Runners** section, going to your project's **Settings > CI/CD**, expanding the **Runners** section,
and clicking **Show runner installation instructions**. and clicking **Show runner installation instructions**.
These instructions are also available [in the documentation](https://docs.gitlab.com/runner/install/index.html). These instructions are also available [in the documentation](https://docs.gitlab.com/runner/install/index.html).
- The administrator can also configure a maximum number of shared runner [pipeline minutes for - The administrator can also configure a maximum number of shared runner [pipeline minutes for
...@@ -220,7 +220,7 @@ Specific runners process jobs by using a first in, first out ([FIFO](https://en. ...@@ -220,7 +220,7 @@ Specific runners process jobs by using a first in, first out ([FIFO](https://en.
NOTE: NOTE:
Specific runners do not get shared with forked projects automatically. Specific runners do not get shared with forked projects automatically.
A fork *does* copy the CI / CD settings of the cloned repository. A fork *does* copy the CI/CD settings of the cloned repository.
#### Create a specific runner #### Create a specific runner
......
...@@ -118,7 +118,7 @@ If you change the Dockerfile configuration and rebuild the images, you can break ...@@ -118,7 +118,7 @@ If you change the Dockerfile configuration and rebuild the images, you can break
pipeline in the main `gitlab` repository as well as in `gitlab-docs`. Create an image with pipeline in the main `gitlab` repository as well as in `gitlab-docs`. Create an image with
a different name first and test it to ensure you do not break the pipelines. a different name first and test it to ensure you do not break the pipelines.
1. In [`gitlab-docs`](https://gitlab.com/gitlab-org/gitlab-docs), go to **{rocket}** **CI / CD > Pipelines**. 1. In [`gitlab-docs`](https://gitlab.com/gitlab-org/gitlab-docs), go to **{rocket}** **CI/CD > Pipelines**.
1. Click the **Run Pipeline** button. 1. Click the **Run Pipeline** button.
1. See that a new pipeline is running. The jobs that build the images are in the first 1. See that a new pipeline is running. The jobs that build the images are in the first
stage, `build-images`. You can click the pipeline number to see the larger pipeline stage, `build-images`. You can click the pipeline number to see the larger pipeline
...@@ -137,7 +137,7 @@ and deploys it to <https://docs.gitlab.com>. ...@@ -137,7 +137,7 @@ and deploys it to <https://docs.gitlab.com>.
If you need to build and deploy the site immediately (must have maintainer level permissions): If you need to build and deploy the site immediately (must have maintainer level permissions):
1. In [`gitlab-docs`](https://gitlab.com/gitlab-org/gitlab-docs), go to **{rocket}** **CI / CD > Schedules**. 1. In [`gitlab-docs`](https://gitlab.com/gitlab-org/gitlab-docs), go to **{rocket}** **CI/CD > Schedules**.
1. For the `Build docs.gitlab.com every 4 hours` scheduled pipeline, click the **play** (**{play}**) button. 1. For the `Build docs.gitlab.com every 4 hours` scheduled pipeline, click the **play** (**{play}**) button.
Read more about the [deployment process](deployment_process.md). Read more about the [deployment process](deployment_process.md).
......
...@@ -80,7 +80,7 @@ the necessary CI/CD variables to deploy the Status Page to AWS S3: ...@@ -80,7 +80,7 @@ the necessary CI/CD variables to deploy the Status Page to AWS S3:
- `AWS_DEFAULT_REGION` - The AWS region. - `AWS_DEFAULT_REGION` - The AWS region.
- `AWS_ACCESS_KEY_ID` - The AWS access key ID. - `AWS_ACCESS_KEY_ID` - The AWS access key ID.
- `AWS_SECRET_ACCESS_KEY` - The AWS secret. - `AWS_SECRET_ACCESS_KEY` - The AWS secret.
1. Navigate to **CI / CD > Pipelines > Run Pipeline**, and run the pipeline to 1. Navigate to **CI/CD > Pipelines > Run Pipeline**, and run the pipeline to
deploy the Status Page to S3. deploy the Status Page to S3.
WARNING: WARNING:
......
...@@ -235,7 +235,7 @@ takes you to the pod's logs page. ...@@ -235,7 +235,7 @@ takes you to the pod's logs page.
NOTE: NOTE:
The example shows only one pod hosting the application at the moment, but you can add The example shows only one pod hosting the application at the moment, but you can add
more pods by defining the [`REPLICAS` CI/CD variable](customize.md#cicd-variables) more pods by defining the [`REPLICAS` CI/CD variable](customize.md#cicd-variables)
in **Settings > CI / CD > Variables**. in **Settings > CI/CD > Variables**.
### Work with branches ### Work with branches
......
...@@ -112,7 +112,7 @@ You can choose to target [AWS ECS](../../ci/cloud_deployment/index.md) as a depl ...@@ -112,7 +112,7 @@ You can choose to target [AWS ECS](../../ci/cloud_deployment/index.md) as a depl
To get started on Auto DevOps to AWS ECS, you must add a specific CI/CD variable. To get started on Auto DevOps to AWS ECS, you must add a specific CI/CD variable.
To do so, follow these steps: To do so, follow these steps:
1. In your project, go to **Settings > CI / CD** and expand the **Variables** 1. In your project, go to **Settings > CI/CD** and expand the **Variables**
section. section.
1. Specify which AWS platform to target during the Auto DevOps deployment 1. Specify which AWS platform to target during the Auto DevOps deployment
......
...@@ -52,13 +52,13 @@ To change it at the: ...@@ -52,13 +52,13 @@ To change it at the:
- Group level (this will override the instance setting): - Group level (this will override the instance setting):
1. Go to the group's **Settings > CI / CD > General Pipelines**. 1. Go to the group's **Settings > CI/CD > General Pipelines**.
1. Change the value of **maximum artifacts size (in MB)**. 1. Change the value of **maximum artifacts size (in MB)**.
1. Click **Save changes** for the changes to take effect. 1. Click **Save changes** for the changes to take effect.
- Project level (this will override the instance and group settings): - Project level (this will override the instance and group settings):
1. Go to the project's **Settings > CI / CD > General Pipelines**. 1. Go to the project's **Settings > CI/CD > General Pipelines**.
1. Change the value of **maximum artifacts size (in MB)**. 1. Change the value of **maximum artifacts size (in MB)**.
1. Click **Save changes** for the changes to take effect. 1. Click **Save changes** for the changes to take effect.
......
...@@ -371,7 +371,7 @@ In order to interact with your AWS account, the GitLab CI/CD pipelines require b ...@@ -371,7 +371,7 @@ In order to interact with your AWS account, the GitLab CI/CD pipelines require b
To set these: To set these:
1. Navigate to the project's **Settings > CI / CD**. 1. Navigate to the project's **Settings > CI/CD**.
1. Expand the **Variables** section and create entries for `AWS_ACCESS_KEY_ID` and 1. Expand the **Variables** section and create entries for `AWS_ACCESS_KEY_ID` and
`AWS_SECRET_ACCESS_KEY`. `AWS_SECRET_ACCESS_KEY`.
1. Mask the credentials so they do not show in logs using the **Masked** toggle. 1. Mask the credentials so they do not show in logs using the **Masked** toggle.
......
...@@ -10,7 +10,7 @@ type: howto ...@@ -10,7 +10,7 @@ type: howto
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17894) in GitLab 10.7. > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17894) in GitLab 10.7.
> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/199370) from **Settings > Repository** in GitLab 12.9. > - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/199370) from **Settings > Repository** in GitLab 12.9.
> - [Added `write_registry` scope](https://gitlab.com/gitlab-org/gitlab/-/issues/22743) in GitLab 12.10. > - [Added `write_registry` scope](https://gitlab.com/gitlab-org/gitlab/-/issues/22743) in GitLab 12.10.
> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29280) from **Settings > CI / CD** in GitLab 12.10.1. > - [Moved](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29280) from **Settings > CI/CD** in GitLab 12.10.1.
> - [Added package registry scopes](https://gitlab.com/gitlab-org/gitlab/-/issues/213566) in GitLab 13.0. > - [Added package registry scopes](https://gitlab.com/gitlab-org/gitlab/-/issues/213566) in GitLab 13.0.
Deploy tokens allow you to download (`git clone`) or push and pull packages and Deploy tokens allow you to download (`git clone`) or push and pull packages and
......
...@@ -41,7 +41,7 @@ configuration for the Pages site to generate properly. ...@@ -41,7 +41,7 @@ configuration for the Pages site to generate properly.
If everything is configured correctly, the site can take approximately 30 minutes to deploy. If everything is configured correctly, the site can take approximately 30 minutes to deploy.
You can watch the pipeline run by navigating to **CI / CD > Pipelines**. You can watch the pipeline run by navigating to **CI/CD > Pipelines**.
When the pipeline is finished, go to **Settings > Pages** to find the link to When the pipeline is finished, go to **Settings > Pages** to find the link to
your Pages website. your Pages website.
......
...@@ -152,7 +152,7 @@ pages: ...@@ -152,7 +152,7 @@ pages:
``` ```
Now save and commit the `.gitlab-ci.yml` file. You can watch the pipeline run Now save and commit the `.gitlab-ci.yml` file. You can watch the pipeline run
by going to **CI / CD > Pipelines**. by going to **CI/CD > Pipelines**.
When it succeeds, go to **Settings > Pages** to view the URL where your site When it succeeds, go to **Settings > Pages** to view the URL where your site
is now available. is now available.
......
...@@ -214,7 +214,7 @@ To set a deploy freeze window in the UI, complete these steps: ...@@ -214,7 +214,7 @@ To set a deploy freeze window in the UI, complete these steps:
1. Sign in to GitLab as a user with project Maintainer [permissions](../../permissions.md). 1. Sign in to GitLab as a user with project Maintainer [permissions](../../permissions.md).
1. Navigate to **Project overview**. 1. Navigate to **Project overview**.
1. In the left navigation menu, navigate to **Settings > CI / CD**. 1. In the left navigation menu, navigate to **Settings > CI/CD**.
1. Scroll to **Deploy freezes**. 1. Scroll to **Deploy freezes**.
1. Click **Expand** to see the deploy freeze table. 1. Click **Expand** to see the deploy freeze table.
1. Click **Add deploy freeze** to open the deploy freeze modal. 1. Click **Add deploy freeze** to open the deploy freeze modal.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment