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
This commit is contained in:
Rémy Coutable 2018-04-03 14:58:27 +00:00
commit 83b2e70341
2 changed files with 3 additions and 2 deletions

View file

@ -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

View file

@ -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