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 04b281df1f670..4e2b213076e54 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 @@ -23,6 +23,10 @@ base_images: 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 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 26e0f79fcaa86..0780fe68d7ace 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 @@ -158,6 +159,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 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..28f441998a210 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 @@ -71,7 +71,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__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..83df5ac6c961f 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: 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..4c3451067c787 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: @@ -64,6 +68,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 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/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: