[hcp|kv|disconnected] Various fixes for hcp|kv|disconnected periodics

- fix the right version of ODF for v4.14 and v41.5 - explicitly configure a ImageDigestMirrorSet for CSI sidecar images for ODF - use MCE 2.6 on v4.16 job - add a post step to eventually highlight missing images - start reporting again v4.16 and v4.17 to slack Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
openshift · Jul 8, 2024 · b2de0fb · b2de0fb
1 parent 1280d24
commit b2de0fb
Show file tree

Hide file tree

Showing 12 changed files with 119 additions and 7 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
@@ -224,6 +224,8 @@ tests:
   steps:
     cluster_profile: equinix-ocp-metal
     env:
+      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
       HYPERSHIFT_NODE_COUNT: "2"
       LVM_OPERATOR_SUB_CHANNEL: stable-4.14
       MCE_VERSION: "2.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
@@ -169,6 +169,8 @@ tests:
   steps:
     cluster_profile: equinix-ocp-metal
     env:
+      CCS_OPERATOR_CHANNELS: stable-4.15,stable-4.15,stable-4.15,stable-4.15
+      CCS_OPERATOR_PACKAGES: odf-operator,ocs-operator,mcg-operator,odf-csi-addons-operator
       HYPERSHIFT_NODE_COUNT: "2"
       LVM_OPERATOR_SUB_CHANNEL: stable-4.15
       MCE_VERSION: "2.5"

diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16__periodics.yaml
@@ -186,7 +186,7 @@ tests:
       MCE_VERSION: "2.6"
       ODF_OPERATOR_SUB_CHANNEL: stable-4.15
     workflow: hypershift-mce-kubevirt-baremetalds-conformance
-- as: e2e-kubevirt-metal-ovn-disconnected
+- as: e2e-kubevirt-metal-ovn-mce-disconnected
   cron: 0 8 * * *
   steps:
     cluster_profile: equinix-ocp-metal
@@ -195,9 +195,10 @@ tests:
       CCS_OPERATOR_PACKAGES: odf-operator,ocs-operator,mcg-operator,odf-csi-addons-operator
       HYPERSHIFT_NODE_COUNT: "2"
       LVM_OPERATOR_SUB_CHANNEL: stable-4.15
-      MIRROR_OLM_REMOTE_INDEX: registry.redhat.io/redhat/redhat-operator-index:v4.15
+      MCE_VERSION: "2.6"
+      MIRROR_OLM_REMOTE_INDEX: registry.redhat.io/redhat/redhat-operator-index:v4.16
       ODF_OPERATOR_SUB_CHANNEL: stable-4.15
-    workflow: hypershift-kubevirt-baremetalds-disconnected-conformance
+    workflow: hypershift-mce-kubevirt-baremetalds-disconnected-conformance
 - as: e2e-mce-ibmz-ovn-conformance
   cron: 0 8 * * *
   steps:

diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.16-periodics.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.16-periodics.yaml
@@ -871,7 +871,14 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.16"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-kubevirt-metal-ovn-disconnected
+  name: periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-kubevirt-metal-ovn-mce-disconnected
+  reporter_config:
+    slack:
+      channel: '#hypershift-kubevirt-platform'
+      job_states_to_report:
+      - failure
+      report_template: ':volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
+        <{{.Status.URL}}|View logs> :volcano:'
   spec:
     containers:
     - args:
@@ -880,8 +887,8 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/e2e-kubevirt-metal-ovn-disconnected-cluster-profile
-      - --target=e2e-kubevirt-metal-ovn-disconnected
+      - --secret-dir=/usr/local/e2e-kubevirt-metal-ovn-mce-disconnected-cluster-profile
+      - --target=e2e-kubevirt-metal-ovn-mce-disconnected
       - --variant=periodics
       command:
       - ci-operator
@@ -898,7 +905,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/e2e-kubevirt-metal-ovn-disconnected-cluster-profile
+      - mountPath: /usr/local/e2e-kubevirt-metal-ovn-mce-disconnected-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials

diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.17-periodics.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.17-periodics.yaml
@@ -1034,6 +1034,13 @@ periodics:
     job-release: "4.17"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-hypershift-release-4.17-periodics-e2e-kubevirt-metal-ovn-disconnected
+  reporter_config:
+    slack:
+      channel: '#hypershift-kubevirt-platform'
+      job_states_to_report:
+      - failure
+      report_template: ':volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
+        <{{.Status.URL}}|View logs> :volcano:'
   spec:
     containers:
     - args:

diff --git a/...nected/conformance/hypershift-kubevirt-baremetalds-disconnected-conformance-workflow.yaml b/...nected/conformance/hypershift-kubevirt-baremetalds-disconnected-conformance-workflow.yaml
@@ -23,6 +23,7 @@ workflow:
     allow_best_effort_post_steps: true
     allow_skip_on_success: true
     post:
+    - ref: hypershift-kubevirt-baremetalds-disconnected-highlightmissingimages
     - chain: gather-core-dump
     - chain: hypershift-kubevirt-destroy
     - chain: baremetalds-ipi-post

