diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-01-18 09:13:08 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-01-24 08:43:11 +0100 |
| commit | f8a10191f0ab7f9e2d1507891771a29b222009ea (patch) | |
| tree | c1d0271544db45bb4e46bc856862b1a9724bda0e | |
| parent | 67dfd8786be3bd0b4b46282f220cf049c3cdcc9a (diff) | |
| download | gitlab-ce-f8a10191f0ab7f9e2d1507891771a29b222009ea.tar.gz | |
Use $CI_COMMIT_REF_NAME for tags in trigger-build
Also, pass GITLAB_VERSION and GITLAB_ASSETS_TAG to CNG triggered
pipelines.
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | doc/development/testing_guide/review_apps.md | 4 | ||||
| -rwxr-xr-x | scripts/trigger-build | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/doc/development/testing_guide/review_apps.md b/doc/development/testing_guide/review_apps.md index 19aecedb27c..3af97717775 100644 --- a/doc/development/testing_guide/review_apps.md +++ b/doc/development/testing_guide/review_apps.md @@ -4,10 +4,6 @@ Review Apps are automatically deployed by each pipeline, both in [CE](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22010) and [EE](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6665). -CAUTION: **Warning:** -There's currently [an issue when using `/` in branch names][charts-1068] where -Review Apps fail to be deployed. - ## How does it work? ### CD/CD architecture diagram diff --git a/scripts/trigger-build b/scripts/trigger-build index 4032ba853e6..fbf35e7217c 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -68,7 +68,7 @@ module Trigger def base_variables { - 'GITLAB_REF_SLUG' => ENV['CI_COMMIT_REF_SLUG'], + 'GITLAB_REF_SLUG' => ENV['CI_COMMIT_TAG'] ? ENV['CI_COMMIT_REF_NAME'] : ENV['CI_COMMIT_REF_SLUG'], 'TRIGGERED_USER' => ENV['TRIGGERED_USER'] || ENV['GITLAB_USER_NAME'], 'TRIGGER_SOURCE' => ENV['CI_JOB_URL'], 'TOP_UPSTREAM_SOURCE_PROJECT' => ENV['CI_PROJECT_PATH'], @@ -137,7 +137,10 @@ module Trigger edition = Trigger.ee? ? 'EE' : 'CE' { + # Back-compatibility until https://gitlab.com/gitlab-org/build/CNG/merge_requests/189 is merged "GITLAB_#{edition}_VERSION" => ENV['CI_COMMIT_REF_NAME'], + "GITLAB_VERSION" => ENV['CI_COMMIT_REF_NAME'], + "GITLAB_ASSETS_TAG" => ENV['CI_COMMIT_REF_SLUG'], "#{edition}_PIPELINE" => 'true' } end |