diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 06:06:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 06:06:09 +0000 |
| commit | 01de60f3a8f4d99e641d04d31369628425137c21 (patch) | |
| tree | 0d00bf0bd3c93c8ddc49a595ff97ef18b594a259 /doc | |
| parent | 558702b0b569b723474e3652bf46c3b84f322618 (diff) | |
| download | gitlab-ce-01de60f3a8f4d99e641d04d31369628425137c21.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/variables/README.md | 6 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index cff797549ba..488d9a05a3c 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -284,6 +284,8 @@ export CI_PROJECT_PATH="gitlab-org/gitlab-foss" export CI_PROJECT_URL="https://example.com/gitlab-org/gitlab-foss" export CI_REGISTRY="registry.example.com" export CI_REGISTRY_IMAGE="registry.example.com/gitlab-org/gitlab-foss" +export CI_REGISTRY_USER="gitlab-ci-token" +export CI_REGISTRY_PASSWORD="longalfanumstring" export CI_RUNNER_ID="10" export CI_RUNNER_DESCRIPTION="my runner" export CI_RUNNER_TAGS="docker, linux" @@ -295,10 +297,8 @@ export CI_SERVER_VERSION="8.9.0" export CI_SERVER_VERSION_MAJOR="8" export CI_SERVER_VERSION_MINOR="9" export CI_SERVER_VERSION_PATCH="0" -export GITLAB_USER_ID="42" export GITLAB_USER_EMAIL="user@example.com" -export CI_REGISTRY_USER="gitlab-ci-token" -export CI_REGISTRY_PASSWORD="longalfanumstring" +export GITLAB_USER_ID="42" ``` ### `.gitlab-ci.yml` defined variables diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 12c009d9e90..a92c95ce7d8 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1247,6 +1247,7 @@ This is useful if you want to avoid jobs entering `pending` state immediately. You can set the period with `start_in` key. The value of `start_in` key is an elapsed time in seconds, unless a unit is provided. `start_in` key must be less than or equal to one week. Examples of valid values include: +- `'5'` - `10 seconds` - `30 minutes` - `1 day` |