Check test images

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>

ci-operator/step-registry/hypershift/conformance/hypershift-conformance-chain.yaml

@@ -4,12 +4,15 @@ chain:
   - as: conformance-tests
     from: tests
     commands: |-
+      set -x
+
       function mirror_test_images() {
         echo "### Mirroring test images"
       
         DEVSCRIPTS_TEST_IMAGE_REPO=${DS_REGISTRY}/localimages/local-test-image
       
         openshift-tests images --to-repository ${DEVSCRIPTS_TEST_IMAGE_REPO} > /tmp/mirror
+        cat /tmp/mirror
         scp "${SSHOPTS[@]}" /tmp/mirror "root@${IP}:/tmp/mirror"
       
         # shellcheck disable=SC2087
@@ -19,6 +22,23 @@ chain:
       oc image mirror --registry-config ${DS_WORKING_DIR}/pull_secret.json --filter-by-os="linux/${ARCHITECTURE}.*" registry.k8s.io/pause:3.9  $DEVSCRIPTS_TEST_IMAGE_REPO:e2e-27-registry-k8s-io-pause-3-9-p9APyPDU5GsW02Rk
       EOF
         TEST_ARGS+=$(echo " --from-repository ${DEVSCRIPTS_TEST_IMAGE_REPO} ")
+
+
+        # TODO: why do we need this?
+        for isName in $(oc get imagestreams -n openshift -o=jsonpath='{.items[?(@.metadata.ownerReferences[].kind=="ClusterVersion")].metadata.name}'); do
+          echo "Patching ${isName} to point to the mirror registry"
+          OVERRIDES=$(oc get clusterversion version -o=jsonpath={.spec.overrides})
+          if [ -z "$OVERRIDES" ]
+          then
+            oc patch clusterversion version --type json -p '[{"op": "add", "path": "/spec/overrides", "value": []}]'
+          fi
+          oc patch clusterversion version --type json -p "[{\"op\": \"add\", \"path\": \"/spec/overrides/-\", \"value\": {\"kind\": \"ImageStream\", \"group\": \"image.openshift.io\", \"namespace\": \"openshift\", \"name\": \"${isName}\", \"unmanaged\": true}}]"
+          FROM=$(oc get imagestream -n openshift ${isName} -o=jsonpath={.spec.tags[0].from.name})
+          EXT_REG=${FROM%%@*}
+          INT_PULL_URL=${FROM/$EXT_REG/$DEVSCRIPTS_TEST_IMAGE_REPO}
+          oc patch imagestream -n openshift ${isName} --type json -p '[{"op": "remove", "path": "/metadata/ownerReferences"}]' || true
+          oc patch imagestream -n openshift ${isName} --type json -p "[{\"op\": \"replace\", \"path\": \"/spec/tags/0/from/name\", \"value\": \"${INT_PULL_URL}\"}]"
+        done
       }
       
       CLUSTER_NAME="$(echo -n $PROW_JOB_ID|sha256sum|cut -c-20)"

ci-operator/step-registry/hypershift/kubevirt/install/disconnected/hypershift-kubevirt-install-disconnected-commands.sh

@@ -145,6 +145,18 @@ spec:
     source: quay.io/openshift-cnv
 END
 
+cat << END | oc apply -f -
+apiVersion: config.openshift.io/v1
+kind: ImageDigestMirrorSet
+metadata:
+  name: redhat-operator-index-0-fixes
+spec:
+  imageDigestMirrors:
+  - mirrors:
+    - \${mirror_registry}/openshift4/ose-kube-rbac-proxy
+    source: registry.redhat.io/openshift4/ose-kube-rbac-proxy
+END
+
 echo "7: Waiting for the new ImageContentSourcePolicy to be updated on machines"
 oc wait clusteroperators/machine-config --for=condition=Upgradeable=true --timeout=15m
 

ci-operator/step-registry/hypershift/mce/kubevirt/baremetalds/disconnected/conformance/hypershift-mce-kubevirt-baremetalds-disconnected-conformance-workflow.yaml

@@ -23,6 +23,7 @@ workflow:
     allow_best_effort_post_steps: true
     allow_skip_on_success: true
     post:
+    - ref: wait # TODO: remove me
     - ref: hypershift-mce-dump
     - chain: gather-core-dump
     - chain: hypershift-mce-kubevirt-destroy

ci-operator/step-registry/wait/wait-ref.yaml

@@ -1,6 +1,6 @@
 ref:
   as: wait
-  from: cli
+  from: upi-installer
   grace_period: 5m
   timeout: 72h0m0s
   cli: latest