diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-05-25 22:58:51 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-05-25 23:08:11 +0800 |
| commit | 88ba7a034be6c2a93c495edd1d1db08ec6d98bb3 (patch) | |
| tree | d887a6e81da91944756d9cd84ef3b20d7d83a653 /doc | |
| parent | 86cd09f5d15d7d97f325e2464de8fc4753d54602 (diff) | |
| download | gitlab-ce-88ba7a034be6c2a93c495edd1d1db08ec6d98bb3.tar.gz | |
Pass external_url from environment if job doesn't have one
Also update the document and add a changelog entry
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/environments.md | 6 | ||||
| -rw-r--r-- | doc/ci/variables/README.md | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/ci/environments.md b/doc/ci/environments.md index 169e0fbae3d..3393030210e 100644 --- a/doc/ci/environments.md +++ b/doc/ci/environments.md @@ -94,6 +94,12 @@ the name given in `.gitlab-ci.yml` (with any variables expanded), while the second is a "cleaned-up" version of the name, suitable for use in URLs, DNS, etc. +>**Note:** +Starting with GitLab 9.3, the environment URL is exposed to the Runner via +`$CI_ENVIRONMENT_URL`. The URL would be expanded from `.gitlab-ci.yml`, or if +the URL was not defined there, the external URL from the environment would be +used. + To sum up, with the above `.gitlab-ci.yml` we have achieved that: - All branches will run the `test` and `build` jobs. diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index 0d4d08106f8..e4e4e1da250 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -43,6 +43,7 @@ future GitLab releases.** | **CI_DEBUG_TRACE** | all | 1.7 | Whether [debug tracing](#debug-tracing) is enabled | | **CI_ENVIRONMENT_NAME** | 8.15 | all | The name of the environment for this job | | **CI_ENVIRONMENT_SLUG** | 8.15 | all | A simplified version of the environment name, suitable for inclusion in DNS, URLs, Kubernetes labels, etc. | +| **CI_ENVIRONMENT_URL** | 9.3 | all | The URL of the environment for this job | | **CI_JOB_ID** | 9.0 | all | The unique id of the current job that GitLab CI uses internally | | **CI_JOB_MANUAL** | 8.12 | all | The flag to indicate that job was manually started | | **CI_JOB_NAME** | 9.0 | 0.5 | The name of the job as defined in `.gitlab-ci.yml` | |