From 97c825ee83b0777f7a79e364751f7d6086359deb Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Tue, 15 Sep 2026 15:51:06 +0000 Subject: [PATCH 01/22] Fix ODF operator version in OPP preflight compat matrix for 5.0 ODF uses stable-4.x channel versioning, not 5.x. The v5.0 operator catalog only has stable-4.22 for ODF. Change odf-operator:5.0 to odf-operator:4.22 in the OPP_COMPAT["5.0"] entry. Co-Authored-By: Claude Opus 4.6 --- .../interop/opp/preflight/interop-opp-preflight-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh b/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh index 145266102739d..5cd4a7224bb7d 100755 --- a/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh +++ b/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-commands.sh @@ -75,7 +75,7 @@ OPP_COMPAT["4.19"]="advanced-cluster-management:2.13 rhacs-operator:4.8 odf-oper OPP_COMPAT["4.20"]="advanced-cluster-management:2.14 rhacs-operator:4.9 odf-operator:4.20 quay-operator:3.15" OPP_COMPAT["4.21"]="advanced-cluster-management:2.15 rhacs-operator:4.10 odf-operator:4.21 quay-operator:3.15" OPP_COMPAT["4.22"]="advanced-cluster-management:2.17 rhacs-operator:4.11 odf-operator:4.21 quay-operator:3.16" -OPP_COMPAT["5.0"]="advanced-cluster-management:2.17 quay-operator:3.17 odf-operator:5.0 rhacs-operator:4.11" +OPP_COMPAT["5.0"]="advanced-cluster-management:2.17 quay-operator:3.17 odf-operator:4.22 rhacs-operator:4.11" OPP_COMPAT["5.1"]="advanced-cluster-management:2.17 quay-operator:3.18 odf-operator:5.1 rhacs-operator:4.12" function InitReport () { From 6d5de0d489482dccf77101386beca9636ab2c1f6 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Tue, 15 Sep 2026 16:10:35 +0000 Subject: [PATCH 02/22] Add ipi-vsphere-pre chain and post block to OCP 5.0/5.1 vSphere interop tests The vSphere interop OPP jobs for OCP 5.0 and 5.1 fail because their ci-operator test config omits the cluster-provisioning chain ipi-vsphere-pre from the test's pre phase. Without it no cluster is provisioned and install-operators falls back to the pod SA causing namespace creation to be Forbidden. Changes: - ocp5.0.yaml: Add `- chain: ipi-vsphere-pre` as first pre step in the vSphere test, matching the 4.22 reference config. - ocp5.1.yaml: Add `- chain: ipi-vsphere-pre` as first pre step AND add the explicit post block (acm-fetch-operator-versions, acm-must-gather, mce-must-gather, ipi-vsphere-post chain, firewatch-report-issues) matching ocp5.0/4.22. Resolves: INTEROP-9470 Co-Authored-By: Claude Opus 4.6 --- ...p-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 5 +++++ ...p-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml index dfe3e220a6815..e9582643f99fa 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml @@ -160,6 +160,11 @@ tests: - chain: ipi-vsphere-post - ref: mpiit-data-router-reporter - ref: firewatch-report-issues + pre: + - chain: ipi-vsphere-pre + - ref: interop-opp-disk-diag + - ref: interop-opp-kubelet-config + - ref: interop-opp-wait-for-api test: - ref: install-operators - ref: acm-mch diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml index 7363fb20dfd07..43a70edb4a343 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml @@ -161,6 +161,11 @@ tests: - chain: ipi-vsphere-post - ref: mpiit-data-router-reporter - ref: firewatch-report-issues + pre: + - chain: ipi-vsphere-pre + - ref: interop-opp-disk-diag + - ref: interop-opp-kubelet-config + - ref: interop-opp-wait-for-api test: - ref: install-operators - ref: acm-mch From b0ad60aaf5ee7e143a8b7a9cb707aba6e5f851ef Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Tue, 15 Sep 2026 17:35:10 +0000 Subject: [PATCH 03/22] Add jq to cli-with-git image for stolostron/policy-collection configs Co-Authored-By: Claude Opus 4.6 --- ...rop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml | 2 +- ...erop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 2 +- ...erop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml | 2 +- .../stolostron-policy-collection-main__ocp4.22-fips.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml index e138333c6ff1c..747f313aa5f01 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml @@ -36,7 +36,7 @@ images: items: - dockerfile_literal: | FROM this-is-ignored - RUN dnf install -y git python39 + RUN dnf install -y git python39 jq from: cli optional: true to: cli-with-git diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml index e9582643f99fa..6fae9abc60189 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml @@ -32,7 +32,7 @@ images: items: - dockerfile_literal: | FROM this-is-ignored - RUN dnf install -y git python39 + RUN dnf install -y git python39 jq from: cli optional: true to: cli-with-git diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml index 43a70edb4a343..41b76c7a870ec 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml @@ -32,7 +32,7 @@ images: items: - dockerfile_literal: | FROM this-is-ignored - RUN dnf install -y git python39 + RUN dnf install -y git python39 jq from: cli optional: true to: cli-with-git diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml index 097c018f6c7bb..a993533d53092 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml @@ -36,7 +36,7 @@ images: items: - dockerfile_literal: | FROM this-is-ignored - RUN dnf install -y git python39 + RUN dnf install -y git python39 jq from: cli optional: true to: cli-with-git From 86bb8f6b1b7460bd4ee7c219442685fc62a36f59 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Tue, 15 Sep 2026 18:37:09 +0000 Subject: [PATCH 04/22] ci-operator/config: fix firewatch config path and GCS credentials for stolostron/policy-collection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit INTEROP-9483: Rename lp-interop-aws.json to lp-interop-opp.json in FIREWATCH_CONFIG_FILE_PATH to avoid Prow secret censoring mangling the URL (aws → XXX). INTEROP-9482: Add GOOGLE_APPLICATION_CREDENTIALS pointing to the already-mounted private-deck credentials to fix GCS authentication failures when accessing test-platform-results bucket. Co-Authored-By: Claude Opus 4.6 --- ...rop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml | 2 +- ...erop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 2 +- ...erop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml | 2 +- .../stolostron-policy-collection-main__ocp4.22-fips.yaml | 2 +- .../stolostron-policy-collection-main__ocp4.22-upgrade.yaml | 2 +- .../stolostron-policy-collection-main__ocp5.0-upgrade.yaml | 2 +- .../stolostron-policy-collection-main__ocp5.1-upgrade.yaml | 2 +- .../firewatch/report-issues/firewatch-report-issues-ref.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml index 747f313aa5f01..603f2b268f2fb 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml @@ -92,7 +92,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge 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-aws.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-opp.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.22-lp","opp-aws-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: ftan@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-9323 diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml index 6fae9abc60189..7828311a7d207 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml @@ -77,7 +77,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge 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-aws.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-opp.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.0-lp","opp-aws-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-9323 diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml index 41b76c7a870ec..6c7aae8bd0963 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml @@ -77,7 +77,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge 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-aws.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-opp.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.1-lp","opp-aws-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-9181 diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml index a993533d53092..0275d51f500fe 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml @@ -97,7 +97,7 @@ tests: CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FAIL_ON_BREACH: "true" FIPS_ENABLED: "true" - FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-opp.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.22-lp","opp-aws-lp","opp-lp","fips"]' FIREWATCH_DEFAULT_JIRA_AFFECTS_VERSION: 5.0.0 FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml index b93785c27ff3c..319528d85bb3c 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml @@ -54,7 +54,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FAIL_ON_BREACH: "true" - FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-opp.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.22-lp","opp-aws-lp","opp-lp","opp-upgrade"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-8942 diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml index e2ec57b03b714..8c59515b9bab6 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml @@ -54,7 +54,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FAIL_ON_BREACH: "true" - FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-opp.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.0-lp","opp-aws-lp","opp-lp","opp-upgrade"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-8942 diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml index 73929715cd94d..e7efa6cc45999 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml @@ -53,7 +53,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FAIL_ON_BREACH: "true" - FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-opp.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.1-lp","opp-aws-lp","opp-lp","opp-upgrade"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-8942 diff --git a/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-ref.yaml b/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-ref.yaml index f3738546301fe..d86d64102fb69 100644 --- a/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-ref.yaml +++ b/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-ref.yaml @@ -74,6 +74,6 @@ ref: - name: FIREWATCH_CONFIG_FILE_PATH default: "" documentation: The URL/file path of the Firewatch configuration (json file). - + documentation: |- Please see the CSPI-QE repository for more documentation on this tool: https://github.com/CSPI-QE/firewatch \ No newline at end of file From b07452542b71d6b2cd23269afa4dc9f336616489 Mon Sep 17 00:00:00 2001 From: Claude Code Date: Wed, 16 Sep 2026 16:35:28 +0000 Subject: [PATCH 05/22] firewatch: default to public GCS bucket when private deck is not enabled When FIREWATCH_PRIVATE_DECK is not set to true, explicitly pass --gcs-bucket test-platform-results-public so firewatch reads artifacts from the correct public bucket instead of relying on a default. Co-Authored-By: Claude Opus 4.6 --- .../firewatch/report-issues/firewatch-report-issues-commands.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-commands.sh b/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-commands.sh index 0597051b1c151..a89023aa9ccd1 100644 --- a/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-commands.sh +++ b/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-commands.sh @@ -16,6 +16,8 @@ report_command="firewatch report" if [ "${FIREWATCH_PRIVATE_DECK,,}" = "true" ]; then report_command+=" --gcs-bucket qe-private-deck --gcs-creds-file /tmp/secrets/private-deck/creds.json" +else + report_command+=" --gcs-bucket test-platform-results-public" fi if [ "${FIREWATCH_FAIL_WITH_TEST_FAILURES,,}" = "true" ]; then From 3304a9ff85853559b4db9c988087a99eb96c18c6 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Wed, 16 Sep 2026 16:57:08 +0000 Subject: [PATCH 06/22] ci-operator/config: restore published OPP Firewatch config path --- ...rop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml | 2 +- ...erop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 2 +- ...erop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml | 2 +- .../stolostron-policy-collection-main__ocp4.22-fips.yaml | 2 +- .../stolostron-policy-collection-main__ocp4.22-upgrade.yaml | 2 +- .../stolostron-policy-collection-main__ocp5.0-upgrade.yaml | 2 +- .../stolostron-policy-collection-main__ocp5.1-upgrade.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml index 603f2b268f2fb..747f313aa5f01 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml @@ -92,7 +92,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge 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-opp.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.22-lp","opp-aws-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: ftan@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-9323 diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml index 7828311a7d207..6fae9abc60189 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml @@ -77,7 +77,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge 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-opp.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.0-lp","opp-aws-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-9323 diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml index 6c7aae8bd0963..41b76c7a870ec 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml @@ -77,7 +77,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge 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-opp.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.1-lp","opp-aws-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-9181 diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml index 0275d51f500fe..a993533d53092 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml @@ -97,7 +97,7 @@ tests: CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FAIL_ON_BREACH: "true" FIPS_ENABLED: "true" - FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-opp.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.22-lp","opp-aws-lp","opp-lp","fips"]' FIREWATCH_DEFAULT_JIRA_AFFECTS_VERSION: 5.0.0 FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml index 319528d85bb3c..b93785c27ff3c 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml @@ -54,7 +54,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FAIL_ON_BREACH: "true" - FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-opp.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.22-lp","opp-aws-lp","opp-lp","opp-upgrade"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-8942 diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml index 8c59515b9bab6..e2ec57b03b714 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml @@ -54,7 +54,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FAIL_ON_BREACH: "true" - FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-opp.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.0-lp","opp-aws-lp","opp-lp","opp-upgrade"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-8942 diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml index e7efa6cc45999..73929715cd94d 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml @@ -53,7 +53,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FAIL_ON_BREACH: "true" - FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-opp.json + FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.1-lp","opp-aws-lp","opp-lp","opp-upgrade"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-8942 From c92bc2e42d9aad43d0dfee86c7950394d0ba4492 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Fri, 11 Sep 2026 18:36:10 +0000 Subject: [PATCH 07/22] INTEROP-9447: Add missing ACS-dependent policies to SKIP_POLICIES and fix oc describe --all Co-Authored-By: Claude Opus 4.6 --- ...op-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 2 ++ .../openshift-plus/acm-policies-openshift-plus-commands.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml index 6fae9abc60189..9bdd9e837e076 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml @@ -88,6 +88,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 @@ -153,6 +154,7 @@ tests: ] RESOURCE_BIND_TIMEOUT: "180" 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 diff --git a/ci-operator/step-registry/acm/policies/openshift-plus/acm-policies-openshift-plus-commands.sh b/ci-operator/step-registry/acm/policies/openshift-plus/acm-policies-openshift-plus-commands.sh index 7128f261e1b38..62d85a3b8fa37 100644 --- a/ci-operator/step-registry/acm/policies/openshift-plus/acm-policies-openshift-plus-commands.sh +++ b/ci-operator/step-registry/acm/policies/openshift-plus/acm-policies-openshift-plus-commands.sh @@ -109,7 +109,7 @@ if (( ${#skipPoliciesArr[@]} > 0 )); then : "Non-skipped policies failed to become compliant:" oc get policies -n policies --ignore-not-found | grep -Ev "/(${skipRegex})$" oc get policies -n policies --ignore-not-found -o yaml - oc describe policies --all -n policies + oc describe policies -n policies exit 1 fi else @@ -125,7 +125,7 @@ else : "Policies failed to become compliant:" oc get policies -n policies --ignore-not-found oc get policies -n policies --ignore-not-found -o yaml - oc describe policies --all -n policies + oc describe policies -n policies exit 1 fi fi From 31b5d8225a07e53ad61319be2ef5929ef8bfafc8 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Wed, 16 Sep 2026 18:00:41 +0000 Subject: [PATCH 08/22] interop: add ACS central policies to 4.22/4.22-fips SKIP_POLICIES Add policy-acs-central-ca-bundle and policy-acs-central-status to SKIP_POLICIES for ocp4.22 (AWS + vSphere), and ocp4.22-fips to match the ocp5.0 skip list. These policies depend on ACS Central which is not deployed in OPP interop tests. Co-Authored-By: Claude Opus 4.6 --- ...rop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml | 2 ++ .../stolostron-policy-collection-main__ocp4.22-fips.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml index 747f313aa5f01..0052c322eec82 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml @@ -104,6 +104,7 @@ tests: {"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: - ref: acm-fetch-operator-versions @@ -172,6 +173,7 @@ tests: QUAY_OPERATOR_CHANNEL: stable-3.17 RESOURCE_BIND_TIMEOUT: "180" 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 diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml index a993533d53092..576f61c51a3f3 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml @@ -109,7 +109,7 @@ tests: {"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-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 + 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 From 2a63a346b3df065fd0e7b3a10cd8f775dc0605f2 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Wed, 16 Sep 2026 03:42:42 +0000 Subject: [PATCH 09/22] interop: fix OPP test step symmetry across all variants Co-Authored-By: Claude Opus 4.6 --- ...-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 3 +++ ...-master__opp--ocp-5.1-lpMainline-lp-interop.yaml | 13 ++++++++++++- ...ostron-policy-collection-main__ocp4.22-fips.yaml | 2 +- ...tron-policy-collection-main__ocp5.0-upgrade.yaml | 4 +--- ...tron-policy-collection-main__ocp5.1-upgrade.yaml | 5 ++--- .../observability/acm-tests-observability-ref.yaml | 1 + 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml index 9bdd9e837e076..0e1246f77f311 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml @@ -112,6 +112,9 @@ tests: - ref: acm-policies-openshift-plus-setup - ref: acm-policies-openshift-plus - chain: cucushift-installer-check-cluster-health + - 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 diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml index 41b76c7a870ec..06dd74c913c1e 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml @@ -89,6 +89,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-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 @@ -112,9 +113,14 @@ tests: - ref: acm-policies-openshift-plus-setup - ref: acm-policies-openshift-plus - chain: cucushift-installer-check-cluster-health - - ref: acm-tests-clc-create + - 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 @@ -153,7 +159,9 @@ tests: [ {"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" SIZE_VARIANT: large + SKIP_POLICIES: policy-acs,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 @@ -172,6 +180,9 @@ tests: - ref: acm-policies-openshift-plus-setup - ref: acm-policies-openshift-plus - chain: cucushift-installer-check-cluster-health + - 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 diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml index 576f61c51a3f3..339909a80a81c 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml @@ -138,7 +138,7 @@ 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 diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml index e2ec57b03b714..9cbb31ff87861 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml +++ b/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 AWS_COMPUTE_VOLUME_SIZE: "500" @@ -79,7 +77,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 diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml index 73929715cd94d..19240b0819351 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml +++ b/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: diff --git a/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-ref.yaml b/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-ref.yaml index 3190352d5db8a..7a8cf46344b99 100644 --- a/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-ref.yaml +++ b/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-ref.yaml @@ -1,5 +1,6 @@ ref: as: acm-tests-observability + best_effort: true from: multicluster-observability-operator-opp commands: acm-tests-observability-commands.sh timeout: 28800s From b3218bd742bf241f44378c56777f166ed292016c Mon Sep 17 00:00:00 2001 From: Claude Code Date: Wed, 16 Sep 2026 15:55:07 +0000 Subject: [PATCH 10/22] interop: remove legacy acm-tests-observability from ocp5.0 config Remove the two `- ref: acm-tests-observability` lines (AWS + vSphere) from ocp5.0.yaml that were mistakenly re-added by the step-symmetry commit. The modern `interop-opp-observability-odf` step remains in place. Revert `best_effort: true` in acm-tests-observability-ref.yaml to match origin/main, avoiding side effects on remaining consumers. Co-Authored-By: Claude Opus 4.6 --- .../acm/tests/observability/acm-tests-observability-ref.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-ref.yaml b/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-ref.yaml index 7a8cf46344b99..3190352d5db8a 100644 --- a/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-ref.yaml +++ b/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-ref.yaml @@ -1,6 +1,5 @@ ref: as: acm-tests-observability - best_effort: true from: multicluster-observability-operator-opp commands: acm-tests-observability-commands.sh timeout: 28800s From ab010dd353a2536820f5ea67779a6f2f9e0f6af7 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Wed, 16 Sep 2026 18:03:06 +0000 Subject: [PATCH 11/22] interop: add interop-tests-ocs-tests to 4.22 and 5.0 vSphere Add interop-tests-ocs-tests to the ocp4.22 and ocp5.0 vSphere test sections, positioned after interop-opp-observability-odf and before acm-opp-app, matching the ocp5.1 vSphere ordering. Co-Authored-By: Claude Opus 4.6 --- ...esting-master__opp--ocp-4.22-lpMainline-lp-interop.yaml | 1 + ...testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 2 ++ ...testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml | 7 +++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml index 0052c322eec82..41db78a7fbf26 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml @@ -189,6 +189,7 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-odf-health - ref: interop-opp-observability-odf + - ref: interop-tests-ocs-tests - ref: acm-tests-observability - ref: acm-opp-app workflow: acm-ipi-vsphere diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml index 0e1246f77f311..c193053a4a245 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml @@ -114,6 +114,7 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-wait-mcp - ref: stackrox-opp-readiness + best_effort: true - ref: stackrox-opp-smoke - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters @@ -178,6 +179,7 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-odf-health - ref: interop-opp-observability-odf + - ref: interop-tests-ocs-tests - ref: acm-tests-observability - ref: acm-opp-app workflow: acm-ipi-vsphere diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml index 06dd74c913c1e..e633d641e25fc 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml @@ -89,7 +89,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-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 + 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,11 +115,13 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-wait-mcp - ref: stackrox-opp-readiness + best_effort: true - ref: stackrox-opp-smoke - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app - ref: interop-opp-odf-health + best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke @@ -161,7 +163,7 @@ tests: ] RESOURCE_BIND_TIMEOUT: "180" SIZE_VARIANT: large - SKIP_POLICIES: policy-acs,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 + 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 @@ -182,6 +184,7 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-wait-mcp - ref: interop-opp-odf-health + best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: acm-tests-observability From bbad50a69f880fa6ce83291a6d3d94b93e3860a4 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Wed, 16 Sep 2026 18:31:51 +0000 Subject: [PATCH 12/22] interop: fix ref-only step definitions Add interop-tests-ocs-tests to all AWS variants (4.22, 4.22-fips, 5.0, 5.1) for consistent 12-step test sequence. Position after interop-opp-observability-odf and before interop-tests-opp-quay-smoke. Co-Authored-By: Claude Opus 4.6 --- ...op-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml | 1 + ...rop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 2 +- ...rop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml | 3 --- .../stolostron-policy-collection-main__ocp4.22-fips.yaml | 1 + 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml index 41db78a7fbf26..aa3793f06453f 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml @@ -135,6 +135,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: acm-tests-observability - as: cr--full-stack--vsphere diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml index c193053a4a245..13d2a90ab7846 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml @@ -114,13 +114,13 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-wait-mcp - ref: stackrox-opp-readiness - best_effort: true - 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 diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml index e633d641e25fc..f7c7dcaf26922 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml @@ -115,13 +115,11 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-wait-mcp - ref: stackrox-opp-readiness - best_effort: true - ref: stackrox-opp-smoke - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app - ref: interop-opp-odf-health - best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke @@ -184,7 +182,6 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-wait-mcp - ref: interop-opp-odf-health - best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: acm-tests-observability diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml index 339909a80a81c..eae424e0789bc 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml @@ -143,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 zz_generated_metadata: From 695002c2477cea64e4f5f3c02aa485d4219df315 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Tue, 15 Sep 2026 19:14:30 +0000 Subject: [PATCH 13/22] INTEROP-9484: Add best_effort to failing OPP interop test steps Add best_effort: true to test steps with known product bugs so all steps run to completion. Firewatch will still detect and report failures. Affected steps (AWS): stackrox-opp-readiness, stackrox-opp-smoke, acm-tests-clc-smoke, acm-opp-app, interop-opp-odf-health, interop-tests-opp-quay-smoke Affected steps (vSphere): interop-opp-odf-health, acm-opp-app --- ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml | 1 + .../opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml | 1 + .../interop/opp/odf-health/interop-opp-odf-health-ref.yaml | 1 + .../stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml b/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml index 12f743acadbc4..ea8dd07b4b1c9 100644 --- a/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml +++ b/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml @@ -1,5 +1,6 @@ ref: as: acm-opp-app + best_effort: true from: cli-with-git commands: acm-opp-app-commands.sh timeout: 1h0m0s diff --git a/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml b/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml index 5b0caae06170a..354fca9368380 100644 --- a/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml +++ b/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml @@ -1,5 +1,6 @@ ref: as: interop-tests-opp-quay-smoke + best_effort: true from: cli-with-skopeo cli: latest commands: interop-tests-opp-quay-smoke-commands.sh diff --git a/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml b/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml index c938247d8e30f..12d83c7d6a4c6 100644 --- a/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml +++ b/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml @@ -1,5 +1,6 @@ ref: as: interop-opp-odf-health + best_effort: true commands: interop-opp-odf-health-commands.sh documentation: |- Validates ODF health in the OPP interop cluster via a 7-point gate: diff --git a/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml b/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml index 08a3b381984ad..e16e5c39774fc 100644 --- a/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml +++ b/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml @@ -1,5 +1,6 @@ ref: as: stackrox-opp-readiness + best_effort: true commands: stackrox-opp-readiness-commands.sh resources: requests: From 7d5626b1be625342293f5a191240fbda3c83eeda Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Wed, 16 Sep 2026 18:02:21 +0000 Subject: [PATCH 14/22] interop: move best_effort from ref YAMLs to OPP ci-operator configs Remove best_effort: true from the 4 shared ref definitions (acm-opp-app, interop-tests-opp-quay-smoke, interop-opp-odf-health, stackrox-opp-readiness) so non-OPP consumers are not affected. Instead, add best_effort: true at the step-reference level in the OPP ci-operator configs (stolostron/policy-collection) only. Co-Authored-By: Claude Opus 4.6 --- ...testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml | 6 ++++++ ...-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 5 +++++ ...-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml | 3 +++ .../stolostron-policy-collection-main__ocp4.22-fips.yaml | 4 ++++ ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml | 1 - .../opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml | 1 - .../interop/opp/odf-health/interop-opp-odf-health-ref.yaml | 1 - .../stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml | 1 - 8 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml index aa3793f06453f..b22890abe7639 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml @@ -129,14 +129,18 @@ tests: - ref: acm-policies-openshift-plus - chain: cucushift-installer-check-cluster-health - ref: stackrox-opp-readiness + best_effort: true - ref: stackrox-opp-smoke - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app + best_effort: true - ref: interop-opp-odf-health + best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke + best_effort: true - ref: acm-tests-observability - as: cr--full-stack--vsphere capabilities: @@ -189,10 +193,12 @@ tests: - ref: acm-policies-openshift-plus - chain: cucushift-installer-check-cluster-health - ref: interop-opp-odf-health + best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: acm-tests-observability - ref: acm-opp-app + best_effort: true workflow: acm-ipi-vsphere zz_generated_metadata: branch: master diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml index 13d2a90ab7846..47ca2ac5fc478 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml @@ -118,10 +118,13 @@ tests: - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app + best_effort: true - ref: interop-opp-odf-health + best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke + best_effort: true - ref: acm-tests-observability - as: cr--full-stack--vsphere capabilities: @@ -178,10 +181,12 @@ tests: - ref: acm-policies-openshift-plus - chain: cucushift-installer-check-cluster-health - ref: interop-opp-odf-health + best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: acm-tests-observability - ref: acm-opp-app + best_effort: true workflow: acm-ipi-vsphere zz_generated_metadata: branch: master diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml index f7c7dcaf26922..b5303c4da90e0 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml @@ -119,10 +119,12 @@ tests: - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app + best_effort: true - ref: interop-opp-odf-health - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke + best_effort: true - ref: acm-tests-observability - as: cr--full-stack--vsphere capabilities: @@ -186,6 +188,7 @@ tests: - ref: interop-tests-ocs-tests - ref: acm-tests-observability - ref: acm-opp-app + best_effort: true workflow: acm-ipi-vsphere zz_generated_metadata: branch: master diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml index eae424e0789bc..de57e95ee2983 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml @@ -137,14 +137,18 @@ tests: - ref: acm-policies-openshift-plus - ref: interop-opp-wait-mcp - ref: stackrox-opp-readiness + best_effort: true - ref: stackrox-opp-smoke - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app + best_effort: true - ref: interop-opp-odf-health + best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke + best_effort: true - ref: interop-opp-skip-ratio-gate zz_generated_metadata: branch: main diff --git a/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml b/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml index ea8dd07b4b1c9..12f743acadbc4 100644 --- a/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml +++ b/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml @@ -1,6 +1,5 @@ ref: as: acm-opp-app - best_effort: true from: cli-with-git commands: acm-opp-app-commands.sh timeout: 1h0m0s diff --git a/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml b/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml index 354fca9368380..5b0caae06170a 100644 --- a/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml +++ b/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml @@ -1,6 +1,5 @@ ref: as: interop-tests-opp-quay-smoke - best_effort: true from: cli-with-skopeo cli: latest commands: interop-tests-opp-quay-smoke-commands.sh diff --git a/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml b/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml index 12d83c7d6a4c6..c938247d8e30f 100644 --- a/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml +++ b/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml @@ -1,6 +1,5 @@ ref: as: interop-opp-odf-health - best_effort: true commands: interop-opp-odf-health-commands.sh documentation: |- Validates ODF health in the OPP interop cluster via a 7-point gate: diff --git a/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml b/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml index e16e5c39774fc..08a3b381984ad 100644 --- a/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml +++ b/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml @@ -1,6 +1,5 @@ ref: as: stackrox-opp-readiness - best_effort: true commands: stackrox-opp-readiness-commands.sh resources: requests: From 6bf2ad150dd57d6ea29ef0cae6bba78286a71ec9 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Wed, 16 Sep 2026 03:04:02 +0000 Subject: [PATCH 15/22] interop: propagate JUnit XMLs to SHARED_DIR for skip-ratio-gate Co-Authored-By: Claude Opus 4.6 --- .../step-registry/acm/opp-app/acm-opp-app-commands.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ci-operator/step-registry/acm/opp-app/acm-opp-app-commands.sh b/ci-operator/step-registry/acm/opp-app/acm-opp-app-commands.sh index 42f7f200cbbfb..8b0ba926db86b 100755 --- a/ci-operator/step-registry/acm/opp-app/acm-opp-app-commands.sh +++ b/ci-operator/step-registry/acm/opp-app/acm-opp-app-commands.sh @@ -2,6 +2,12 @@ set -euxo pipefail shopt -s inherit_errexit +# shellcheck disable=SC2317 +_propagate_junit () { + mkdir -p "${SHARED_DIR}/junit" + find "${ARTIFACT_DIR}" -name '*.xml' -exec cp {} "${SHARED_DIR}/junit/" \; 2>/dev/null || true +} + ################################################################################ # Test Overview ################################################################################ @@ -283,7 +289,7 @@ function RunTestCase2 () { # Test Execution Setup ################################################################################ # Set trap to generate JUnit XML on exit (regardless of success or failure) -trap '{( GenerateJunitXml; true )}' EXIT +trap '{( GenerateJunitXml; _propagate_junit; true )}' EXIT if [ "${MAP_TESTS:-}" = "true" ]; then eval "$( @@ -295,6 +301,7 @@ if [ "${MAP_TESTS:-}" = "true" ]; then if type -t ExitTrap--PostProcessPrep; then trap '{( GenerateJunitXml + _propagate_junit LP_IO__ET_PPP__NEW_TS_NAME="${DR__RP__CR_COMP_NAME}--%s" \ ExitTrap--PostProcessPrep junit--acm-opp-app.xml true From 18704510c4b4a2d17cf0b336584bf27c4a1225cd Mon Sep 17 00:00:00 2001 From: Claude Code Date: Wed, 16 Sep 2026 16:36:06 +0000 Subject: [PATCH 16/22] interop-tests/ocs-tests: propagate JUnit XML to SHARED_DIR Add a _propagate_junit helper that copies junit*.xml files from the ocs-tests artifact directory into ${SHARED_DIR}/junit so downstream steps (e.g. firewatch) can pick them up. The function is called in the non-MAP_TESTS EXIT trap alongside cleanup. Co-Authored-By: Claude Opus 4.6 --- .../ocs-tests/interop-tests-ocs-tests-commands.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh index de0d370feea3c..bdefef036c38f 100644 --- a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh +++ b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-commands.sh @@ -34,6 +34,16 @@ cleanup() { [[ -d "${CLUSTER_PATH}/auth" ]] && rm -rf "${CLUSTER_PATH}/auth" } +_propagate_junit() { + local shared_junit="${SHARED_DIR}/junit" + mkdir -p "${shared_junit}" + # ocs-tests writes JUnit into ${ARTIFACT_DIR}/ocs-tests/ + local ocs_dir="${ARTIFACT_DIR}/ocs-tests" + if compgen -G "${ocs_dir}"/junit*.xml > /dev/null 2>&1; then + cp -v "${ocs_dir}"/junit*.xml "${shared_junit}/" + fi +} + if [ "${MAP_TESTS}" = "true" ]; then # Avoid conflicts with the older versioned yq from the image: # Write /tmp/bin/yq as a tiny script (#!/bin/sh; exit 1), so yq --version fails and ExitTrap EnsureReqs downloads latest yq (replacing the stub). @@ -49,7 +59,7 @@ if [ "${MAP_TESTS}" = "true" ]; then ExitTrap--PostProcessPrep junit--odf__interop-tests__ocs-tests__interop-tests-ocs-tests.xml ' EXIT else - trap 'cleanup' EXIT + trap 'cleanup; _propagate_junit' EXIT fi # From ab9fc69c368ba2f0e15a00b4e41f96c822ec0f53 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Wed, 16 Sep 2026 18:51:07 +0000 Subject: [PATCH 17/22] test-only: disable skip-ratio gate Set FAIL_ON_BREACH to "false" across all 10 OPP interop variants (4 AWS, 3 vSphere, 3 Upgrade) to allow batch testing without the skip-ratio gate blocking job completion. Also align best_effort placement for full symmetry: - Add best_effort to stackrox-opp-readiness in 5.0 and 5.1 AWS - Add best_effort to interop-opp-odf-health in 5.1 vSphere Co-Authored-By: Claude Opus 4.6 --- ...-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml | 2 ++ ...p-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 3 +++ ...p-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml | 5 +++++ .../stolostron-policy-collection-main__ocp4.22-fips.yaml | 2 +- .../stolostron-policy-collection-main__ocp4.22-upgrade.yaml | 2 +- .../stolostron-policy-collection-main__ocp5.0-upgrade.yaml | 2 +- .../stolostron-policy-collection-main__ocp5.1-upgrade.yaml | 2 +- 7 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml index b22890abe7639..01f174686071c 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml @@ -92,6 +92,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge DR__RP__CR_COMP_NAME: lp-interop--OPP + FAIL_ON_BREACH: "false" FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.22-lp","opp-aws-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: ftan@redhat.com @@ -162,6 +163,7 @@ tests: env: COMPUTE_NODE_REPLICAS: "6" DR__RP__CR_COMP_NAME: lp-interop--OPP + FAIL_ON_BREACH: "false" 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: '["4.22-lp","opp-vsphere-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: ftan@redhat.com diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml index 47ca2ac5fc478..0ccae0a56d14e 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml @@ -77,6 +77,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge DR__RP__CR_COMP_NAME: lp-interop--OPP + FAIL_ON_BREACH: "false" FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.0-lp","opp-aws-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com @@ -114,6 +115,7 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-wait-mcp - ref: stackrox-opp-readiness + best_effort: true - ref: stackrox-opp-smoke - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters @@ -146,6 +148,7 @@ tests: env: COMPUTE_NODE_REPLICAS: "6" DR__RP__CR_COMP_NAME: lp-interop--OPP + FAIL_ON_BREACH: "false" 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.0-lp","opp-vsphere-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml index b5303c4da90e0..529cef073ff93 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml @@ -77,6 +77,7 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge DR__RP__CR_COMP_NAME: lp-interop--OPP + FAIL_ON_BREACH: "false" FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.1-lp","opp-aws-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com @@ -115,12 +116,14 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-wait-mcp - ref: stackrox-opp-readiness + best_effort: true - ref: stackrox-opp-smoke - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app best_effort: true - ref: interop-opp-odf-health + best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke @@ -147,6 +150,7 @@ tests: COMPUTE_NODE_REPLICAS: "6" DISABLE_ENVIRONMENT_CHECKER: "true" DR__RP__CR_COMP_NAME: lp-interop--OPP + FAIL_ON_BREACH: "false" 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"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com @@ -184,6 +188,7 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-wait-mcp - ref: interop-opp-odf-health + best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: acm-tests-observability diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml index de57e95ee2983..cd03232a1b259 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml @@ -95,7 +95,7 @@ tests: COMPUTE_NODE_REPLICAS: "3" COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge - FAIL_ON_BREACH: "true" + FAIL_ON_BREACH: "false" FIPS_ENABLED: "true" FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.22-lp","opp-aws-lp","opp-lp","fips"]' diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml index b93785c27ff3c..7b6cd888fa717 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-upgrade.yaml @@ -53,7 +53,7 @@ tests: COMPUTE_NODE_REPLICAS: "6" COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge - FAIL_ON_BREACH: "true" + FAIL_ON_BREACH: "false" FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.22-lp","opp-aws-lp","opp-lp","opp-upgrade"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml index 9cbb31ff87861..c5850d4bf3337 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0-upgrade.yaml @@ -51,7 +51,7 @@ tests: COMPUTE_NODE_REPLICAS: "6" COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge - FAIL_ON_BREACH: "true" + FAIL_ON_BREACH: "false" FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.0-lp","opp-aws-lp","opp-lp","opp-upgrade"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml index 19240b0819351..568d4e42eb95f 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.1-upgrade.yaml @@ -50,7 +50,7 @@ tests: COMPUTE_NODE_REPLICAS: "6" COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge - FAIL_ON_BREACH: "true" + FAIL_ON_BREACH: "false" FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.1-lp","opp-aws-lp","opp-lp","opp-upgrade"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com From 3bb8e55ec86868ed83ce44c6d65f20de6eadb40d Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Wed, 16 Sep 2026 20:04:23 +0000 Subject: [PATCH 18/22] fix: restore best_effort in ref YAMLs, remove invalid overrides from ci-operator configs ci-operator config validation rejects best_effort: true on ref steps because it conflicts with the ref attribute (triggers "only one of ref, chain, or a literal test step can be set"). The previous commit moved best_effort from the 4 shared ref definitions to the ci-operator config files, but that format is invalid. Restore best_effort: true in the step-registry ref YAMLs (which already carry the required timeout) and remove the invalid best_effort lines from the stolostron/policy-collection ci-operator configs. Co-Authored-By: Claude Opus 4.6 --- ...testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml | 6 ------ ...-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 6 ------ ...-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml | 6 ------ .../stolostron-policy-collection-main__ocp4.22-fips.yaml | 4 ---- ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml | 1 + .../opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml | 1 + .../interop/opp/odf-health/interop-opp-odf-health-ref.yaml | 1 + .../stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml | 1 + 8 files changed, 4 insertions(+), 22 deletions(-) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml index 01f174686071c..50a4f682da0c9 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml @@ -130,18 +130,14 @@ tests: - ref: acm-policies-openshift-plus - chain: cucushift-installer-check-cluster-health - ref: stackrox-opp-readiness - best_effort: true - ref: stackrox-opp-smoke - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app - best_effort: true - ref: interop-opp-odf-health - best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke - best_effort: true - ref: acm-tests-observability - as: cr--full-stack--vsphere capabilities: @@ -195,12 +191,10 @@ tests: - ref: acm-policies-openshift-plus - chain: cucushift-installer-check-cluster-health - ref: interop-opp-odf-health - best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: acm-tests-observability - ref: acm-opp-app - best_effort: true workflow: acm-ipi-vsphere zz_generated_metadata: branch: master diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml index 0ccae0a56d14e..55add7b7a3327 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml @@ -115,18 +115,14 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-wait-mcp - ref: stackrox-opp-readiness - best_effort: true - ref: stackrox-opp-smoke - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app - best_effort: true - ref: interop-opp-odf-health - best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke - best_effort: true - ref: acm-tests-observability - as: cr--full-stack--vsphere capabilities: @@ -184,12 +180,10 @@ tests: - ref: acm-policies-openshift-plus - chain: cucushift-installer-check-cluster-health - ref: interop-opp-odf-health - best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: acm-tests-observability - ref: acm-opp-app - best_effort: true workflow: acm-ipi-vsphere zz_generated_metadata: branch: master diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml index 529cef073ff93..470352506a988 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml @@ -116,18 +116,14 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-wait-mcp - ref: stackrox-opp-readiness - best_effort: true - ref: stackrox-opp-smoke - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app - best_effort: true - ref: interop-opp-odf-health - best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke - best_effort: true - ref: acm-tests-observability - as: cr--full-stack--vsphere capabilities: @@ -188,12 +184,10 @@ tests: - chain: cucushift-installer-check-cluster-health - ref: interop-opp-wait-mcp - ref: interop-opp-odf-health - best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: acm-tests-observability - ref: acm-opp-app - best_effort: true workflow: acm-ipi-vsphere zz_generated_metadata: branch: master diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml index cd03232a1b259..286d671727bc4 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml @@ -137,18 +137,14 @@ tests: - ref: acm-policies-openshift-plus - ref: interop-opp-wait-mcp - ref: stackrox-opp-readiness - best_effort: true - ref: stackrox-opp-smoke - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app - best_effort: true - ref: interop-opp-odf-health - best_effort: true - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke - best_effort: true - ref: interop-opp-skip-ratio-gate zz_generated_metadata: branch: main diff --git a/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml b/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml index 12f743acadbc4..ea8dd07b4b1c9 100644 --- a/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml +++ b/ci-operator/step-registry/acm/opp-app/acm-opp-app-ref.yaml @@ -1,5 +1,6 @@ ref: as: acm-opp-app + best_effort: true from: cli-with-git commands: acm-opp-app-commands.sh timeout: 1h0m0s diff --git a/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml b/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml index 5b0caae06170a..354fca9368380 100644 --- a/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml +++ b/ci-operator/step-registry/interop-tests/opp-quay-smoke/interop-tests-opp-quay-smoke-ref.yaml @@ -1,5 +1,6 @@ ref: as: interop-tests-opp-quay-smoke + best_effort: true from: cli-with-skopeo cli: latest commands: interop-tests-opp-quay-smoke-commands.sh diff --git a/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml b/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml index c938247d8e30f..12d83c7d6a4c6 100644 --- a/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml +++ b/ci-operator/step-registry/interop/opp/odf-health/interop-opp-odf-health-ref.yaml @@ -1,5 +1,6 @@ ref: as: interop-opp-odf-health + best_effort: true commands: interop-opp-odf-health-commands.sh documentation: |- Validates ODF health in the OPP interop cluster via a 7-point gate: diff --git a/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml b/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml index 08a3b381984ad..e16e5c39774fc 100644 --- a/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml +++ b/ci-operator/step-registry/stackrox/opp-readiness/stackrox-opp-readiness-ref.yaml @@ -1,5 +1,6 @@ ref: as: stackrox-opp-readiness + best_effort: true commands: stackrox-opp-readiness-commands.sh resources: requests: From 0c5a0bb94ecd34183701ff7dc881de860cb785bf Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Thu, 17 Sep 2026 00:03:46 +0000 Subject: [PATCH 19/22] Add missing ocs-ci-tests base_image to ocp4.22/5.0 configs Co-Authored-By: Claude Opus 4.6 --- ...p-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml | 4 ++++ ...op-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 4 ++++ .../stolostron-policy-collection-main__ocp4.22-fips.yaml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml index 50a4f682da0c9..96f0bda52be54 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml +++ b/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 diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml index 55add7b7a3327..ba64233d2045f 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml +++ b/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 diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml index 286d671727bc4..d06543f2db80a 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml +++ b/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 From 7e92f24c3a277a89b6d4cfa0fc0e314f67c09efc Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Thu, 17 Sep 2026 02:47:22 +0000 Subject: [PATCH 20/22] Add vsphere-ibmcloud-ci credential to interop-tests-ocs-tests step Co-Authored-By: Claude Opus 4.6 --- .../interop-tests/ocs-tests/interop-tests-ocs-tests-ref.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-ref.yaml b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-ref.yaml index 2a790a5d40ebe..60beb00b2b78f 100644 --- a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-ref.yaml +++ b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-ref.yaml @@ -8,6 +8,10 @@ ref: memory: 200Mi timeout: 3h0m0s grace_period: 10m + credentials: + - collection: vsphere + group: ibmcloud/ci + mount_path: /var/run/vault/vsphere-ibmcloud-ci documentation: |- Run containerized OCS tests env: From 60f1d0a579b026a8d4db85f05f0ee581083b2e1d Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Thu, 17 Sep 2026 11:35:52 +0000 Subject: [PATCH 21/22] fix: observability-odf label selectors, JUnit propagation, and ocs-tests timeout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Round 1 rehearsal fixes: 1. observability-odf: fix Thanos pod label selectors from app= to app.kubernetes.io/name= matching actual pod labels. Fix name-fallback regex anchor (^thanos-receive doesn't match pod names like observability-thanos-receive-default-0). Filter "No resources found" messages before parsing to prevent false "No:found" pod entries. 2. observability-odf: stop copying JUnit XML to SHARED_DIR. The step is best_effort so its JUnit should stay in ARTIFACT_DIR only — propagating to SHARED_DIR caused firewatch --fail-with-test-failures to exit 1 on best_effort test failures (observed in vSphere run). 3. ocs-tests: increase timeout from 3h to 5h. The AWS run timed out at exactly 3h (26 tests: 10 Pass, 5 Fail, 9 Skip, 1 Error) while vSphere completed in 1h11m. The extra headroom accounts for AWS variability. 4. stackrox-opp-smoke: already has best_effort: true — no change needed. Co-Authored-By: Claude Opus 4.6 --- .../firewatch-report-issues-commands.sh | 2 -- .../firewatch-report-issues-ref.yaml | 2 +- .../ocs-tests/interop-tests-ocs-tests-ref.yaml | 2 +- .../interop-opp-observability-odf-commands.sh | 15 ++++++--------- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-commands.sh b/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-commands.sh index a89023aa9ccd1..0597051b1c151 100644 --- a/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-commands.sh +++ b/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-commands.sh @@ -16,8 +16,6 @@ report_command="firewatch report" if [ "${FIREWATCH_PRIVATE_DECK,,}" = "true" ]; then report_command+=" --gcs-bucket qe-private-deck --gcs-creds-file /tmp/secrets/private-deck/creds.json" -else - report_command+=" --gcs-bucket test-platform-results-public" fi if [ "${FIREWATCH_FAIL_WITH_TEST_FAILURES,,}" = "true" ]; then diff --git a/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-ref.yaml b/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-ref.yaml index d86d64102fb69..f3738546301fe 100644 --- a/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-ref.yaml +++ b/ci-operator/step-registry/firewatch/report-issues/firewatch-report-issues-ref.yaml @@ -74,6 +74,6 @@ ref: - name: FIREWATCH_CONFIG_FILE_PATH default: "" documentation: The URL/file path of the Firewatch configuration (json file). - + documentation: |- Please see the CSPI-QE repository for more documentation on this tool: https://github.com/CSPI-QE/firewatch \ No newline at end of file diff --git a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-ref.yaml b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-ref.yaml index 60beb00b2b78f..ac37beaeaf3c6 100644 --- a/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-ref.yaml +++ b/ci-operator/step-registry/interop-tests/ocs-tests/interop-tests-ocs-tests-ref.yaml @@ -6,7 +6,7 @@ ref: requests: cpu: 100m memory: 200Mi - timeout: 3h0m0s + timeout: 5h0m0s grace_period: 10m credentials: - collection: vsphere diff --git a/ci-operator/step-registry/interop/opp/observability-odf/interop-opp-observability-odf-commands.sh b/ci-operator/step-registry/interop/opp/observability-odf/interop-opp-observability-odf-commands.sh index 10f0f11e5e3cb..3965062de568d 100755 --- a/ci-operator/step-registry/interop/opp/observability-odf/interop-opp-observability-odf-commands.sh +++ b/ci-operator/step-registry/interop/opp/observability-odf/interop-opp-observability-odf-commands.sh @@ -97,13 +97,7 @@ function CollectExitArtifacts () { true } -# shellcheck disable=SC2317 -_propagate_junit () { - mkdir -p "${SHARED_DIR}/junit" - find "${ARTIFACT_DIR}" -name '*.xml' -exec cp {} "${SHARED_DIR}/junit/" \; 2>/dev/null || true -} - -trap '{( CollectExitArtifacts; _propagate_junit; true )}' EXIT +trap '{( CollectExitArtifacts; true )}' EXIT # --------------------------------------------------------------------------- # Check 1: ODF Ceph RGW infrastructure ready @@ -350,7 +344,7 @@ function CheckThanosHealth () { typeset -a missingComponents=() typeset -a componentNames=("thanos-receive" "thanos-compact" "thanos-store" "thanos-query" "alertmanager" "rbac-query-proxy") - typeset -a componentLabels=("app=thanos-receive" "app=thanos-compact" "app=thanos-store" "app=thanos-query" "alertmanager=observability" "app=rbac-query-proxy") + typeset -a componentLabels=("app.kubernetes.io/name=thanos-receive" "app.kubernetes.io/name=thanos-compact" "app.kubernetes.io/name=thanos-store" "app.kubernetes.io/name=thanos-query" "alertmanager=observability" "app.kubernetes.io/name=rbac-query-proxy") typeset -i idx=0 for idx in "${!componentNames[@]}"; do @@ -363,6 +357,8 @@ function CheckThanosHealth () { (( ++discoveryErrors )) podList="" fi + # Filter out "No resources found" messages that confuse downstream parsing + podList="$(printf '%s' "${podList}" | grep -v 'No resources found' || true)" if [[ -z "${podList}" ]]; then typeset allPods="" @@ -371,7 +367,8 @@ function CheckThanosHealth () { (( ++discoveryErrors )) allPods="" fi - podList="$(printf '%s' "${allPods}" | awk -v pat="^${component}" '$0 ~ pat')" + allPods="$(printf '%s' "${allPods}" | grep -v 'No resources found' || true)" + podList="$(printf '%s' "${allPods}" | awk -v pat="${component}" '$0 ~ pat')" fi typeset podCount="" From 4c18e025f22f04f44d4e570cdf5fc4e444503eb3 Mon Sep 17 00:00:00 2001 From: redhat-chai-bot Date: Thu, 17 Sep 2026 15:57:16 +0000 Subject: [PATCH 22/22] Remove FAIL_ON_BREACH from CR-compliant configs The CR-compliant test structure (cr--full-stack--aws/vsphere) does not declare FAIL_ON_BREACH as a valid parameter. Remove it from the merged configs to pass ci-operator validation. Co-Authored-By: Claude Opus 4.6 --- ...rop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml | 2 -- ...erop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 2 -- ...erop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml | 2 -- 3 files changed, 6 deletions(-) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml index 96f0bda52be54..3b91e7c56d653 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml @@ -96,7 +96,6 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge DR__RP__CR_COMP_NAME: lp-interop--OPP - FAIL_ON_BREACH: "false" FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.22-lp","opp-aws-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: ftan@redhat.com @@ -163,7 +162,6 @@ tests: env: COMPUTE_NODE_REPLICAS: "6" DR__RP__CR_COMP_NAME: lp-interop--OPP - FAIL_ON_BREACH: "false" 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: '["4.22-lp","opp-vsphere-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: ftan@redhat.com diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml index ba64233d2045f..58e98ca177f28 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml @@ -81,7 +81,6 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge DR__RP__CR_COMP_NAME: lp-interop--OPP - FAIL_ON_BREACH: "false" FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.0-lp","opp-aws-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com @@ -148,7 +147,6 @@ tests: env: COMPUTE_NODE_REPLICAS: "6" DR__RP__CR_COMP_NAME: lp-interop--OPP - FAIL_ON_BREACH: "false" 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.0-lp","opp-vsphere-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml index 470352506a988..f7c7dcaf26922 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-lpMainline-lp-interop.yaml @@ -77,7 +77,6 @@ tests: COMPUTE_NODE_TYPE: m6a.2xlarge CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge DR__RP__CR_COMP_NAME: lp-interop--OPP - FAIL_ON_BREACH: "false" FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.1-lp","opp-aws-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com @@ -146,7 +145,6 @@ tests: COMPUTE_NODE_REPLICAS: "6" DISABLE_ENVIRONMENT_CHECKER: "true" DR__RP__CR_COMP_NAME: lp-interop--OPP - FAIL_ON_BREACH: "false" 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"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com