Skip to content

ixney on 5.1ney - #83117

Closed
weshayutin wants to merge 1 commit into
openshift:mainfrom
weshayutin:ocp51
Closed

ixney on 5.1ney#83117
weshayutin wants to merge 1 commit into
openshift:mainfrom
weshayutin:ocp51

Conversation

@weshayutin

@weshayutin weshayutin commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

only run ocp 5.1 jobs on oadp-dev and atm it should be optional.

Summary by CodeRabbit

  • Removed the OADP 1.6 OCP 5.1 CI configuration.
  • Updated the OADP oadp-dev OCP 5.1 configuration so the AWS CLI and AWS end-to-end jobs are optional.
  • OCP 5.1 jobs now run only on oadp-dev and do not block required CI results.

Signed-off-by: Wesley Hayutin <weshayutin@gmail.com>
@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 7, 2026
@openshift-ci

openshift-ci Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

PR needs rebase.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@weshayutin, pj-rehearse: unable to determine affected jobs. This could be due to a branch that needs to be rebased. ERROR:

couldn't prepare candidate: couldn't rebase candidate onto 560d430f132ab6f9eba336719d779300ce6d6068 due to conflicts
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@coderabbitai

coderabbitai Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 1acb779c-c46e-429f-b2a5-0ad95210c677

📥 Commits

Reviewing files that changed from the base of the PR and between 560d430 and c0740b7.

⛔ Files ignored due to path filters (3)
  • ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-periodics.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (2)
  • ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.1.yaml
  • ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.1.yaml
💤 Files with no reviewable changes (1)
  • ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.1.yaml

Walkthrough

The OADP 1.6 OpenShift CI configuration is removed. The OADP development configuration marks the AWS CLI and AWS end-to-end test jobs as optional.

Changes

OADP CI configuration

Layer / File(s) Summary
Remove OADP 1.6 configuration
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.1.yaml
Removes the complete OADP 1.6 CI configuration, including build, release, resource, and end-to-end test settings.
Make AWS end-to-end jobs optional
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.1.yaml
Marks e2e-test-cli-aws and e2e-test-aws as optional jobs.

Estimated code review effort: 2 (Simple) | ~10 minutes

Possibly related PRs

Suggested reviewers: deepsm007

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Title check ❓ Inconclusive The title references OCP 5.1 but does not clearly describe the CI job changes or their optional status. Use a concise title that states the OCP 5.1 job execution change, such as making the oadp-dev jobs optional.
✅ Passed checks (14 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed The PR changes only CI YAML and generated job files; no Ginkgo test declarations or dynamic test titles were added or modified.
Test Structure And Quality ✅ Passed The pull request changes only CI YAML files; no Ginkgo test code is present in the changed paths, so the test-structure requirements are not applicable.
Microshift Test Compatibility ✅ Passed The commit changes only YAML CI configuration; it adds no Ginkgo e2e tests or test code requiring MicroShift compatibility review.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The pull request changes only YAML CI configuration; it adds no Ginkgo e2e tests or test code requiring SNO compatibility review.
Topology-Aware Scheduling Compatibility ✅ Passed The pull request changes only CI configuration and generated CI job files; it adds no deployment manifests, operator code, controllers, or scheduling constraints.
Ote Binary Stdout Contract ✅ Passed The PR changes only five YAML CI files; it adds or modifies no OTE binary, Go source, or process-level stdout code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The PR changes only CI YAML: it deletes one configuration and marks two existing jobs optional; it adds no Ginkgo tests or networking code.
No-Weak-Crypto ✅ Passed The patch adds only four optional: true YAML entries and removes CI definitions; scans found no MD5, SHA1, DES, RC4, Blowfish, ECB, crypto, or cipher usage.
Container-Privileges ✅ Passed The PR adds only optional: true and deletes a CI config; no changed manifest contains privileged, host* flags, SYS_ADMIN, root, or allowPrivilegeEscalation settings.
No-Sensitive-Data-In-Logs ✅ Passed The diff adds only optional: true to four CI job definitions; it adds no logging, secret values, tokens, PII, hostnames, or customer data.
✨ Finishing Touches 💡 2
⚔️ Resolve merge conflicts 💡
  • Resolve merge conflict in branch ocp51
🛠️ Fix failing CI checks 💡
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@openshift-ci
openshift-ci Bot requested review from kaovilai and sseago August 7, 2026 17:19
@openshift-ci openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 7, 2026
@openshift-ci

openshift-ci Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

@weshayutin: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/ordered-prow-config c0740b7 link true /test ordered-prow-config
ci/prow/generated-config c0740b7 link true /test generated-config
ci/prow/ci-operator-registry c0740b7 link true /test ci-operator-registry
ci/prow/check-gh-automation c0740b7 link true /test check-gh-automation
ci/prow/owners c0740b7 link true /test owners
ci/prow/prow-config-filenames c0740b7 link true /test prow-config-filenames
ci/prow/config c0740b7 link true /test config
ci/prow/yamllint c0740b7 link true /test yamllint
ci/prow/ci-operator-config-metadata c0740b7 link true /test ci-operator-config-metadata
ci/prow/ci-operator-config c0740b7 link true /test ci-operator-config
ci/prow/openshift-image-mirror-mappings c0740b7 link true /test openshift-image-mirror-mappings
ci/prow/release-controller-config c0740b7 link true /test release-controller-config
ci/prow/prow-config-semantics c0740b7 link true /test prow-config-semantics
ci/prow/core-valid c0740b7 link true /test core-valid

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@kaovilai kaovilai left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci

openshift-ci Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, shubham-pampattiwar, sseago, weshayutin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kaovilai

kaovilai commented Aug 7, 2026

Copy link
Copy Markdown
Member

/retest

Note

Responses generated with Claude

@kaovilai

kaovilai commented Aug 7, 2026

Copy link
Copy Markdown
Member

This PR has a real merge conflict against current main (gh pr update-branch confirms — not just a stale mergeable-state flag) and I don't have push access to weshayutin/release to rebase it directly.

Opened #83124 with the identical intent, rebased cleanly onto current main (picks up #83110). That one should be mergeable as-is.

Note

Responses generated with Claude

@weshayutin weshayutin closed this Aug 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants