interop: fix OPP test step symmetry across all variants

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

@@ -19,6 +19,10 @@ base_images:
     name: "2.17"
     namespace: acm-qe
     tag: multicluster-observability-operator-opp
+  ocs-ci-tests:
+    name: ocs-ci-container
+    namespace: ci
+    tag: stable
   tests-private:
     name: tests-private
     namespace: ci
@@ -139,6 +143,7 @@ tests:
     - 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: cr--full-stack--vsphere
@@ -199,7 +204,7 @@ tests:
     - ref: interop-opp-wait-mcp
     - ref: interop-opp-odf-health
     - ref: interop-opp-observability-odf
-    - ref: acm-tests-observability
+    - ref: interop-tests-ocs-tests
     - ref: acm-opp-app
 zz_generated_metadata:
   branch: master

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

@@ -15,6 +15,10 @@ base_images:
     name: "2.17"
     namespace: acm-qe
     tag: multicluster-observability-operator-opp
+  ocs-ci-tests:
+    name: ocs-ci-container
+    namespace: ci
+    tag: stable
   tests-private:
     name: tests-private
     namespace: ci
@@ -115,14 +119,18 @@ tests:
     - ref: acm-policies-openshift-plus-setup
     - ref: acm-policies-openshift-plus
     - ref: interop-opp-wait-mcp
+    - ref: stackrox-opp-readiness
+    - ref: stackrox-opp-smoke
     - 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: acm-tests-observability
-- as: cr--full-stack--vsphere
+    - ref: interop-opp-skip-ratio-gate
+- as: interop-opp-vsphere
   capabilities:
   - intranet
   cluster: vsphere02
@@ -179,8 +187,9 @@ tests:
     - ref: interop-opp-wait-mcp
     - ref: interop-opp-odf-health
     - ref: interop-opp-observability-odf
-    - ref: acm-tests-observability
+    - ref: interop-tests-ocs-tests
     - ref: acm-opp-app
+    - ref: interop-opp-skip-ratio-gate
     workflow: acm-ipi-vsphere
 zz_generated_metadata:
   branch: master

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

