Skip to content

ixney on 5.1ney (rebased) - #83124

Open
kaovilai wants to merge 3 commits into
openshift:mainfrom
kaovilai:ocp51-rebased
Open

ixney on 5.1ney (rebased)#83124
kaovilai wants to merge 3 commits into
openshift:mainfrom
kaovilai:ocp51-rebased

Conversation

@kaovilai

@kaovilai kaovilai commented Aug 7, 2026

Copy link
Copy Markdown
Member

Rebased re-submission of #83117 (real merge conflict there — jobs regenerated after picking up #83110). Same intent: only run OCP 5.1 jobs on oadp-dev, and make them optional; drop the OADP 1.6 OCP 5.1 config entirely.

Summary

  • Removed ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.1.yaml (OCP 5.1 no longer built/tested for oadp-1.6).
  • Marked the oadp-dev OCP 5.1 AWS CLI and AWS e2e jobs optional: true so they don't block required CI.
  • Regenerated ci-operator/jobs/ accordingly (oadp-1.6 5.1 periodics/presubmits removed, oadp-dev 5.1 presubmits marked optional).

Fixes #83117

Note

Responses generated with Claude

Summary by CodeRabbit

  • OCP 5.1 CI for the OADP operator now runs only for oadp-dev.
  • The OADP 1.6 OCP 5.1 configuration and its generated jobs were removed.
  • The oadp-dev AWS CLI and AWS end-to-end jobs are optional, so they do not block required CI results.

weshayutin and others added 3 commits August 7, 2026 11:16
Signed-off-by: Wesley Hayutin <weshayutin@gmail.com>
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>

# Conflicts:
#	ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-periodics.yaml
#	ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
@kaovilai kaovilai mentioned this pull request Aug 7, 2026
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 7, 2026
@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: 1b15f194-94b9-49b4-a8eb-79f83eb3f0e3

📥 Commits

Reviewing files that changed from the base of the PR and between ccfd628 and 1ec9631.

⛔ 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 5.1 configuration was removed. The OADP development configuration now marks its AWS CLI and AWS end-to-end jobs as optional.

Changes

OADP 5.1 CI gating

Layer / File(s) Summary
Optional AWS end-to-end jobs
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.1.yaml
The e2e-test-cli-aws and e2e-test-aws jobs are now optional.

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

Possibly related PRs

Suggested reviewers: deepsm007

🚥 Pre-merge checks | ✅ 13 | ❌ 2

❌ Failed checks (2 inconclusive)

Check name Status Explanation Resolution
Title check ❓ Inconclusive The title references OCP 5.1 but does not clearly describe the primary CI configuration changes. Use a descriptive title such as "Restrict OCP 5.1 OADP jobs to oadp-dev and make them optional".
Linked Issues check ❓ Inconclusive The reviewed files remove OADP 1.6 and make dev AWS jobs optional, but related generated job files were excluded from review. Review the three excluded ci-operator/jobs files to verify that only oadp-dev jobs remain and their presubmits are optional.
✅ Passed checks (13 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Out of Scope Changes check ✅ Passed The reviewed changes directly support the linked issue by removing the OADP 1.6 configuration and making OCP 5.1 dev jobs optional.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Stable And Deterministic Test Names ✅ Passed The full PR diff changes only CI YAML; added lines are optional flags, and no Ginkgo It/Describe/Context/When test titles were added or changed.
Test Structure And Quality ✅ Passed The PR changes only OADP CI YAML and generated job definitions; no Ginkgo test code or It blocks were added or modified, so the listed test-quality checks are not applicable.
Microshift Test Compatibility ✅ Passed The inspected PR range changes only CI YAML and generated job files, removes an OADP 1.6 config, and adds no Ginkgo tests or MicroShift-relevant API usage.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the full change set contains CI/config and generated job changes only, with no added It, Describe, Context, When, or SNO logic.
Topology-Aware Scheduling Compatibility ✅ Passed The PR changes only CI config and generated job YAML; it adds no deployment manifests, operator code, controllers, or topology-related scheduling constraints.
Ote Binary Stdout Contract ✅ Passed The complete PR patch changes only YAML configuration files; it adds no OTE binary source or process-level stdout writes.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The PR adds only YAML CI configuration and generated job changes; no Ginkgo test source or new It/Describe/Context/When declaration was added.
No-Weak-Crypto ✅ Passed The complete diff adds only four optional: true YAML entries; exact scans found no MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB, crypto code, or secret comparisons.
Container-Privileges ✅ Passed The PR adds only four optional: true lines; no added privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, root, or allowPrivilegeEscalation settings were found.
No-Sensitive-Data-In-Logs ✅ Passed The contributor diff adds only four optional: true fields and deletes CI definitions; it adds no logging commands, sensitive literals, or data-bearing log templates.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@kaovilai, 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 ccfd6289a28cd652d6c36fe3ee5c48d5e6de94ce 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.

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 7, 2026

@weshayutin weshayutin left a comment

Copy link
Copy Markdown
Contributor

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, 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

@openshift-ci

openshift-ci Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

@kaovilai: all tests passed!

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.

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants