diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-30 15:12:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-30 15:12:25 +0300 |
commit | 60273ebb302dabd6e724e4b7baf9ed7b39de5c09 (patch) | |
tree | 094133ffdc73d53c56e9779cfeb4f3a548d255c3 /scripts/trigger-build.rb | |
parent | 0c918eb567a29de7ecfc890e8e2dd90e900e7e58 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/trigger-build.rb')
-rwxr-xr-x | scripts/trigger-build.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/trigger-build.rb b/scripts/trigger-build.rb index 57cc6a8551e..8183a816b26 100755 --- a/scripts/trigger-build.rb +++ b/scripts/trigger-build.rb @@ -194,16 +194,12 @@ module Trigger { 'GITLAB_VERSION' => source_sha, 'IMAGE_TAG' => source_sha, - 'QA_IMAGE' => ENV['QA_IMAGE'], 'SKIP_QA_DOCKER' => 'true', + 'SKIP_QA_TEST' => 'true', 'ALTERNATIVE_SOURCES' => 'true', 'SECURITY_SOURCES' => Trigger.security? ? 'true' : 'false', 'ee' => Trigger.ee? ? 'true' : 'false', - 'QA_BRANCH' => ENV['QA_BRANCH'] || 'master', - 'CACHE_UPDATE' => ENV['OMNIBUS_GITLAB_CACHE_UPDATE'], - 'GITLAB_QA_OPTIONS' => ENV['GITLAB_QA_OPTIONS'], - 'QA_TESTS' => ENV['QA_TESTS'], - 'ALLURE_JOB_NAME' => ENV['ALLURE_JOB_NAME'] + 'CACHE_UPDATE' => ENV['OMNIBUS_GITLAB_CACHE_UPDATE'] } end end |