diff --git a/.../step-registry/hypershift/kubevirt/baremetalds/disconnected/highlightmissingimages/OWNERS b/.../step-registry/hypershift/kubevirt/baremetalds/disconnected/highlightmissingimages/OWNERS
@@ -0,0 +1,19 @@
+approvers:
+- csrwng
+- enxebre
+- sjenning
+- imain
+- LiangquanLi930
+- davidvossel
+- orenc1
+- tiraboschi
+options: {}
+reviewers:
+- csrwng
+- enxebre
+- sjenning
+- imain
+- LiangquanLi930
+- davidvossel
+- orenc1
+- tiraboschi
diff --git a/...ingimages/hypershift-kubevirt-baremetalds-disconnected-highlightmissingimages-commands.sh b/...ingimages/hypershift-kubevirt-baremetalds-disconnected-highlightmissingimages-commands.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+set -x
+oc get pods -A -o yaml | grep "Back-off pulling image" | sort | uniq
diff --git a/...ges/hypershift-kubevirt-baremetalds-disconnected-highlightmissingimages-ref.metadata.json b/...ges/hypershift-kubevirt-baremetalds-disconnected-highlightmissingimages-ref.metadata.json
@@ -0,0 +1,25 @@
+{
+	"path": "hypershift/kubevirt/baremetalds/disconnected/highlightmissingimages/hypershift-kubevirt-baremetalds-disconnected-highlightmissingimages-ref.yaml",
+	"owners": {
+		"approvers": [
+			"csrwng",
+			"enxebre",
+			"sjenning",
+			"imain",
+			"LiangquanLi930",
+			"davidvossel",
+			"orenc1",
+			"tiraboschi"
+		],
+		"reviewers": [
+			"csrwng",
+			"enxebre",
+			"sjenning",
+			"imain",
+			"LiangquanLi930",
+			"davidvossel",
+			"orenc1",
+			"tiraboschi"
+		]
+	}
+}
diff --git a/...issingimages/hypershift-kubevirt-baremetalds-disconnected-highlightmissingimages-ref.yaml b/...issingimages/hypershift-kubevirt-baremetalds-disconnected-highlightmissingimages-ref.yaml
@@ -0,0 +1,12 @@
+ref:
+  as: hypershift-kubevirt-baremetalds-disconnected-highlightmissingimages
+  from: cli
+  grace_period: 10m
+  commands: hypershift-kubevirt-baremetalds-disconnected-highlightmissingimages-commands.sh
+  resources:
+    requests:
+      cpu: 1000m
+      memory: 500Mi
+  timeout: 10m0s
+  documentation: |-
+    This step to quickly identify missing images on disconnected test lanes
diff --git a/...baremetalds/redhat-operators/hypershift-kubevirt-baremetalds-redhat-operators-commands.sh b/...baremetalds/redhat-operators/hypershift-kubevirt-baremetalds-redhat-operators-commands.sh
@@ -136,6 +136,37 @@ END
 
     echo "7: Waiting for the new ImageContentSourcePolicy to be updated on machines"
     oc wait clusteroperators/machine-config --for=condition=Upgradeable=true --timeout=15m
+
+    # TODO: why do we need this? do we have a bug?
+    echo "8: explicitly fix IDMS for CSI sidecar images"
+
+    oc apply -f - <<END
+    apiVersion: config.openshift.io/v1
+    kind: ImageDigestMirrorSet
+    metadata:
+      name: cs-ccs-local-fixes
+    spec:
+      imageDigestMirrors:
+      - mirrors:
+        - virthost.ostest.test.metalkube.org:5000/openshift4/ose-csi-external-provisioner
+        source: registry.redhat.io/openshift4/ose-csi-external-provisioner
+      - mirrors:
+        - virthost.ostest.test.metalkube.org:5000/openshift4/ose-csi-external-resizer
+        source: registry.redhat.io/openshift4/ose-csi-external-resizer
+      - mirrors:
+        - virthost.ostest.test.metalkube.org:5000/openshift4/ose-csi-external-snapshotter-rhel9
+        source: registry.redhat.io/openshift4/ose-csi-external-snapshotter-rhel9
+      - mirrors:
+        - virthost.ostest.test.metalkube.org:5000/openshift4/ose-csi-external-snapshotter-rhel8
+        source: registry.redhat.io/openshift4/ose-csi-external-snapshotter-rhel8
+      - mirrors:
+        - virthost.ostest.test.metalkube.org:5000/openshift4/ose-csi-node-driver-registrar
+        source: registry.redhat.io/openshift4/ose-csi-node-driver-registrar
+      - mirrors:
+        - virthost.ostest.test.metalkube.org:5000/openshift4/ose-kube-rbac-proxy
+        source: registry.redhat.io/openshift4/ose-kube-rbac-proxy
+END
+
 EOF
 }
 

diff --git a/...ed/conformance/hypershift-mce-kubevirt-baremetalds-disconnected-conformance-workflow.yaml b/...ed/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: hypershift-kubevirt-baremetalds-disconnected-highlightmissingimages
     - ref: hypershift-mce-dump
     - chain: gather-core-dump
     - chain: hypershift-mce-kubevirt-destroy