Avoid using MIRROR_OLM

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
openshift · Apr 17, 2024 · ca9fc6c · ca9fc6c
1 parent 07fb79b
commit ca9fc6c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.14__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.14__periodics.yaml
@@ -222,9 +222,13 @@ tests:
   steps:
     cluster_profile: equinix-ocp-metal
     env:
+      CCS_OPERATOR_CHANNELS: stable-4.14,stable-4.14,stable-4.14,stable-4.14,stable-4.14,stable,stable
+      CCS_OPERATOR_PACKAGES: odf-operator,ocs-operator,mcg-operator,odf-csi-addons-operator,lvms-operator,local-storage-operator,metallb-operator
       HYPERSHIFT_NODE_COUNT: "2"
+      LVM_OPERATOR_SUB_CHANNEL: stable-4.14
       MCE_VERSION: "2.4"
       ODF_OPERATOR_SUB_CHANNEL: stable-4.14
+      REDHAT_OPERATORS_INDEX_TAG: v4.14
     workflow: hypershift-mce-kubevirt-baremetalds-disconnected-conformance
 - as: e2e-mce-power-conformance
   cron: 0 4 * * *

diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.15__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.15__periodics.yaml
@@ -191,9 +191,13 @@ tests:
   steps:
     cluster_profile: equinix-ocp-metal
     env:
+      CCS_OPERATOR_CHANNELS: stable-4.15,stable-4.15,stable-4.15,stable-4.15,stable-4.15,stable,stable
+      CCS_OPERATOR_PACKAGES: odf-operator,ocs-operator,mcg-operator,odf-csi-addons-operator,lvms-operator,local-storage-operator,metallb-operator
       HYPERSHIFT_NODE_COUNT: "2"
+      LVM_OPERATOR_SUB_CHANNEL: stable-4.15
       MCE_VERSION: "2.5"
-      ODF_OPERATOR_SUB_CHANNEL: stable-4.14
+      ODF_OPERATOR_SUB_CHANNEL: stable-4.15
+      REDHAT_OPERATORS_INDEX_TAG: v4.15
     workflow: hypershift-mce-kubevirt-baremetalds-disconnected-conformance
 - as: e2e-kubevirt-aws-csi
   cron: 0 4 * * *

diff --git a/...ed/conformance/hypershift-mce-kubevirt-baremetalds-disconnected-conformance-workflow.yaml b/...ed/conformance/hypershift-mce-kubevirt-baremetalds-disconnected-conformance-workflow.yaml
@@ -33,9 +33,9 @@ workflow:
     pre:
     - chain: baremetalds-ipi-pre
     - ref: hypershift-mce-install-disconnected
+    - chain: hypershift-kubevirt-baremetalds-odf
     - chain: hypershift-kubevirt-baremetalds-lvm
     - chain: hypershift-kubevirt-baremetalds-metallb
-    - chain: hypershift-kubevirt-baremetalds-odf
     - ref: hypershift-kubevirt-install-disconnected
     - ref: hypershift-kubevirt-create-disconnected-workarounds
     - ref: hypershift-kubevirt-create
@@ -50,22 +50,21 @@ workflow:
         Image policy should perform lookup when the Deployment gets the resolve-names annotation later\|
         Image policy should perform lookup when the object has the resolve-names annotation\|
         PersistentVolumes NFS when invoking the Recycle reclaim policy should test that a PV becomes Available and is clean after the PVC is deleted.
-      METALLB_OPERATOR_SUB_SOURCE: mirror-catalog-for-olm
-      LOCAL_STORAGE_OPERATOR_SUB_SOURCE: mirror-catalog-for-olm
+      METALLB_OPERATOR_SUB_SOURCE: cs-ccs-local-catalog
+      LOCAL_STORAGE_OPERATOR_SUB_SOURCE: cs-ccs-local-catalog
       ODF_OPERATOR_SUB_SOURCE: cs-ccs-local-catalog
       LVM_OPERATOR_SUB_CHANNEL: stable-4.14
-      LVM_OPERATOR_SUB_SOURCE: mirror-catalog-for-olm
+      LVM_OPERATOR_SUB_SOURCE: cs-ccs-local-catalog
       LVM_OPERATOR_SUB_INSTALL_NAMESPACE: openshift-lvm-storage
-      CCS_OPERATOR_PACKAGES: odf-operator,ocs-operator,mcg-operator,odf-csi-addons-operator
-      CCS_OPERATOR_CHANNELS: stable-4.14,stable-4.14,stable-4.14,stable-4.14
+      CCS_OPERATOR_PACKAGES: odf-operator,ocs-operator,mcg-operator,odf-csi-addons-operator,lvms-operator,local-storage-operator,metallb-operator
+      CCS_OPERATOR_CHANNELS: stable-4.14,stable-4.14,stable-4.14,stable-4.14,stable-4.14,stable,stable
       ETCD_STORAGE_CLASS: lvms-vg1
       DISCONNECTED: "true"
       ENABLE_ICSP: "true"
       DEVSCRIPTS_CONFIG: |
         IP_STACK=v4
         MIRROR_IMAGES=true
         INSTALLER_PROXY=true
-        MIRROR_OLM="local-storage-operator,metallb-operator,lvms-operator"
         NETWORK_TYPE=OVNKubernetes
         NUM_WORKERS=0
         NUM_MASTERS=3