tag properly

Author: RTann

Makefile

@@ -15,6 +15,8 @@ TAG := # make sure tag is never injectable as an env var
 ifdef CI
 ifneq ($(NIGHTLY_TAG),)
 TAG := $(NIGHTLY_TAG)
+else ifneq ($(RELEASE_TAG),)
+TAG := $(RELEASE_TAG)
 endif
 endif
 

scripts/ci/lib.sh

@@ -588,6 +588,8 @@ openshift_ci_mods() {
 
     handle_nightly_runs
 
+    handle_release_runs
+
     info "Status after mods:"
     "$ROOT/status.sh" || true
 
@@ -650,6 +652,18 @@ handle_nightly_runs() {
     fi
 }
 
+handle_release_runs() {
+    if ! is_OPENSHIFT_CI; then
+        die "Only for OpenShift CI"
+    fi
+
+    local base_ref
+    base_ref="$(get_base_ref)"
+    if is_tagged && [[ "$base_ref" =~ ^release- ]]; then
+        ci_export RELEASE_TAG "$(git tag --sort=creatordate --contains | tail -1)"
+    fi
+}
+
 store_test_results() {
     if [[ "$#" -ne 2 ]]; then
         die "missing args. usage: store_test_results <from> <to>"