@@ -92,6 +92,7 @@ tests:
         [
           {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
+      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:
     - ref: acm-fetch-operator-versions
@@ -115,13 +116,17 @@ tests:
     - ref: acm-policies-openshift-plus-setup
     - ref: acm-policies-openshift-plus
     - ref: interop-opp-wait-mcp
-    - ref: acm-tests-clc-create
+    - ref: stackrox-opp-readiness
+    - ref: stackrox-opp-smoke
+    - 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: acm-tests-observability
-- as: cr--full-stack--vsphere
+    - ref: interop-opp-skip-ratio-gate
+- as: interop-opp-vsphere
   capabilities:
   - intranet
   cluster: vsphere02
@@ -158,6 +163,7 @@ tests:
           {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}
         ]
       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:
     - ref: acm-fetch-operator-versions
     - ref: acm-must-gather
@@ -176,9 +182,11 @@ 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-tests-observability
     - ref: acm-opp-app
+    - ref: interop-opp-skip-ratio-gate
     workflow: acm-ipi-vsphere
 zz_generated_metadata:
   branch: master

ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml

@@ -19,6 +19,10 @@ base_images:
     name: "2.17"
     namespace: acm-qe
     tag: multicluster-observability-operator-opp
+  ocs-ci-tests:
+    name: ocs-ci-container
+    namespace: ci
+    tag: stable
   tests-private:
     name: tests-private
     namespace: ci
@@ -132,11 +136,12 @@ tests:
     - ref: interop-opp-wait-mcp
     - ref: stackrox-opp-readiness
     - ref: stackrox-opp-smoke
-    - ref: acm-tests-clc-create
+    - 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/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml

@@ -44,8 +44,6 @@ tests:
   steps:
     allow_best_effort_post_steps: true
     cluster_profile: aws-cspi-qe
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:initial
     env:
       ACM_SUBSCRIPTION_NAMESPACE: ocm
       ACS_SUBSCRIPTION_NAMESPACE: openshift-operators
@@ -81,7 +79,7 @@ tests:
     - ref: ipi-conf-aws
     - ref: ipi-conf-aws-rootvolume
     - ref: ipi-install-monitoringpvc
-    - chain: ipi-install
+    - chain: ipi-install-stableinitial
     - ref: interop-opp-disk-diag
     - ref: interop-opp-kubelet-config
     - ref: interop-opp-wait-for-api

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

@@ -44,8 +44,6 @@ tests:
   steps:
     allow_best_effort_post_steps: true
     cluster_profile: aws-cspi-qe
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:initial
     env:
       AWS_COMPUTE_VOLUME_SIZE: "500"
       BASE_DOMAIN: cspilp.interop.ccitredhat.com
@@ -76,7 +74,7 @@ tests:
     - ref: ipi-conf-aws
     - ref: ipi-conf-aws-rootvolume
     - ref: ipi-install-monitoringpvc
-    - chain: ipi-install
+    - chain: ipi-install-stableinitial
     - ref: interop-opp-disk-diag
     - ref: interop-opp-kubelet-config
     - ref: interop-opp-wait-for-api
@@ -86,6 +84,7 @@ tests:
     - ref: interop-opp-preflight
     - ref: interop-opp-upgrade
     - ref: cucushift-upgrade-healthcheck
+    - ref: interop-opp-product-upgrade-acm
     - ref: interop-opp-smoke
     - ref: interop-opp-skip-ratio-gate
 zz_generated_metadata:

ci-operator/jobs/RedHatQE/interop-testing/RedHatQE-interop-testing-master-periodics.yaml

@@ -2761,7 +2761,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "5.0"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-RedHatQE-interop-testing-master-opp--ocp-5.0-lpMainline-lp-interop-cr--full-stack--vsphere
+  name: periodic-ci-RedHatQE-interop-testing-master-opp--ocp-5.0-lpMainline-lp-interop-interop-opp-vsphere
   reporter_config:
     slack:
       channel: '#opp-discussion'
@@ -2785,7 +2785,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=cr--full-stack--vsphere
+      - --target=interop-opp-vsphere
       - --variant=opp--ocp-5.0-lpMainline-lp-interop
       command:
       - ci-operator
@@ -2991,7 +2991,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "5.1"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-RedHatQE-interop-testing-master-opp--ocp-5.1-lpMainline-lp-interop-cr--full-stack--vsphere
+  name: periodic-ci-RedHatQE-interop-testing-master-opp--ocp-5.1-lpMainline-lp-interop-interop-opp-vsphere
   reporter_config:
     slack:
       channel: '#opp-discussion'
@@ -3015,7 +3015,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=cr--full-stack--vsphere
+      - --target=interop-opp-vsphere
       - --variant=opp--ocp-5.1-lpMainline-lp-interop
       command:
       - ci-operator

ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh

@@ -23,13 +23,14 @@ fi
 CLUSTER_NAME=$([[ -f "${SHARED_DIR}/CLUSTER_NAME" ]] && cat "${SHARED_DIR}/CLUSTER_NAME" || echo "cluster-name")
 CLUSTER_DOMAIN="${CLUSTER_DOMAIN:-release-ci.cnv-qe.rhood.us}"
 LOGS_FOLDER="${ARTIFACT_DIR}/ocs-tests"
-LOGS_CONFIG="${LOGS_FOLDER}/ocs-tests-config.yaml"
+LOGS_CONFIG="$(mktemp /tmp/ocs-tests-config.XXXXXX.yaml)"
 CLUSTER_PATH="${ARTIFACT_DIR}/ocs-tests"
 
 export BIN_FOLDER="${LOGS_FOLDER}/bin"
 
 # Function to clean up folders
 cleanup() {
+    rm -f "${LOGS_CONFIG}"
     # Tear down local auth copy created for run-ci.
     [[ -d "${CLUSTER_PATH}/auth" ]] && rm -rf "${CLUSTER_PATH}/auth"
 }
@@ -113,7 +114,6 @@ if [[ -f "${SHARED_DIR}/vsphere_context.sh" ]]; then
     set +x
     source "${SHARED_DIR}/vsphere_context.sh"
     source "${SHARED_DIR}/govc.sh"
-    set -x
 
     cat >> "${LOGS_CONFIG}" << __APPENDED_ENV_DATA__
 ENV_DATA:
@@ -124,6 +124,7 @@ ENV_DATA:
   vsphere_cluster: "${vsphere_cluster}"
   vsphere_datastore: "${vsphere_datastore}"
 __APPENDED_ENV_DATA__
+    set -x
 fi
 
 EXTRA_ARGS=""