INTEROP-9511: OPP interop 4.22/5.0/5.1 ci-operator config fixes

ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml

@@ -107,6 +107,8 @@ tests:
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
       FIREWATCH_FAIL_WITH_TEST_FAILURES: "false"
       MAP_TESTS: "true"
+      MCP_WAIT_TIMEOUT: "4200"
+      ODF_OPERATOR_CHANNEL: stable-4.22
       ODF_VERSION_MAJOR_MINOR: "4.22"
       OPERATORS: |
         [
@@ -147,7 +149,6 @@ tests:
     - ref: acm-fetch-managed-clusters
     - ref: acm-opp-app
     - ref: interop-opp-odf-health
-    - ref: interop-opp-observability-odf
     - ref: interop-tests-ocs-tests
     - ref: interop-tests-opp-quay-smoke
     - ref: interop-opp-skip-ratio-gate
@@ -179,6 +180,8 @@ tests:
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
       FIREWATCH_FAIL_WITH_TEST_FAILURES: "false"
       MAP_TESTS: "true"
+      MCP_WAIT_TIMEOUT: "4200"
+      ODF_OPERATOR_CHANNEL: stable-4.22
       ODF_VERSION_MAJOR_MINOR: "4.22"
       OPENSHIFT_REQUIRED_CORES: "72"
       OPENSHIFT_REQUIRED_MEMORY: "288"
@@ -209,7 +212,6 @@ tests:
     - ref: acm-policies-openshift-plus
     - ref: interop-opp-wait-mcp
     - ref: interop-opp-odf-health
-    - ref: interop-opp-observability-odf
     - ref: interop-tests-ocs-tests
     - ref: acm-opp-app
     - ref: interop-opp-skip-ratio-gate

ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml

@@ -38,6 +38,20 @@ images:
     from: cli
     optional: true
     to: cli-with-skopeo
+  - dockerfile_literal: |
+      FROM registry.access.redhat.com/ubi9/openjdk-17:1.21
+      USER root
+      RUN microdnf install -y git gzip && microdnf clean all
+      RUN cd /tmp \
+          && curl -sLO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/candidate-5.0/openshift-client-linux.tar.gz \
+          && curl -sL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/candidate-5.0/sha256sum.txt \
+             | grep openshift-client-linux.tar.gz > /tmp/checksum.txt \
+          && test -s /tmp/checksum.txt \
+          && sha256sum -c /tmp/checksum.txt \
+          && tar xzf openshift-client-linux.tar.gz -C /usr/local/bin oc kubectl \
+          && rm -f openshift-client-linux.tar.gz /tmp/checksum.txt
+      USER 1001
+    to: acs-smoke-runner
 prowgen:
   enable_secrets_store_csi_driver: true
 releases:
@@ -84,11 +98,12 @@ tests:
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
       FIREWATCH_FAIL_WITH_TEST_FAILURES: "false"
       MAP_TESTS: "true"
-      ODF_VERSION_MAJOR_MINOR: "4.22"
+      ODF_OPERATOR_CHANNEL: stable-4.22
       OPERATORS: |
         [
           {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
+      QUAY_OPERATOR_CHANNEL: stable-3.17
       SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
       ZONES_COUNT: "3"
     post:
@@ -119,8 +134,6 @@ tests:
     - ref: acm-fetch-managed-clusters
     - ref: acm-opp-app
     - ref: interop-opp-odf-health
-    - ref: interop-opp-observability-odf
-    - ref: interop-tests-ocs-tests
     - ref: interop-tests-opp-quay-smoke
     - ref: interop-opp-skip-ratio-gate
 zz_generated_metadata:

ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml

@@ -46,6 +46,20 @@ images:
     from: cli
     optional: true
     to: cli-with-skopeo
+  - dockerfile_literal: |
+      FROM registry.access.redhat.com/ubi9/openjdk-17:1.21
+      USER root
+      RUN microdnf install -y git gzip && microdnf clean all
+      RUN cd /tmp \
+          && curl -sLO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/candidate-5.0/openshift-client-linux.tar.gz \
+          && curl -sL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/candidate-5.0/sha256sum.txt \
+             | grep openshift-client-linux.tar.gz > /tmp/checksum.txt \
+          && test -s /tmp/checksum.txt \
+          && sha256sum -c /tmp/checksum.txt \
+          && tar xzf openshift-client-linux.tar.gz -C /usr/local/bin oc kubectl \
+          && rm -f openshift-client-linux.tar.gz /tmp/checksum.txt
+      USER 1001
+    to: acs-smoke-runner
 prowgen:
   enable_secrets_store_csi_driver: true
 releases:
@@ -91,11 +105,12 @@ tests:
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
       FIREWATCH_FAIL_WITH_TEST_FAILURES: "false"
       MAP_TESTS: "true"
-      ODF_VERSION_MAJOR_MINOR: "4.22"
+      ODF_OPERATOR_CHANNEL: stable-4.22
       OPERATORS: |
         [
           {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
+      QUAY_OPERATOR_CHANNEL: stable-3.17
       SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
       ZONES_COUNT: "3"
     post:
@@ -126,8 +141,6 @@ tests:
     - ref: acm-fetch-managed-clusters
     - ref: acm-opp-app
     - ref: interop-opp-odf-health
-    - ref: interop-opp-observability-odf
-    - ref: interop-tests-ocs-tests
     - ref: interop-tests-opp-quay-smoke
     - ref: interop-opp-skip-ratio-gate
 - as: interop-opp-vsphere
@@ -158,14 +171,14 @@ tests:
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
       FIREWATCH_FAIL_WITH_TEST_FAILURES: "false"
       MAP_TESTS: "true"
-      ODF_VERSION_MAJOR_MINOR: "4.22"
+      ODF_OPERATOR_CHANNEL: stable-4.22
       OPENSHIFT_REQUIRED_CORES: "72"
       OPENSHIFT_REQUIRED_MEMORY: "288"
       OPERATORS: |
         [
           {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
-      RESOURCE_BIND_TIMEOUT: "180"
+      QUAY_OPERATOR_CHANNEL: stable-3.17
       SIZE_VARIANT: large
       SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
     post:
@@ -186,9 +199,6 @@ tests:
     - ref: acm-policies-openshift-plus-setup
     - ref: acm-policies-openshift-plus
     - ref: interop-opp-wait-mcp
-    - ref: interop-opp-odf-health
-    - ref: interop-opp-observability-odf
-    - ref: interop-tests-ocs-tests
     - ref: acm-opp-app
     - ref: interop-opp-skip-ratio-gate
     workflow: acm-ipi-vsphere

ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-fips-lpMainline-lp-interop.yaml

@@ -1,6 +1,6 @@
 base_images:
   clc-ui-e2e:
-    name: "2.17"
+    name: "2.18"
     namespace: acm-qe
     tag: clc-ui-e2e
   cli:
@@ -38,6 +38,20 @@ images:
     from: cli
     optional: true
     to: cli-with-skopeo
+  - dockerfile_literal: |
+      FROM registry.access.redhat.com/ubi9/openjdk-17:1.21
+      USER root
+      RUN microdnf install -y git gzip && microdnf clean all
+      RUN cd /tmp \
+          && curl -sLO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/candidate-5.0/openshift-client-linux.tar.gz \
+          && curl -sL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/candidate-5.0/sha256sum.txt \
+             | grep openshift-client-linux.tar.gz > /tmp/checksum.txt \
+          && test -s /tmp/checksum.txt \
+          && sha256sum -c /tmp/checksum.txt \
+          && tar xzf openshift-client-linux.tar.gz -C /usr/local/bin oc kubectl \
+          && rm -f openshift-client-linux.tar.gz /tmp/checksum.txt
+      USER 1001
+    to: acs-smoke-runner
 prowgen:
   enable_secrets_store_csi_driver: true
 releases:
@@ -84,11 +98,11 @@ tests:
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
       FIREWATCH_FAIL_WITH_TEST_FAILURES: "false"
       MAP_TESTS: "true"
-      ODF_VERSION_MAJOR_MINOR: "5.1"
       OPERATORS: |
         [
-          {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
+          {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.18", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
+      QUAY_OPERATOR_CHANNEL: stable-3.17
       SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
       ZONES_COUNT: "3"
     post:
@@ -118,9 +132,6 @@ tests:
     - ref: acm-tests-clc-smoke
     - ref: acm-fetch-managed-clusters
     - ref: acm-opp-app
-    - ref: interop-opp-odf-health
-    - ref: interop-opp-observability-odf
-    - ref: interop-tests-ocs-tests
     - ref: interop-tests-opp-quay-smoke
     - ref: interop-opp-skip-ratio-gate
 zz_generated_metadata:

ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml

@@ -42,6 +42,20 @@ images:
     from: cli
     optional: true
     to: cli-with-skopeo
+  - dockerfile_literal: |
+      FROM registry.access.redhat.com/ubi9/openjdk-17:1.21
+      USER root
+      RUN microdnf install -y git gzip && microdnf clean all
+      RUN cd /tmp \
+          && curl -sLO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/candidate-5.0/openshift-client-linux.tar.gz \
+          && curl -sL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/candidate-5.0/sha256sum.txt \
+             | grep openshift-client-linux.tar.gz > /tmp/checksum.txt \
+          && test -s /tmp/checksum.txt \
+          && sha256sum -c /tmp/checksum.txt \
+          && tar xzf openshift-client-linux.tar.gz -C /usr/local/bin oc kubectl \
+          && rm -f openshift-client-linux.tar.gz /tmp/checksum.txt
+      USER 1001
+    to: acs-smoke-runner
 prowgen:
   enable_secrets_store_csi_driver: true
 releases:
@@ -87,11 +101,11 @@ tests:
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
       FIREWATCH_FAIL_WITH_TEST_FAILURES: "false"
       MAP_TESTS: "true"
-      ODF_VERSION_MAJOR_MINOR: "5.1"
       OPERATORS: |
         [
-          {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
+          {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.18", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
+      QUAY_OPERATOR_CHANNEL: stable-3.17
       SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
       ZONES_COUNT: "3"
     post:
@@ -121,9 +135,6 @@ tests:
     - ref: acm-tests-clc-smoke
     - ref: acm-fetch-managed-clusters
     - ref: acm-opp-app
-    - ref: interop-opp-odf-health
-    - ref: interop-opp-observability-odf
-    - ref: interop-tests-ocs-tests
     - ref: interop-tests-opp-quay-smoke
     - ref: interop-opp-skip-ratio-gate
 - as: interop-opp-vsphere
@@ -146,7 +157,6 @@ tests:
     cluster_profile: vsphere-elastic
     env:
       COMPUTE_NODE_REPLICAS: "6"
-      DISABLE_ENVIRONMENT_CHECKER: "true"
       DR__RP__CR_COMP_NAME: lp-interop--OPP
       FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-vsphere.json
       FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.1-lp","opp-vsphere-lp","opp-lp"]'
@@ -155,13 +165,13 @@ tests:
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
       FIREWATCH_FAIL_WITH_TEST_FAILURES: "false"
       MAP_TESTS: "true"
-      ODF_VERSION_MAJOR_MINOR: "5.1"
       OPENSHIFT_REQUIRED_CORES: "72"
       OPENSHIFT_REQUIRED_MEMORY: "288"
       OPERATORS: |
         [
-          {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
+          {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.18", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
+      QUAY_OPERATOR_CHANNEL: stable-3.17
       SIZE_VARIANT: large
       SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status
     post:
@@ -182,9 +192,6 @@ tests:
     - ref: acm-policies-openshift-plus-setup
     - ref: acm-policies-openshift-plus
     - ref: interop-opp-wait-mcp
-    - ref: interop-opp-odf-health
-    - ref: interop-opp-observability-odf
-    - ref: interop-tests-ocs-tests
     - ref: acm-opp-app
     - ref: interop-opp-skip-ratio-gate
     workflow: acm-ipi-vsphere

ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml

@@ -64,7 +64,7 @@ tests:
       FIREWATCH_FAIL_WITH_TEST_FAILURES: "false"
       OPERATORS: |
         [
-          {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"},
+          {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.18", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"},
           {"name": "quay-operator", "source": "redhat-operators", "channel": "stable-3.17", "install_namespace": "openshift-operators"}
         ]
       ZONES_COUNT: "3"

ci-operator/step-registry/acm/opp-app/acm-opp-app-commands.sh

@@ -35,7 +35,7 @@ _propagate_junit () {
 ################################################################################
 
 # cd to writable directory
-cd /tmp/ || exit 0
+cd /tmp/ || { echo "ERROR: Cannot cd to /tmp" >&2; exit 1; }
 
 # Define all test cases with initial "skipped" status
 typeset -A testStatus
@@ -406,6 +406,17 @@ fi
 : "====== Test Summary ======"
 : "All test results will be available in JUnit XML report"
 
-# Always exit 0 to allow subsequent test steps to run
-# Test results are reported via JUnit XML
-exit 0
+# Exit based on whether any test failed
+typeset _overall_status="PASS"
+for test in "${allTestCasesArr[@]}"; do
+    if [[ "${testStatus[${test}]}" == "failed" ]]; then
+        _overall_status="FAIL"
+        break
+    fi
+done
+
+if [[ "${_overall_status}" == "PASS" ]]; then
+    exit 0
+else
+    exit 1
+fi

ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml

@@ -4,6 +4,7 @@ ref:
   commands: acm-opp-app-commands.sh
   timeout: 1h0m0s
   grace_period: 5m0s
+  best_effort: true
   resources:
     requests:
       cpu: 10m

ci-operator/step-registry/acm/policies/openshift-plus/acm-policies-openshift-plus-commands.sh

@@ -16,6 +16,17 @@ if [[ -n "${QUAY_OPERATOR_CHANNEL}" ]]; then
   sed -i "/^    name: quay-operator$/a\\    channel: ${QUAY_OPERATOR_CHANNEL}" "${quayPolicyFile}"
   grep -A5 'name: quay-operator' "${quayPolicyFile}"
 fi
+
+# If ODF_OPERATOR_CHANNEL is set, patch the ODF operator subscription to pin the channel
+if [[ -n "${ODF_OPERATOR_CHANNEL}" ]]; then
+  if [[ ! "${ODF_OPERATOR_CHANNEL}" =~ ^[A-Za-z0-9][A-Za-z0-9._-]*$ ]]; then
+    echo "Invalid ODF_OPERATOR_CHANNEL: ${ODF_OPERATOR_CHANNEL}" >&2
+    exit 1
+  fi
+  typeset odfPolicyFile="../policygenerator/policy-sets/stable/openshift-plus/input-odf/policy-odf.yaml"
+  sed -i "/^    name: odf-operator$/a\\    channel: ${ODF_OPERATOR_CHANNEL}" "${odfPolicyFile}"
+  grep -A5 'name: odf-operator' "${odfPolicyFile}"
+fi
 echo 'y' | ./deploy.sh -p policygenerator/policy-sets/stable/openshift-plus -n policies -u https://github.com/stolostron/policy-collection.git -a openshift-plus
 
 # openshift-plus generates ~25 policies; require 4+ before oc wait to avoid

ci-operator/step-registry/acm/policies/openshift-plus/acm-policies-openshift-plus-ref.yaml

@@ -18,5 +18,11 @@ ref:
       When set, overrides the Quay operator subscription channel in the policy-collection
       policy template before deploying. Use to pin a specific channel (e.g. stable-3.17)
       when the catalog default channel is incorrect or outdated.
+  - name: ODF_OPERATOR_CHANNEL
+    default: ""
+    documentation: |-
+      When set, overrides the ODF operator subscription channel in the policy-collection
+      policy template before deploying. Use to pin a specific channel (e.g. stable-4.22)
+      when the catalog default channel is incorrect or outdated.
   documentation: |-
     Setup and apply the openshift-plus policyset.

ci-operator/step-registry/acm/tests/grc/acm-tests-grc-commands.sh

@@ -44,7 +44,10 @@ RBAC_PASS=$(cat $SECRETS_DIR/grc/rbac-pass)
 export RBAC_PASS
 
 # run the test execution script
-./execute_grc_interop_commands.sh || :
+typeset -i _test_rc=0
+./execute_grc_interop_commands.sh || _test_rc=$?
 
 # Copy the test cases results to an external directory
-cp -r test-output/cypress $ARTIFACT_DIR/
+cp -r test-output/cypress "$ARTIFACT_DIR/" || true
+
+exit "${_test_rc}"

ci-operator/step-registry/acm/tests/grc/acm-tests-grc-ref.yaml

@@ -4,6 +4,7 @@ ref:
   commands: acm-tests-grc-commands.sh
   timeout: 28800s
   grace_period: 15m0s
+  best_effort: true
   resources:
     requests:
       cpu: '2'