Commit 85cc480f authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '54293-fetch-assets-job-times-out-so-package-and-qa-jobs-can-t-complete' into 'master'

Resolve "`fetch-assets` job times out so `package-and-qa` jobs can't complete"

Closes #54293

See merge request gitlab-org/gitlab-ce!23267
parents 2e3dab38 b57c1fa7
...@@ -106,6 +106,7 @@ module Trigger ...@@ -106,6 +106,7 @@ module Trigger
def extra_variables def extra_variables
{ {
'GITLAB_VERSION' => ENV['CI_COMMIT_SHA'], 'GITLAB_VERSION' => ENV['CI_COMMIT_SHA'],
'GITLAB_REF_SLUG' => ENV['CI_COMMIT_REF_SLUG'],
'ALTERNATIVE_SOURCES' => 'true', 'ALTERNATIVE_SOURCES' => 'true',
'ee' => Trigger.ee? ? 'true' : 'false', 'ee' => Trigger.ee? ? 'true' : 'false',
'QA_BRANCH' => ENV['QA_BRANCH'] || 'master' 'QA_BRANCH' => ENV['QA_BRANCH'] || 'master'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment