From 310f7bd1d78281cff3cfd1edfc4a730e04f4b17f Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Sun, 20 Sep 2026 18:23:31 +0000 Subject: [PATCH 1/4] =?UTF-8?q?INTEROP-9509:=20Batch=20OPP=20interop=20fix?= =?UTF-8?q?es=20=E2=80=94=20upi-installer,=20crons,=20SKIP=5FPOLICIES,=20t?= =?UTF-8?q?est=20symmetry,=20FIPS=20configs,=20acm-obs=20removal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 --- ...__opp--ocp-4.22-lpMainline-lp-interop.yaml | 11 +- ...p--ocp-5.0-fips-lpMainline-lp-interop.yaml | 133 ++++++++++ ...r__opp--ocp-5.0-lpMainline-lp-interop.yaml | 14 +- ...p--ocp-5.1-fips-lpMainline-lp-interop.yaml | 130 ++++++++++ ...r__opp--ocp-5.1-lpMainline-lp-interop.yaml | 16 +- ...-policy-collection-main__ocp4.22-fips.yaml | 9 +- ...licy-collection-main__ocp4.22-upgrade.yaml | 2 +- ...olicy-collection-main__ocp5.0-upgrade.yaml | 10 +- ...olicy-collection-main__ocp5.1-upgrade.yaml | 12 +- ...atQE-interop-testing-master-periodics.yaml | 238 +++++++++++++++++- ...tQE-interop-testing-master-presubmits.yaml | 118 +++++++++ ...tron-policy-collection-main-periodics.yaml | 8 +- .../interop-tests-ocs-tests-commands.sh | 5 +- .../preflight/interop-opp-preflight-ref.yaml | 5 + 14 files changed, 682 insertions(+), 29 deletions(-) create mode 100644 ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml create mode 100644 ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-fips-lpMainline-lp-interop.yaml 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 0d2a09b2ac787..a46340d00fa49 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,10 +19,18 @@ 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 tag: "4.22" + upi-installer: + name: "4.22" + namespace: ocp + tag: upi-installer build_root: image_stream_tag: name: release @@ -139,6 +147,7 @@ tests: - ref: acm-opp-app - ref: interop-opp-odf-health - ref: interop-opp-observability-odf + - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke - ref: interop-opp-skip-ratio-gate - as: cr--full-stack--vsphere @@ -199,7 +208,7 @@ tests: - ref: interop-opp-wait-mcp - ref: interop-opp-odf-health - ref: interop-opp-observability-odf - - ref: acm-tests-observability + - ref: interop-tests-ocs-tests - ref: acm-opp-app zz_generated_metadata: branch: master diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml new file mode 100644 index 0000000000000..dfc68667ee9f3 --- /dev/null +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml @@ -0,0 +1,133 @@ +base_images: + clc-ui-e2e: + name: "2.17" + namespace: acm-qe + tag: clc-ui-e2e + cli: + name: "5.0" + namespace: ocp + tag: cli + fetch-managed-clusters: + name: autotest + namespace: acm-qe + tag: fetch-managed-clusters + ocs-ci-tests: + name: ocs-ci-container + namespace: ci + tag: stable + tests-private: + name: tests-private + namespace: ci + tag: "5.0" + upi-installer: + name: "5.0" + namespace: ocp + tag: upi-installer +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.26-openshift-5.0 +images: + items: + - dockerfile_literal: | + FROM this-is-ignored + RUN dnf install -y git python39 jq + from: cli + optional: true + to: cli-with-git + - dockerfile_literal: | + FROM this-is-ignored + RUN dnf install -y skopeo && dnf clean all + from: cli + optional: true + to: cli-with-skopeo +prowgen: + enable_secrets_store_csi_driver: true +releases: + latest: + candidate: + product: ocp + stream: nightly + version: "5.0" +resources: + '*': + requests: + cpu: 100m + memory: 200Mi +tests: +- as: interop-opp-aws + capabilities: + - intranet + cluster: build05 + cron: 0 23 31 2 * + reporter_config: + channel: '#opp-discussion' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> + {{end}}' + steps: + allow_best_effort_post_steps: true + cluster_profile: aws-cspi-qe + env: + BASE_DOMAIN: cspilp.interop.ccitredhat.com + COMPUTE_NODE_REPLICAS: "6" + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge + DR__RP__CR_COMP_NAME: lp-interop--OPP + 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: '["5.0-lp","opp-aws-lp","opp-lp"]' + FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com + FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-9323 + FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP + FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" + MAP_TESTS: "true" + OPERATORS: | + [ + {"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 + - ref: acm-must-gather + - ref: acm-inspector + - 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 + - ref: ipi-conf-telemetry + - ref: ipi-conf-aws-custom-az + - ref: ipi-conf-aws + - ref: ipi-install-monitoringpvc + - chain: ipi-install + test: + - ref: install-operators + - ref: acm-mch + - ref: acm-policies-openshift-plus-setup + - ref: acm-policies-openshift-plus + - ref: interop-opp-wait-mcp + - ref: stackrox-opp-readiness + - ref: stackrox-opp-smoke + - ref: acm-tests-clc-smoke + - ref: acm-fetch-managed-clusters + - ref: acm-opp-app + - ref: interop-opp-odf-health + - ref: interop-opp-observability-odf + - ref: interop-tests-ocs-tests + - ref: interop-tests-opp-quay-smoke + - ref: interop-opp-skip-ratio-gate +zz_generated_metadata: + branch: master + org: RedHatQE + repo: interop-testing + variant: opp--ocp-5.0-fips-lpMainline-lp-interop 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 aafca4863ef95..fcbf366b60b37 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 @@ -115,14 +119,17 @@ tests: - ref: acm-policies-openshift-plus-setup - ref: acm-policies-openshift-plus - ref: interop-opp-wait-mcp + - ref: stackrox-opp-readiness + - ref: stackrox-opp-smoke - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app - ref: interop-opp-odf-health - ref: interop-opp-observability-odf + - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke - - ref: acm-tests-observability -- as: cr--full-stack--vsphere + - ref: interop-opp-skip-ratio-gate +- as: interop-opp-vsphere capabilities: - intranet cluster: vsphere02 @@ -179,8 +186,9 @@ tests: - ref: interop-opp-wait-mcp - ref: interop-opp-odf-health - ref: interop-opp-observability-odf - - ref: acm-tests-observability + - ref: interop-tests-ocs-tests - ref: acm-opp-app + - ref: interop-opp-skip-ratio-gate workflow: acm-ipi-vsphere zz_generated_metadata: branch: master diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-fips-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-fips-lpMainline-lp-interop.yaml new file mode 100644 index 0000000000000..624dcfbdebbc1 --- /dev/null +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-fips-lpMainline-lp-interop.yaml @@ -0,0 +1,130 @@ +base_images: + clc-ui-e2e: + name: "2.17" + namespace: acm-qe + tag: clc-ui-e2e + cli: + name: "5.1" + namespace: ocp + tag: cli + fetch-managed-clusters: + name: autotest + namespace: acm-qe + tag: fetch-managed-clusters + ocs-ci-tests: + name: ocs-ci-container + namespace: ci + tag: stable + upi-installer: + name: "5.1" + namespace: ocp + tag: upi-installer +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.26-openshift-5.0 +images: + items: + - dockerfile_literal: | + FROM this-is-ignored + RUN dnf install -y git python39 jq + from: cli + optional: true + to: cli-with-git + - dockerfile_literal: | + FROM this-is-ignored + RUN dnf install -y skopeo && dnf clean all + from: cli + optional: true + to: cli-with-skopeo +prowgen: + enable_secrets_store_csi_driver: true +releases: + latest: + candidate: + product: ocp + stream: nightly + version: "5.1" +resources: + '*': + requests: + cpu: 100m + memory: 200Mi +tests: +- as: interop-opp-aws + capabilities: + - intranet + cluster: build05 + cron: 0 23 31 2 * + reporter_config: + channel: '#opp-discussion' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> + {{end}}' + steps: + allow_best_effort_post_steps: true + cluster_profile: aws-cspi-qe + env: + BASE_DOMAIN: cspilp.interop.ccitredhat.com + COMPUTE_NODE_REPLICAS: "6" + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge + DR__RP__CR_COMP_NAME: lp-interop--OPP + 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: '["5.1-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.1" + OPERATORS: | + [ + {"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 + - ref: acm-must-gather + - ref: acm-inspector + - 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 + - ref: ipi-conf-telemetry + - ref: ipi-conf-aws-custom-az + - ref: ipi-conf-aws + - ref: ipi-install-monitoringpvc + - chain: ipi-install + test: + - ref: install-operators + - ref: acm-mch + - ref: acm-policies-openshift-plus-setup + - ref: acm-policies-openshift-plus + - ref: interop-opp-wait-mcp + - ref: stackrox-opp-readiness + - ref: stackrox-opp-smoke + - ref: acm-tests-clc-smoke + - ref: acm-fetch-managed-clusters + - ref: acm-opp-app + - ref: interop-opp-odf-health + - ref: interop-opp-observability-odf + - ref: interop-tests-ocs-tests + - ref: interop-tests-opp-quay-smoke + - ref: interop-opp-skip-ratio-gate +zz_generated_metadata: + branch: master + org: RedHatQE + repo: interop-testing + variant: opp--ocp-5.1-fips-lpMainline-lp-interop 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 e6bda1be6e3b0..b89285d4aae33 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 @@ -92,6 +92,7 @@ tests: [ {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"} ] + SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status ZONES_COUNT: "3" post: - ref: acm-fetch-operator-versions @@ -115,13 +116,17 @@ tests: - ref: acm-policies-openshift-plus-setup - ref: acm-policies-openshift-plus - ref: interop-opp-wait-mcp - - ref: acm-tests-clc-create + - ref: stackrox-opp-readiness + - ref: stackrox-opp-smoke + - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app + - ref: interop-opp-odf-health + - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke - - ref: acm-tests-observability -- as: cr--full-stack--vsphere + - ref: interop-opp-skip-ratio-gate +- as: interop-opp-vsphere capabilities: - intranet cluster: vsphere02 @@ -158,6 +163,7 @@ tests: {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"} ] SIZE_VARIANT: large + SKIP_POLICIES: policy-acs,policy-acs-central-ca-bundle,policy-acs-central-status,policy-acs-monitor-certs,policy-acs-operator-central,policy-acs-sync-resources,policy-advanced-managed-cluster-security,policy-advanced-managed-cluster-status,policy-compliance-operator-install,policy-config-quay,policy-hub-quay-bridge,policy-install-quay,policy-observability-operator,policy-observability-storage,policy-observability-storage-status,policy-odf,policy-odf-cluster,policy-odf-noobaa,policy-odf-status,policy-quay-bridge,policy-quay-status post: - ref: acm-fetch-operator-versions - ref: acm-must-gather @@ -176,9 +182,11 @@ tests: - ref: acm-policies-openshift-plus-setup - ref: acm-policies-openshift-plus - ref: interop-opp-wait-mcp + - ref: interop-opp-odf-health + - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - - ref: acm-tests-observability - ref: acm-opp-app + - ref: interop-opp-skip-ratio-gate workflow: acm-ipi-vsphere zz_generated_metadata: branch: master 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 61ee76745ad14..7a2777d2c21fc 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 @@ -71,7 +75,7 @@ tests: capabilities: - intranet cluster: build05 - cron: 0 23 31 2 * + cron: 0 3,15 * * * reporter_config: channel: '#opp-discussion' job_states_to_report: @@ -132,11 +136,12 @@ tests: - ref: interop-opp-wait-mcp - ref: stackrox-opp-readiness - ref: stackrox-opp-smoke - - ref: acm-tests-clc-create + - ref: acm-tests-clc-smoke - ref: acm-fetch-managed-clusters - ref: acm-opp-app - ref: interop-opp-odf-health - ref: interop-opp-observability-odf + - ref: interop-tests-ocs-tests - ref: interop-tests-opp-quay-smoke - ref: interop-opp-skip-ratio-gate zz_generated_metadata: 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 167da6248be25..f932cd62af007 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 @@ -30,7 +30,7 @@ tests: capabilities: - intranet cluster: build05 - cron: 0 23 31 2 * + cron: 0 3,15 * * * reporter_config: channel: '#opp-discussion' job_states_to_report: 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 c6052d04bf870..b07aeefc57d8f 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 @@ -3,6 +3,10 @@ base_images: name: "5.0" namespace: ocp tag: cli + upi-installer: + name: "5.0" + namespace: ocp + tag: upi-installer build_root: image_stream_tag: name: release @@ -30,7 +34,7 @@ tests: capabilities: - intranet cluster: build05 - cron: 0 23 31 2 * + cron: 0 3,15 * * * reporter_config: channel: '#opp-discussion' job_states_to_report: @@ -44,8 +48,6 @@ tests: steps: allow_best_effort_post_steps: true cluster_profile: aws-cspi-qe - dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:initial env: ACM_SUBSCRIPTION_NAMESPACE: ocm ACS_SUBSCRIPTION_NAMESPACE: openshift-operators @@ -81,7 +83,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..2d70ee1bdc9e4 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 @@ -3,6 +3,10 @@ base_images: name: "5.1" namespace: ocp tag: cli + upi-installer: + name: "5.1" + namespace: ocp + tag: upi-installer build_root: image_stream_tag: name: release @@ -30,7 +34,7 @@ tests: capabilities: - intranet cluster: build05 - cron: 0 23 31 2 * + cron: 0 3,15 * * * reporter_config: channel: '#opp-discussion' job_states_to_report: @@ -44,8 +48,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 @@ -64,6 +66,7 @@ tests: {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}, {"name": "quay-operator", "source": "redhat-operators", "channel": "stable-3.17", "install_namespace": "openshift-operators"} ] + 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: gather-aws-console @@ -76,7 +79,7 @@ tests: - ref: ipi-conf-aws - ref: ipi-conf-aws-rootvolume - ref: ipi-install-monitoringpvc - - chain: ipi-install + - chain: ipi-install-stableinitial - ref: interop-opp-disk-diag - ref: interop-opp-kubelet-config - ref: interop-opp-wait-for-api @@ -86,6 +89,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/jobs/RedHatQE/interop-testing/RedHatQE-interop-testing-master-periodics.yaml b/ci-operator/jobs/RedHatQE/interop-testing/RedHatQE-interop-testing-master-periodics.yaml index 43d83fd7cd6cf..628bbdfdcea8a 100644 --- a/ci-operator/jobs/RedHatQE/interop-testing/RedHatQE-interop-testing-master-periodics.yaml +++ b/ci-operator/jobs/RedHatQE/interop-testing/RedHatQE-interop-testing-master-periodics.yaml @@ -2627,6 +2627,121 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + cron: 0 23 31 2 * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: RedHatQE + repo: interop-testing + labels: + capability/intranet: intranet + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe + ci-operator.openshift.io/cluster: build05 + ci-operator.openshift.io/variant: opp--ocp-5.0-fips-lpMainline-lp-interop + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-RedHatQE-interop-testing-master-opp--ocp-5.0-fips-lpMainline-lp-interop-interop-opp-aws + reporter_config: + slack: + channel: '#opp-discussion' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> {{end}}' + spec: + containers: + - args: + - --enable-secrets-store-csi-driver=true + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --gsm-config=/etc/gsm-config/gsm-config.yaml + - --gsm-credentials-file=/etc/gsm-credentials/key.json + - --gsm-project-config=/etc/gsm-config/gsm-project-config.yaml + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=interop-opp-aws + - --variant=opp--ocp-5.0-fips-lpMainline-lp-interop + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/gsm-config + name: gsm-config + readOnly: true + - mountPath: /etc/gsm-credentials + name: gsm-sa-key + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - configMap: + name: gsm-config + name: gsm-config + - csi: + driver: secrets-store.csi.k8s.io + readOnly: true + volumeAttributes: + secretProviderClass: ci-operator-sa-key-spc + name: gsm-sa-key + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build05 cron: 0 3,15 * * * @@ -2761,7 +2876,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-RedHatQE-interop-testing-master-opp--ocp-5.0-lpMainline-lp-interop-cr--full-stack--vsphere + name: periodic-ci-RedHatQE-interop-testing-master-opp--ocp-5.0-lpMainline-lp-interop-interop-opp-vsphere reporter_config: slack: channel: '#opp-discussion' @@ -2785,7 +2900,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=cr--full-stack--vsphere + - --target=interop-opp-vsphere - --variant=opp--ocp-5.0-lpMainline-lp-interop command: - ci-operator @@ -2857,6 +2972,121 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + cron: 0 23 31 2 * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: RedHatQE + repo: interop-testing + labels: + capability/intranet: intranet + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe + ci-operator.openshift.io/cluster: build05 + ci-operator.openshift.io/variant: opp--ocp-5.1-fips-lpMainline-lp-interop + ci.openshift.io/generator: prowgen + job-release: "5.1" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-RedHatQE-interop-testing-master-opp--ocp-5.1-fips-lpMainline-lp-interop-interop-opp-aws + reporter_config: + slack: + channel: '#opp-discussion' + job_states_to_report: + - success + - failure + - error + report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: + Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> {{end}}' + spec: + containers: + - args: + - --enable-secrets-store-csi-driver=true + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --gsm-config=/etc/gsm-config/gsm-config.yaml + - --gsm-credentials-file=/etc/gsm-credentials/key.json + - --gsm-project-config=/etc/gsm-config/gsm-project-config.yaml + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=interop-opp-aws + - --variant=opp--ocp-5.1-fips-lpMainline-lp-interop + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/gsm-config + name: gsm-config + readOnly: true + - mountPath: /etc/gsm-credentials + name: gsm-sa-key + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - configMap: + name: gsm-config + name: gsm-config + - csi: + driver: secrets-store.csi.k8s.io + readOnly: true + volumeAttributes: + secretProviderClass: ci-operator-sa-key-spc + name: gsm-sa-key + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build05 cron: 0 3,15 * * * @@ -2991,7 +3221,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.1" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-RedHatQE-interop-testing-master-opp--ocp-5.1-lpMainline-lp-interop-cr--full-stack--vsphere + name: periodic-ci-RedHatQE-interop-testing-master-opp--ocp-5.1-lpMainline-lp-interop-interop-opp-vsphere reporter_config: slack: channel: '#opp-discussion' @@ -3015,7 +3245,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=cr--full-stack--vsphere + - --target=interop-opp-vsphere - --variant=opp--ocp-5.1-lpMainline-lp-interop command: - ci-operator diff --git a/ci-operator/jobs/RedHatQE/interop-testing/RedHatQE-interop-testing-master-presubmits.yaml b/ci-operator/jobs/RedHatQE/interop-testing/RedHatQE-interop-testing-master-presubmits.yaml index 05778977c493f..3eb025b8d047e 100644 --- a/ci-operator/jobs/RedHatQE/interop-testing/RedHatQE-interop-testing-master-presubmits.yaml +++ b/ci-operator/jobs/RedHatQE/interop-testing/RedHatQE-interop-testing-master-presubmits.yaml @@ -877,6 +877,65 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )opp--ocp-4.22-lpMainline-lp-interop-images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build04 + context: ci/prow/opp--ocp-5.0-fips-lpMainline-lp-interop-images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/variant: opp--ocp-5.0-fips-lpMainline-lp-interop + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-RedHatQE-interop-testing-master-opp--ocp-5.0-fips-lpMainline-lp-interop-images + optional: true + rerun_command: /test opp--ocp-5.0-fips-lpMainline-lp-interop-images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=[images] + - --variant=opp--ocp-5.0-fips-lpMainline-lp-interop + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )opp--ocp-5.0-fips-lpMainline-lp-interop-images,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -936,6 +995,65 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )opp--ocp-5.0-lpMainline-lp-interop-images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build04 + context: ci/prow/opp--ocp-5.1-fips-lpMainline-lp-interop-images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/variant: opp--ocp-5.1-fips-lpMainline-lp-interop + ci.openshift.io/generator: prowgen + job-release: "5.1" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-RedHatQE-interop-testing-master-opp--ocp-5.1-fips-lpMainline-lp-interop-images + optional: true + rerun_command: /test opp--ocp-5.1-fips-lpMainline-lp-interop-images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=[images] + - --variant=opp--ocp-5.1-fips-lpMainline-lp-interop + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )opp--ocp-5.1-fips-lpMainline-lp-interop-images,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/stolostron/policy-collection/stolostron-policy-collection-main-periodics.yaml b/ci-operator/jobs/stolostron/policy-collection/stolostron-policy-collection-main-periodics.yaml index 12fa47c251ed7..02d1037d34d1b 100644 --- a/ci-operator/jobs/stolostron/policy-collection/stolostron-policy-collection-main-periodics.yaml +++ b/ci-operator/jobs/stolostron/policy-collection/stolostron-policy-collection-main-periodics.yaml @@ -1,7 +1,7 @@ periodics: - agent: kubernetes cluster: build05 - cron: 0 23 31 2 * + cron: 0 3,15 * * * decorate: true decoration_config: skip_cloning: true @@ -116,7 +116,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build05 - cron: 0 23 31 2 * + cron: 0 3,15 * * * decorate: true decoration_config: skip_cloning: true @@ -231,7 +231,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build05 - cron: 0 23 31 2 * + cron: 0 3,15 * * * decorate: true decoration_config: skip_cloning: true @@ -346,7 +346,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build05 - cron: 0 23 31 2 * + cron: 0 3,15 * * * decorate: true decoration_config: skip_cloning: true 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 98e05e4fceb76..1a52e613e1399 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 @@ -23,13 +23,14 @@ fi CLUSTER_NAME=$([[ -f "${SHARED_DIR}/CLUSTER_NAME" ]] && cat "${SHARED_DIR}/CLUSTER_NAME" || echo "cluster-name") CLUSTER_DOMAIN="${CLUSTER_DOMAIN:-release-ci.cnv-qe.rhood.us}" LOGS_FOLDER="${ARTIFACT_DIR}/ocs-tests" -LOGS_CONFIG="${LOGS_FOLDER}/ocs-tests-config.yaml" +LOGS_CONFIG="$(mktemp /tmp/ocs-tests-config.XXXXXX.yaml)" CLUSTER_PATH="${ARTIFACT_DIR}/ocs-tests" export BIN_FOLDER="${LOGS_FOLDER}/bin" # Function to clean up folders cleanup() { + rm -f "${LOGS_CONFIG}" # Tear down local auth copy created for run-ci. [[ -d "${CLUSTER_PATH}/auth" ]] && rm -rf "${CLUSTER_PATH}/auth" } @@ -113,7 +114,6 @@ if [[ -f "${SHARED_DIR}/vsphere_context.sh" ]]; then set +x source "${SHARED_DIR}/vsphere_context.sh" source "${SHARED_DIR}/govc.sh" - set -x cat >> "${LOGS_CONFIG}" << __APPENDED_ENV_DATA__ ENV_DATA: @@ -124,6 +124,7 @@ ENV_DATA: vsphere_cluster: "${vsphere_cluster}" vsphere_datastore: "${vsphere_datastore}" __APPENDED_ENV_DATA__ + set -x fi EXTRA_ARGS="" diff --git a/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-ref.yaml b/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-ref.yaml index 49dafaff7c1c0..2aacfcf4df288 100644 --- a/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-ref.yaml +++ b/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-ref.yaml @@ -15,6 +15,11 @@ ref: - default: "advanced-cluster-management,rhacs-operator,odf-operator,quay-operator" documentation: Comma-separated CSV name prefixes for OPP operators to validate in pre-flight checks name: OPP_OPERATORS + - default: "" + documentation: |- + Comma-separated list of policy names to skip during enforcement. + Non-existent policies produce a warning, not a failure. + name: SKIP_POLICIES from: cli grace_period: 2m resources: From 92caea7d061fa86d55e9a13ebeef7321479f6390 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Sun, 20 Sep 2026 19:38:40 +0000 Subject: [PATCH 2/4] =?UTF-8?q?INTEROP-9509:=20Address=20review=20findings?= =?UTF-8?q?=20=E2=80=94=20ODF=20version,=20build=5Froot,=20ACM=20namespace?= =?UTF-8?q?,=20SKIP=5FPOLICIES,=20tests-private?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 --- ...ting-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml | 5 +---- ...p-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 2 ++ ...ting-master__opp--ocp-5.1-fips-lpMainline-lp-interop.yaml | 2 +- .../stolostron-policy-collection-main__ocp5.1-upgrade.yaml | 2 +- .../interop/opp/preflight/interop-opp-preflight-ref.yaml | 5 ----- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml index dfc68667ee9f3..fac67dafdb0be 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml @@ -15,10 +15,6 @@ base_images: name: ocs-ci-container namespace: ci tag: stable - tests-private: - name: tests-private - namespace: ci - tag: "5.0" upi-installer: name: "5.0" namespace: ocp @@ -88,6 +84,7 @@ tests: FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" MAP_TESTS: "true" + ODF_VERSION_MAJOR_MINOR: "5.0" OPERATORS: | [ {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"} 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 fcbf366b60b37..f003760b13dad 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 @@ -91,6 +91,7 @@ tests: FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" MAP_TESTS: "true" + ODF_VERSION_MAJOR_MINOR: "5.0" OPERATORS: | [ {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"} @@ -157,6 +158,7 @@ tests: 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" OPERATORS: | diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-fips-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-fips-lpMainline-lp-interop.yaml index 624dcfbdebbc1..3ac82816c8738 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-fips-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.1-fips-lpMainline-lp-interop.yaml @@ -23,7 +23,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-9-release-golang-1.26-openshift-5.0 + tag: rhel-9-release-golang-1.26-openshift-5.1 images: items: - dockerfile_literal: | 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 2d70ee1bdc9e4..d80da7ca5ca3c 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 @@ -49,6 +49,7 @@ tests: allow_best_effort_post_steps: true cluster_profile: aws-cspi-qe env: + ACM_SUBSCRIPTION_NAMESPACE: ocm AWS_COMPUTE_VOLUME_SIZE: "500" BASE_DOMAIN: cspilp.interop.ccitredhat.com COMPUTE_NODE_REPLICAS: "6" @@ -66,7 +67,6 @@ tests: {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"}, {"name": "quay-operator", "source": "redhat-operators", "channel": "stable-3.17", "install_namespace": "openshift-operators"} ] - 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: gather-aws-console diff --git a/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-ref.yaml b/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-ref.yaml index 2aacfcf4df288..49dafaff7c1c0 100644 --- a/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-ref.yaml +++ b/ci-operator/step-registry/interop/opp/preflight/interop-opp-preflight-ref.yaml @@ -15,11 +15,6 @@ ref: - default: "advanced-cluster-management,rhacs-operator,odf-operator,quay-operator" documentation: Comma-separated CSV name prefixes for OPP operators to validate in pre-flight checks name: OPP_OPERATORS - - default: "" - documentation: |- - Comma-separated list of policy names to skip during enforcement. - Non-existent policies produce a warning, not a failure. - name: SKIP_POLICIES from: cli grace_period: 2m resources: From 72d192405ec141d1bf167429866a747e2f77b548 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Sun, 20 Sep 2026 20:54:48 +0000 Subject: [PATCH 3/4] INTEROP-9509: Set ODF_VERSION_MAJOR_MINOR 4.22 for 4.22 and 5.0 configs Co-Authored-By: Claude Opus 4.6 --- ...p-testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml | 2 ++ ...sting-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml | 2 +- ...op-testing-master__opp--ocp-5.0-lpMainline-lp-interop.yaml | 4 ++-- 3 files changed, 5 insertions(+), 3 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 a46340d00fa49..0dfdc167646e4 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 @@ -107,6 +107,7 @@ tests: FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" MAP_TESTS: "true" + ODF_VERSION_MAJOR_MINOR: "4.22" OPERATORS: | [ {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"} @@ -178,6 +179,7 @@ tests: FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" MAP_TESTS: "true" + ODF_VERSION_MAJOR_MINOR: "4.22" OPENSHIFT_REQUIRED_CORES: "72" OPENSHIFT_REQUIRED_MEMORY: "288" OPERATORS: | diff --git a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml index fac67dafdb0be..3e178594c1dbe 100644 --- a/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml +++ b/ci-operator/config/RedHatQE/interop-testing/RedHatQE-interop-testing-master__opp--ocp-5.0-fips-lpMainline-lp-interop.yaml @@ -84,7 +84,7 @@ tests: FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" MAP_TESTS: "true" - ODF_VERSION_MAJOR_MINOR: "5.0" + ODF_VERSION_MAJOR_MINOR: "4.22" OPERATORS: | [ {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"} 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 f003760b13dad..a1f5f69c45909 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 @@ -91,7 +91,7 @@ tests: FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" MAP_TESTS: "true" - ODF_VERSION_MAJOR_MINOR: "5.0" + ODF_VERSION_MAJOR_MINOR: "4.22" OPERATORS: | [ {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"} @@ -158,7 +158,7 @@ tests: FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" MAP_TESTS: "true" - ODF_VERSION_MAJOR_MINOR: "5.0" + ODF_VERSION_MAJOR_MINOR: "4.22" OPENSHIFT_REQUIRED_CORES: "72" OPENSHIFT_REQUIRED_MEMORY: "288" OPERATORS: | From 38ce62d9423d1cb04a1fbce6c56affe140bd3143 Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Mon, 21 Sep 2026 13:57:50 +0000 Subject: [PATCH 4/4] INTEROP-9509: Apply review fixes (ODF version, skip-ratio-gate, ACM upgrade, SKIP_POLICIES, cron stagger) Co-Authored-By: Claude Opus 4.6 --- ...testing-master__opp--ocp-4.22-lpMainline-lp-interop.yaml | 1 + .../stolostron-policy-collection-main__ocp4.22-fips.yaml | 1 + .../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 +- .../stolostron-policy-collection-main-periodics.yaml | 6 +++--- 6 files changed, 8 insertions(+), 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 0dfdc167646e4..f08c1b52b515c 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 @@ -212,6 +212,7 @@ tests: - ref: interop-opp-observability-odf - ref: interop-tests-ocs-tests - ref: acm-opp-app + - ref: interop-opp-skip-ratio-gate zz_generated_metadata: branch: master org: RedHatQE 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 7a2777d2c21fc..77f6188221355 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 @@ -103,6 +103,7 @@ tests: FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-9104 FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" + ODF_VERSION_MAJOR_MINOR: "4.22" OPERATORS: | [ {"name": "advanced-cluster-management", "source": "redhat-operators", "channel": "release-2.17", "install_namespace": "ocm", "target_namespaces": "ocm", "operator_group": "acm-operator-group"} 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 f932cd62af007..0f8cf8f852010 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 @@ -30,7 +30,7 @@ tests: capabilities: - intranet cluster: build05 - cron: 0 3,15 * * * + cron: 30 3,15 * * * reporter_config: channel: '#opp-discussion' job_states_to_report: 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 b07aeefc57d8f..a58d1b5cf2a73 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 @@ -34,7 +34,7 @@ tests: capabilities: - intranet cluster: build05 - cron: 0 3,15 * * * + cron: 0 4,16 * * * reporter_config: channel: '#opp-discussion' job_states_to_report: 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 d80da7ca5ca3c..63e2267a9affc 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 @@ -34,7 +34,7 @@ tests: capabilities: - intranet cluster: build05 - cron: 0 3,15 * * * + cron: 30 4,16 * * * reporter_config: channel: '#opp-discussion' job_states_to_report: diff --git a/ci-operator/jobs/stolostron/policy-collection/stolostron-policy-collection-main-periodics.yaml b/ci-operator/jobs/stolostron/policy-collection/stolostron-policy-collection-main-periodics.yaml index 02d1037d34d1b..cf0bf9c1047c2 100644 --- a/ci-operator/jobs/stolostron/policy-collection/stolostron-policy-collection-main-periodics.yaml +++ b/ci-operator/jobs/stolostron/policy-collection/stolostron-policy-collection-main-periodics.yaml @@ -116,7 +116,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build05 - cron: 0 3,15 * * * + cron: 30 3,15 * * * decorate: true decoration_config: skip_cloning: true @@ -231,7 +231,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build05 - cron: 0 3,15 * * * + cron: 0 4,16 * * * decorate: true decoration_config: skip_cloning: true @@ -346,7 +346,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build05 - cron: 0 3,15 * * * + cron: 30 4,16 * * * decorate: true decoration_config: skip_cloning: true