MCE: adjust hypershift-mce-install step to support disconnected OVERRIDE

openshift · Dec 28, 2024 · 0d13224 · 0d13224
1 parent 88e54a4
commit 0d13224
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/...perator/config/openshift/hypershift/openshift-hypershift-release-4.18__periodics-mce.yaml b/...perator/config/openshift/hypershift/openshift-hypershift-release-4.18__periodics-mce.yaml
@@ -112,6 +112,7 @@ tests:
     env:
       LVM_OPERATOR_SUB_CHANNEL: stable-4.18
       MCE_VERSION: "2.8"
+      OVERRIDE_HO_IMAGE: virthost.ostest.test.metalkube.org:6001/hypershift/hypershift-operator:latest
     workflow: hypershift-mce-agent-disconnected-conformance
 - as: e2e-agent-disconnected-ovn-dualstack-metal3-conformance
   cron: 0 20 * * *

diff --git a/...gent/disconnected/conformance/hypershift-mce-agent-disconnected-conformance-workflow.yaml b/...gent/disconnected/conformance/hypershift-mce-agent-disconnected-conformance-workflow.yaml
@@ -8,6 +8,7 @@ workflow:
     allow_best_effort_post_steps: true
     allow_skip_on_success: true
     post:
+    - ref: wait
     - chain: hypershift-mce-agent-destroy
     - chain: baremetalds-ipi-post
     test:

diff --git a/ci-operator/step-registry/hypershift/mce/install/hypershift-mce-install-commands.sh b/ci-operator/step-registry/hypershift/mce/install/hypershift-mce-install-commands.sh
@@ -224,6 +224,21 @@ echo "wait for addon to Available"
 oc wait --timeout=5m --for=condition=Available -n local-cluster ManagedClusterAddOn/hypershift-addon
 oc wait --timeout=5m --for=condition=Degraded=False -n local-cluster ManagedClusterAddOn/hypershift-addon
 if [[ ${OVERRIDE_HO_IMAGE} ]] ; then
+  if [[ $MCE_QE_CATALOG == "true" ]]; then
+    oc apply -f - <<EOF
+  apiVersion: operator.openshift.io/v1alpha1
+  kind: ImageContentSourcePolicy
+  metadata:
+    name: hypershift-repo
+  spec:
+    repositoryDigestMirrors:
+    - mirrors:
+      - $(head -n 1 "${SHARED_DIR}/mirror_registry_url" | sed 's/5000/6001/g')/hypershift
+      source: quay.io/hypershift
+EOF
+  echo "Waiting for the new ImageContentSourcePolicy to be updated on machines"
+  oc wait clusteroperators/machine-config --for=condition=Upgradeable=true --timeout=25m
+  fi
   oc apply -f - <<EOF
 apiVersion: v1
 kind: ConfigMap

diff --git a/ci-operator/step-registry/hypershift/mce/install/hypershift-mce-install-ref.yaml b/ci-operator/step-registry/hypershift/mce/install/hypershift-mce-install-ref.yaml
@@ -13,7 +13,10 @@ ref:
     documentation: If true, the QE catalog will be used to create MCE
   - name: OVERRIDE_HO_IMAGE
     default: ""
-    documentation: "Override the HyperShift operator image. If the default is an empty string, this will not override."
+    documentation: |-
+      Override the HyperShift operator image. If the default is an empty string, this will not override. 
+      If in disconnected env also need to set MCE_QE_CATALOG: "true"
+      E.g: quay.io/hypershift/hypershift-operator:latest
   commands: hypershift-mce-install-commands.sh
   resources:
     requests: