Skip to content
Snippets Groups Projects

fix: external trigger with VERSION has priority

Merged Wouter Deconinck requested to merge external-trigger-with-VERSION into master
1 file
+ 7
1
Compare changes
  • Side-by-side
  • Inline
+ 7
1
@@ -33,6 +33,9 @@ variables:
@@ -33,6 +33,9 @@ variables:
## Additional options for docker build (e.g. --no-cache)
## Additional options for docker build (e.g. --no-cache)
BUILD_OPTIONS:
BUILD_OPTIONS:
 
## Version to be set by external trigger
 
VERSION:
 
## Internal tag used for the CI
## Internal tag used for the CI
INTERNAL_TAG: "pipeline-${CI_PIPELINE_ID}"
INTERNAL_TAG: "pipeline-${CI_PIPELINE_ID}"
@@ -101,7 +104,10 @@ version:
@@ -101,7 +104,10 @@ version:
stage: config
stage: config
script:
script:
- |
- |
if [ "x${CI_PIPELINE_SOURCE}" = "xmerge_request_event" ]; then
if [ -n "${VERSION}" ]; then
 
# external trigger with specified version
 
EXPORT_TAG="${VERSION}"
 
elif [ "x${CI_PIPELINE_SOURCE}" = "xmerge_request_event" ]; then
VERSION="unstable-mr-${CI_MERGE_REQUEST_PROJECT_ID}-${CI_MERGE_REQUEST_IID}"
VERSION="unstable-mr-${CI_MERGE_REQUEST_PROJECT_ID}-${CI_MERGE_REQUEST_IID}"
NIGHTLY_TAG="${VERSION}-nightly"
NIGHTLY_TAG="${VERSION}-nightly"
EXPORT_TAG="${VERSION}"
EXPORT_TAG="${VERSION}"
Loading