diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-09 18:07:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-09 18:07:42 +0300 |
| commit | 263f926c770163788f78af03ab69689c94f57360 (patch) | |
| tree | 4e1027e596629106d25fa461a1cf3d613749d279 /doc/ci/variables | |
| parent | cddaddb86bf6d4d277d206c42a9138a2d660ea56 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/variables')
| -rw-r--r-- | doc/ci/variables/README.md | 5 | ||||
| -rw-r--r-- | doc/ci/variables/predefined_variables.md | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index 384216fed2c..6dc093b6d0f 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -290,6 +290,7 @@ export CI_RUNNER_ID="10" export CI_RUNNER_DESCRIPTION="my runner" export CI_RUNNER_TAGS="docker, linux" export CI_SERVER="yes" +export CI_SERVER_URL="https://example.com" export CI_SERVER_HOST="example.com" export CI_SERVER_NAME="GitLab" export CI_SERVER_REVISION="70606bf" @@ -673,6 +674,8 @@ Running on runner-8a2f473d-project-1796893-concurrent-0 via runner-8a2f473d-mach ++ CI_PROJECT_DIR=/builds/gitlab-examples/ci-debug-trace ++ export CI_SERVER=yes ++ CI_SERVER=yes +++ export CI_SERVER_URL=https://example.com:3000 +++ CI_SERVER_URL=https://example.com:3000 ++ export 'CI_SERVER_HOST=example.com' ++ CI_SERVER_HOST='example.com' ++ export 'CI_SERVER_NAME=GitLab CI' @@ -709,6 +712,8 @@ Running on runner-8a2f473d-project-1796893-concurrent-0 via runner-8a2f473d-mach ++ CI_JOB_NAME=debug_trace ++ export CI_JOB_STAGE=test ++ CI_JOB_STAGE=test +++ export CI_SERVER_URL=https://example.com:3000 +++ CI_SERVER_URL=https://example.com:3000 ++ export CI_SERVER_HOST=example.com ++ CI_SERVER_HOST=example.com ++ export CI_SERVER_NAME=GitLab diff --git a/doc/ci/variables/predefined_variables.md b/doc/ci/variables/predefined_variables.md index 678ac285176..9200ef69a31 100644 --- a/doc/ci/variables/predefined_variables.md +++ b/doc/ci/variables/predefined_variables.md @@ -112,6 +112,7 @@ future GitLab releases.** | `CI_RUNNER_TAGS` | 8.10 | 0.5 | The defined runner tags | | `CI_RUNNER_VERSION` | all | 10.6 | GitLab Runner version that is executing the current job | | `CI_SERVER` | all | all | Mark that job is executed in CI environment | +| `CI_SERVER_URL` | 12.7 | all | The base URL of the GitLab instance, including protocol and port (like `https://gitlab.example.com:8080`) | | `CI_SERVER_HOST` | 12.1 | all | Host component of the GitLab instance URL, without protocol and port (like `gitlab.example.com`) | | `CI_SERVER_NAME` | all | all | The name of CI server that is used to coordinate jobs | | `CI_SERVER_REVISION` | all | all | GitLab revision that is used to schedule jobs | |