diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-03 14:58:27 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-03 14:58:27 +0000 |
| commit | 83b2e70341a3721f7897aaf0b806a1535f50115c (patch) | |
| tree | 4e4f5696547989d3051af1b989c224ab9127512a | |
| parent | 77a6afd569243e479499231c16c5e72e24707f0d (diff) | |
| parent | f50d0e4eee57d8eae2758b9118649ba59c487456 (diff) | |
| download | gitlab-ce-83b2e70341a3721f7897aaf0b806a1535f50115c.tar.gz | |
Merge branch 'fix/qa/gb/use-project-path-in-package-and-qa-action' into 'master'
Use project path in package-and-qa to fetch script
See merge request gitlab-org/gitlab-ce!18145
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | scripts/trigger-build-omnibus | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9a04a3ae37..5be942c04ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -272,7 +272,7 @@ package-and-qa: # package-and-qa job will not be able to run when the branch gets # deleted (when merging the MR). - apk add --update openssl - - wget https://gitlab.com/gitlab-org/gitlab-ce/raw/$CI_COMMIT_SHA/scripts/trigger-build-omnibus + - wget https://gitlab.com/$CI_PROJECT_PATH/raw/$CI_COMMIT_SHA/scripts/trigger-build-omnibus - chmod 755 trigger-build-omnibus script: - ./trigger-build-omnibus diff --git a/scripts/trigger-build-omnibus b/scripts/trigger-build-omnibus index 85ea4aa74ac..95f35b44f5a 100755 --- a/scripts/trigger-build-omnibus +++ b/scripts/trigger-build-omnibus @@ -9,6 +9,7 @@ module Omnibus class Trigger TOKEN = ENV['BUILD_TRIGGER_TOKEN'] + TRIGGERER = ENV['CI_PROJECT_NAME'] def initialize @uri = URI("https://gitlab.com/api/v4/projects/#{CGI.escape(Omnibus::PROJECT_PATH)}/trigger/pipeline") @@ -32,7 +33,7 @@ module Omnibus private def ee? - File.exist?('CHANGELOG-EE.md') + TRIGGERER == 'gitlab-ee' || File.exist?('CHANGELOG-EE.md') end def env_params |