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
This commit is contained in:
Rémy Coutable 2018-11-22 12:32:43 +00:00
commit 85cc480fa8
1 changed files with 1 additions and 0 deletions

View File

@ -106,6 +106,7 @@ module Trigger
def extra_variables
{
'GITLAB_VERSION' => ENV['CI_COMMIT_SHA'],
'GITLAB_REF_SLUG' => ENV['CI_COMMIT_REF_SLUG'],
'ALTERNATIVE_SOURCES' => 'true',
'ee' => Trigger.ee? ? 'true' : 'false',
'QA_BRANCH' => ENV['QA_BRANCH'] || 'master'