From c585ad0d31af56f217187fc03c9a797501a30211 Mon Sep 17 00:00:00 2001
From: Vadim Rutkovsky <vrutkovs@redhat.com>
Date: Wed, 4 Dec 2019 12:47:40 +0100
Subject: [PATCH] 4.4 OKD: run e2e-aws test before promoting it to fcos
 namespace

---
 ...enshift-release-release-4.4-periodics.yaml | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml
index dfcc48f993dd5..0bb3a68245047 100644
--- a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml
+++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml
@@ -388,6 +388,7 @@ periodics:
     workdir: true
   interval: 24h
   labels:
+    ci.openshift.io/release-type: informing
     job-release: "4.4"
   name: promote-release-openshift-okd-machine-os-content-e2e-aws-4.4
   spec:
@@ -518,8 +519,27 @@ periodics:
 
         # debug output
         oc describe -n ${namespace} istag/machine-os-content:latest
+
+        # Craft a release image
+        MOC_SHA256=$( oc get istag -n "${namespace}" istag/machine-os-content:latest -o template='{{ .image.metadata.name }}' )
+        export RELEASE_IMAGE_LATEST=registry.svc.ci.openshift.org/${namespace}/release:latest
+        oc registry login
+        oc adm release new \
+          -n origin \
+          --from-image-stream=$(BRANCH) \
+          --to-image=${RELEASE_IMAGE_LATEST} \
+          machine-os-content=registry.svc.ci.openshift.org/${namespace}/machine-os-content@${MOC_SHA256}
+        # execute the test
+        ci-operator \
+          --artifact-dir=$(ARTIFACTS) \
+          --namespace=${namespace} \
+          --secret-dir=/usr/local/pull-secret \
+          --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-cluster-profile \
+          --target=e2e-$(CLUSTER_TYPE)
+        # promote to fcos namespace
+
         oc tag ${namespace}/machine-os-content:latest fcos/machine-os-content:${BRANCH}
-        oc tag fcos/machine-os-content:${BRANCH} ${TAG_NS}/${BRANCH}:machine-os-content
+        oc tag fcos/machine-os-content:${BRANCH} ${namespace}/machine-os-content@${MOC_SHA256}
       env:
       - name: TAG_NS
         value: origin