From 0eddb9ab1bb747ddecb1e5d841195e5085d14273 Mon Sep 17 00:00:00 2001 From: Akshay Miskin Date: Fri, 7 Aug 2026 11:44:31 +0530 Subject: [PATCH 1/4] Add mpiit-data-router-reporter to OPP job post steps Adds the data-router-reporter step to all 6 OPP interop jobs (AWS + vSphere day-1, AWS upgrade for both 4.22 and 5.0) so test results are uploaded to Report Portal per INTEROP-9202 AC. For vSphere jobs using the acm-ipi-vsphere workflow, the post section is duplicated explicitly since adding post: replaces the workflow's entire post chain. Co-Authored-By: Claude Opus 4.6 --- ...tolostron-policy-collection-main__ocp4.22-upgrade.yaml | 1 + ...stolostron-policy-collection-main__ocp5.0-upgrade.yaml | 1 + .../stolostron-policy-collection-main__ocp5.0.yaml | 8 ++++++++ 3 files changed, 10 insertions(+) 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 a8e4a9187d0b1..4f9cbc64dcd1f 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 @@ -65,6 +65,7 @@ tests: post: - ref: gather-aws-console - chain: ipi-deprovision + - ref: mpiit-data-router-reporter - ref: firewatch-report-issues pre: - ref: ipi-conf 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 6573ee6e9e007..536ed97bdd309 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 @@ -63,6 +63,7 @@ tests: post: - ref: gather-aws-console - chain: ipi-deprovision + - ref: mpiit-data-router-reporter - ref: firewatch-report-issues pre: - ref: ipi-conf diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml index 4de0e90731551..2df3f8d1ebf83 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml @@ -103,6 +103,7 @@ tests: - ref: acm-tests-clc-destroy - ref: gather-aws-console - chain: ipi-deprovision + - ref: mpiit-data-router-reporter - ref: firewatch-report-issues pre: - ref: ipi-conf @@ -162,6 +163,13 @@ tests: SIZE_VARIANT: large TEST_IMPORTANCE: LEVEL0 TEST_SCENARIOS: Cluster_Observability + post: + - ref: acm-fetch-operator-versions + - ref: acm-must-gather + - ref: mce-must-gather + - chain: ipi-vsphere-post + - ref: mpiit-data-router-reporter + - ref: firewatch-report-issues test: - ref: install-operators - ref: acm-mch From 0f03ea788e5ef0daca97efe25f3743f89e25cda2 Mon Sep 17 00:00:00 2001 From: Akshay Miskin Date: Fri, 7 Aug 2026 14:35:37 +0530 Subject: [PATCH 2/4] Replace echo with xtrace for ExitTrap guard warnings Use `: "message"` instead of `echo "message" >&2` to follow team convention of relying on xtrace for script output. Co-Authored-By: Claude Opus 4.6 --- .../step-registry/acm/tests/alc/acm-tests-alc-commands.sh | 2 +- .../step-registry/acm/tests/grc/acm-tests-grc-commands.sh | 2 +- .../acm/tests/observability/acm-tests-observability-commands.sh | 2 +- .../quay-interop-test/quay-tests-quay-interop-test-commands.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-operator/step-registry/acm/tests/alc/acm-tests-alc-commands.sh b/ci-operator/step-registry/acm/tests/alc/acm-tests-alc-commands.sh index 520163e266189..17d5e4c7e4a89 100644 --- a/ci-operator/step-registry/acm/tests/alc/acm-tests-alc-commands.sh +++ b/ci-operator/step-registry/acm/tests/alc/acm-tests-alc-commands.sh @@ -16,7 +16,7 @@ if [ "${MAP_TESTS}" = "true" ]; then ExitTrap--PostProcessPrep ' EXIT else - echo "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" >&2 + : "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" fi fi diff --git a/ci-operator/step-registry/acm/tests/grc/acm-tests-grc-commands.sh b/ci-operator/step-registry/acm/tests/grc/acm-tests-grc-commands.sh index 74eae0133fb56..c88f2994aac59 100644 --- a/ci-operator/step-registry/acm/tests/grc/acm-tests-grc-commands.sh +++ b/ci-operator/step-registry/acm/tests/grc/acm-tests-grc-commands.sh @@ -16,7 +16,7 @@ if [ "${MAP_TESTS}" = "true" ]; then ExitTrap--PostProcessPrep ' EXIT else - echo "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" >&2 + : "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" fi fi diff --git a/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-commands.sh b/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-commands.sh index 19fab6dbd5596..6227554df8c11 100644 --- a/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-commands.sh +++ b/ci-operator/step-registry/acm/tests/observability/acm-tests-observability-commands.sh @@ -14,7 +14,7 @@ if [ "${MAP_TESTS}" = "true" ]; then ExitTrap--PostProcessPrep ' EXIT else - echo "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" >&2 + : "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" fi fi diff --git a/ci-operator/step-registry/quay-tests/quay-interop-test/quay-tests-quay-interop-test-commands.sh b/ci-operator/step-registry/quay-tests/quay-interop-test/quay-tests-quay-interop-test-commands.sh index 05b179b7b7563..4518602ae5d50 100644 --- a/ci-operator/step-registry/quay-tests/quay-interop-test/quay-tests-quay-interop-test-commands.sh +++ b/ci-operator/step-registry/quay-tests/quay-interop-test/quay-tests-quay-interop-test-commands.sh @@ -50,7 +50,7 @@ if [ "${MAP_TESTS}" = "true" ]; then ExitTrap--PostProcessPrep ' EXIT else - echo "WARNING: ExitTrap--PostProcessPrep not available, falling back to copyArtifacts only" >&2 + : "WARNING: ExitTrap--PostProcessPrep not available, falling back to copyArtifacts only" trap copyArtifacts EXIT fi else From 7b59a6fc43f567635585e71730da30e8d8672c39 Mon Sep 17 00:00:00 2001 From: Akshay Miskin Date: Sat, 8 Aug 2026 11:07:47 +0530 Subject: [PATCH 3/4] Remove mpiit-data-router-reporter from upgrade jobs Upgrade jobs don't set DR__RP__CR_COMP_NAME and run generic tests (preflight, upgrade, smoke) rather than per-product CR-mapped tests. The step hard-fails without a component name. Remove until a dedicated upgrade CR component is defined. Co-Authored-By: Claude Opus 4.6 --- .../stolostron-policy-collection-main__ocp4.22-upgrade.yaml | 1 - .../stolostron-policy-collection-main__ocp5.0-upgrade.yaml | 1 - 2 files changed, 2 deletions(-) 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 4f9cbc64dcd1f..a8e4a9187d0b1 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 @@ -65,7 +65,6 @@ tests: post: - ref: gather-aws-console - chain: ipi-deprovision - - ref: mpiit-data-router-reporter - ref: firewatch-report-issues pre: - ref: ipi-conf 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 536ed97bdd309..6573ee6e9e007 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 @@ -63,7 +63,6 @@ tests: post: - ref: gather-aws-console - chain: ipi-deprovision - - ref: mpiit-data-router-reporter - ref: firewatch-report-issues pre: - ref: ipi-conf From 5f2b425bf86c89ba35c7879343cc9a8b6fdc696b Mon Sep 17 00:00:00 2001 From: Akshay Miskin Date: Mon, 10 Aug 2026 18:47:35 +0530 Subject: [PATCH 4/4] Address review feedback: add missing env vars and fix warning visibility - Add DR__RP__CR_COMP_NAME and MAP_TESTS to ocp5.0 AWS and vSphere configs - Revert acm-tests-alc and acm-tests-grc warnings to echo >&2 since these scripts lack xtrace (-x), making : "message" silent Co-Authored-By: Claude Opus 4.6 --- .../stolostron-policy-collection-main__ocp5.0.yaml | 4 ++++ .../step-registry/acm/tests/alc/acm-tests-alc-commands.sh | 2 +- .../step-registry/acm/tests/grc/acm-tests-grc-commands.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml index 2df3f8d1ebf83..88a580668b852 100644 --- a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml +++ b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__ocp5.0.yaml @@ -82,12 +82,14 @@ tests: COMPUTE_NODE_REPLICAS: "6" 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_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.0-lp","opp-aws-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-9181 FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" + MAP_TESTS: "true" ODF_VERSION_MAJOR_MINOR: "5.0" OPERATORS: | [ @@ -147,12 +149,14 @@ tests: env: COMPUTE_NODE_REPLICAS: "6" DISABLE_ENVIRONMENT_CHECKER: "true" + DR__RP__CR_COMP_NAME: lp-interop--OPP FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-vsphere.json FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.0-lp","opp-vsphere-lp","opp-lp"]' FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-9181 FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" + MAP_TESTS: "true" ODF_VERSION_MAJOR_MINOR: "5.0" OPENSHIFT_REQUIRED_CORES: "72" OPENSHIFT_REQUIRED_MEMORY: "288" diff --git a/ci-operator/step-registry/acm/tests/alc/acm-tests-alc-commands.sh b/ci-operator/step-registry/acm/tests/alc/acm-tests-alc-commands.sh index 17d5e4c7e4a89..520163e266189 100644 --- a/ci-operator/step-registry/acm/tests/alc/acm-tests-alc-commands.sh +++ b/ci-operator/step-registry/acm/tests/alc/acm-tests-alc-commands.sh @@ -16,7 +16,7 @@ if [ "${MAP_TESTS}" = "true" ]; then ExitTrap--PostProcessPrep ' EXIT else - : "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" + echo "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" >&2 fi fi diff --git a/ci-operator/step-registry/acm/tests/grc/acm-tests-grc-commands.sh b/ci-operator/step-registry/acm/tests/grc/acm-tests-grc-commands.sh index c88f2994aac59..74eae0133fb56 100644 --- a/ci-operator/step-registry/acm/tests/grc/acm-tests-grc-commands.sh +++ b/ci-operator/step-registry/acm/tests/grc/acm-tests-grc-commands.sh @@ -16,7 +16,7 @@ if [ "${MAP_TESTS}" = "true" ]; then ExitTrap--PostProcessPrep ' EXIT else - : "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" + echo "WARNING: ExitTrap--PostProcessPrep not available, skipping junit remapping" >&2 fi fi