-
Notifications
You must be signed in to change notification settings - Fork 2.3k
OPP Q3 Batch: Combined interop pipeline improvements #83405
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
openshift-merge-bot
merged 13 commits into
openshift:main
from
amp-rh:opp-combined-q3-batch
Aug 19, 2026
+2,412
−299
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
f0fb8f6
INTEROP-9337: Harden OPP upgrade and preflight scripts
amp-rh 2671175
INTEROP-9384: Replace OCS acceptance tests with ODF health check
amp-rh d26db32
INTEROP-9411: Replace Quay UI smoke with cross-product interop tests
amp-rh f21856d
INTEROP-9236: Add ACS smoke test pipeline for OPP interop
amp-rh 7e0b86a
INTEROP-9265: Add ACM operator upgrade step
amp-rh d1c3265
Wire new steps into OPP CI configs and add FIPS variant
amp-rh a60dfba
Regenerate Prow job files via make update
amp-rh 3c8072c
Address review findings: ACM upgrade trap, hub health, InstallPlan lo…
amp-rh ede00df
INTEROP-9236: treat test failures as informational when results exist
amp-rh 7e73620
fix: Apply mpitt best practices across all OPP step scripts
amp-rh ad7732d
fix: Hoist Quay discovery to Main, safe JSON encoding, auth cleanup
amp-rh 6875585
fix: Replace jq with python3 and fix $$ expansion in ODF health check
amp-rh 5723dfe
Add OWNERS files for new step registry directories
amp-rh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
138 changes: 138 additions & 0 deletions
138
.../config/stolostron/policy-collection/stolostron-policy-collection-main__ocp4.22-fips.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| base_images: | ||
| acmqe-grc-test: | ||
| name: "2.17" | ||
| namespace: acm-qe | ||
| tag: acmqe-grc-test | ||
| clc-ui-e2e: | ||
| name: "2.17" | ||
| namespace: acm-qe | ||
| tag: clc-ui-e2e | ||
| cli: | ||
| name: "4.22" | ||
| namespace: ocp | ||
| tag: cli | ||
| fetch-managed-clusters: | ||
| name: autotest | ||
| namespace: acm-qe | ||
| tag: fetch-managed-clusters | ||
| multicluster-observability-operator-opp: | ||
| name: "2.17" | ||
| namespace: acm-qe | ||
| tag: multicluster-observability-operator-opp | ||
| 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 | ||
| namespace: openshift | ||
| tag: rhel-9-release-golang-1.24-openshift-4.22 | ||
| images: | ||
| items: | ||
| - dockerfile_literal: | | ||
| FROM this-is-ignored | ||
| RUN dnf install -y git python39 | ||
| from: cli | ||
| optional: true | ||
| to: cli-with-git | ||
| - dockerfile_literal: | | ||
| FROM registry.access.redhat.com/ubi9/openjdk-17:1.21 | ||
| USER root | ||
| RUN microdnf install -y git gzip && microdnf clean all | ||
| RUN cd /tmp \ | ||
| && curl -sLO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.22/openshift-client-linux.tar.gz \ | ||
| && curl -sL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.22/sha256sum.txt | grep openshift-client-linux.tar.gz | sha256sum -c - \ | ||
| && tar xzf openshift-client-linux.tar.gz -C /usr/local/bin oc kubectl \ | ||
| && rm -f openshift-client-linux.tar.gz | ||
| USER 1001 | ||
| to: acs-smoke-runner | ||
| releases: | ||
| latest: | ||
| candidate: | ||
| product: ocp | ||
| stream: nightly | ||
| version: "4.22" | ||
| resources: | ||
| '*': | ||
| requests: | ||
| cpu: 100m | ||
| memory: 200Mi | ||
| tests: | ||
| - as: interop-opp-aws | ||
| capabilities: | ||
| - intranet | ||
| 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: '["4.22-lp","opp-aws-lp","opp-lp","fips"]' | ||
| FIREWATCH_DEFAULT_JIRA_AFFECTS_VERSION: 5.0.0 | ||
| FIREWATCH_DEFAULT_JIRA_ASSIGNEE: mpruitt@redhat.com | ||
| FIREWATCH_DEFAULT_JIRA_EPIC: INTEROP-9104 | ||
| FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP | ||
| FIREWATCH_FAIL_WITH_TEST_FAILURES: "true" | ||
| IGNORE_SECONDARY_POLICIES: "true" | ||
| OPERATORS: | | ||
| [ | ||
| {"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 | ||
| 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 | ||
| - chain: cucushift-installer-check-cluster-health | ||
| - ref: stackrox-opp-readiness | ||
| - ref: stackrox-opp-smoke | ||
| - ref: acm-tests-clc-create | ||
| - ref: acm-fetch-managed-clusters | ||
| - ref: acm-opp-app | ||
| - ref: interop-opp-odf-health | ||
| - ref: interop-tests-opp-quay-smoke | ||
| - ref: acm-tests-observability | ||
| zz_generated_metadata: | ||
| branch: main | ||
| org: stolostron | ||
| repo: policy-collection | ||
| variant: ocp4.22-fips | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.