Commit 718d00ee authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'pass-through-top-upstream-source-ref' into 'master'

Pass through TOP_UPSTREAM_SOURCE_REF for qa pipeline

See merge request gitlab-org/gitlab!22263
parents bbbc58a1 5d6fa65b
...@@ -20,4 +20,4 @@ schedule:package-and-qa:notify-failure: ...@@ -20,4 +20,4 @@ schedule:package-and-qa:notify-failure:
- 'notify_on_job_failure schedule:package-and-qa qa-master "${NOTIFICATION_MESSAGE}" ci_failing' - 'notify_on_job_failure schedule:package-and-qa qa-master "${NOTIFICATION_MESSAGE}" ci_failing'
needs: ["schedule:package-and-qa"] needs: ["schedule:package-and-qa"]
allow_failure: true allow_failure: true
when: always when: manual # TODO: remove notify job if not necessary
...@@ -85,7 +85,8 @@ module Trigger ...@@ -85,7 +85,8 @@ module Trigger
'TRIGGER_SOURCE' => ENV['CI_JOB_URL'], 'TRIGGER_SOURCE' => ENV['CI_JOB_URL'],
'TOP_UPSTREAM_SOURCE_PROJECT' => ENV['CI_PROJECT_PATH'], 'TOP_UPSTREAM_SOURCE_PROJECT' => ENV['CI_PROJECT_PATH'],
'TOP_UPSTREAM_SOURCE_JOB' => ENV['CI_JOB_URL'], 'TOP_UPSTREAM_SOURCE_JOB' => ENV['CI_JOB_URL'],
'TOP_UPSTREAM_SOURCE_SHA' => ENV['CI_COMMIT_SHA'] 'TOP_UPSTREAM_SOURCE_SHA' => ENV['CI_COMMIT_SHA'],
'TOP_UPSTREAM_SOURCE_REF' => ENV['CI_COMMIT_REF_NAME']
} }
end end
......
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