Skip to content

NO-JIRA: shard all OCP 4.22+ TNF recovery periodic jobs - #85410

Open
redhat-chai-bot wants to merge 3 commits into
openshift:mainfrom
redhat-chai-bot:no-jira-two-node-fencing-recovery-shards
Open

redhat-chai-bot wants to merge 3 commits into
openshift:mainfrom
redhat-chai-bot:no-jira-two-node-fencing-recovery-shards

Conversation

@redhat-chai-bot

@redhat-chai-bot redhat-chai-bot commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

What

Shard the remaining unsharded Two-Node Fencing recovery periodic jobs for OCP 4.22 and later, and reduce the cadence of the standard, IPv6, and dual-stack recovery suites.

Changes

  • Add shard_count: 2 to the recovery-repo-ra, IPv6 recovery, and dual-stack recovery definitions for 4.22, 4.23, 5.0, and 5.1.
  • For 4.22, schedule standard, IPv6, and dual-stack recovery weekly using the repository's interval: 168h convention.
  • For 4.23, 5.0, and 5.1, schedule standard and IPv6 recovery daily at the existing 10:19 slot, and dual-stack recovery daily at the existing 07:19 slot.
  • Regenerate the periodic Prow jobs.
  • Preserve the annual recovery-repo-ra schedule, preserve the RHCOS10 definitions, and preserve all existing shard counts.

Validation

  • make update
  • make jobs
  • make sanitize-prow-jobs
  • make ci-operator-config
  • make prow-config
  • hack/validate-release-controller-config.sh .
  • git diff --check
  • Source, generated-job, schedule, shard-count, and unchanged SHARD_ARGS assertions

The pinned make checkconfig wrapper remains blocked before config evaluation by the workspace/container error stat /release/core-services/prow/02_config: invalid argument; the underlying config-generation validation passed.

This is a NO-JIRA CI configuration change.

Summary by CodeRabbit

This PR updates OpenShift CI recovery jobs for OCP 4.22, 4.23, 5.0, and 5.1.

  • Adds two-way sharding to the repository-agent, IPv6, and dual-stack Two-Node Fencing recovery jobs.
  • Regenerates the corresponding Prow jobs.
  • Changes applicable recovery schedules to one run per day.
  • Preserves existing shard counts, annual schedules, RHCOS10 definitions, and SHARD_ARGS.

Validation covered configuration generation, Prow and release-controller checks, generated-job and schedule assertions, and git diff --check. The pinned make checkconfig wrapper remains blocked by an invalid-argument stat failure for /release/core-services/prow/02_config.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 17, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@redhat-chai-bot: This pull request explicitly references no jira issue.

Details

In response to this:

Shard the remaining unsharded Two-Node Fencing recovery periodic jobs for OCP 4.22 and later.

Changes:

  • Add shard_count: 2 to the recovery-repo-ra, IPv6 recovery, and dual-stack recovery definitions for 4.22, 4.23, 5.0, and 5.1.
  • Regenerate the periodic Prow jobs so each target has -1of2 and -2of2 jobs.
  • Preserve the existing three-shard recovery definitions.

Validation:

  • make update
  • hack/validate-generated-config.sh .
  • hack/validate-prow-job-ordering.sh .
  • git diff --check
  • ci-operator-checkconfig passed as part of generation.

The pinned make checkconfig wrapper remains blocked in the workspace by its /release/core-services/prow/02_config invalid-argument stat failure; this is recorded for transparency.

This is a NO-JIRA CI configuration change.


AI-generated. Review for accuracy.

@jaypoulz requested via Chai Bot

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 openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Sep 17, 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: Advanced

Run ID: 8f05d9ae-89cd-4e39-b9b5-8b802cf4c3e1

📥 Commits

Reviewing files that changed from the base of the PR and between e42c158 and 80efb9e.

⛔ Files ignored due to path filters (1)
  • ci-operator/jobs/openshift/release/openshift-release-main-periodics.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (1)
  • ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml

Included review availability: Your plan provides up to 2 included reviews per hour; 0 remain after this review.


Walkthrough

The nightly 4.22, 4.23, 5.0, and 5.1 release configurations update fencing recovery schedules. Selected jobs now run weekly or once daily. Recovery jobs also use two-way sharding.

Changes

Fencing recovery configuration

Layer / File(s) Summary
Recovery schedule updates
ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml, ...-4.23.yaml, ...-5.0.yaml, ...-5.1.yaml
The 4.22 jobs use weekly cron schedules. The 4.23, 5.0, and 5.1 jobs remove their second daily run.
Recovery job sharding
ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml, ...-4.23.yaml, ...-5.0.yaml, ...-5.1.yaml
The repository-resource-agent recovery jobs gain shard_count: 2. The IPv6 and dual-stack jobs gain or retain two-way sharding.

Priority: ⬇️ Low

Estimated code review effort: 1 (Trivial) | ~5 minutes

Change: Other

Suggested reviewers: vr4manta

Merge Risk: ⚪ Minimal · up to 80efb

The recovery jobs retain the intended schedules and sharding across the affected releases, with no identified merge-blocking risk.

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly identifies the main change: sharding all OCP 4.22 and later Two-Node Fencing recovery periodic jobs. It is concise and specific.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
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 pull request changes only five YAML CI configuration files. The diff adds schedules, shard counts, and generated Prow job metadata. It does not add or modify Ginkgo test-title constructs such as `…
Test Structure And Quality ✅ Passed PASS: The pull request changes only five YAML configuration/generated-job files. The authoritative diff contains no Ginkgo test code or changed It, BeforeEach, AfterEach, Eventually, or Consistently c…
Microshift Test Compatibility ✅ Passed The check is not applicable. The authoritative PR diff changes four release YAML configurations and the generated periodic Prow job file only. It adds no Go source, Ginkgo test, or new e2e test declar…
Single Node Openshift (Sno) Test Compatibility ✅ Passed PASS. The pull request changes only four release configuration YAML files and the generated periodic-job YAML. It adds shard counts and changes cron schedules for existing two-node fencing recovery jo…
Topology-Aware Scheduling Compatibility ✅ Passed PASS. The PR changes only CI release YAML and generated Prow periodic-job configuration. The source changes add shard_count and alter cron schedules; they do not add or modify deployment manifests, …
Ote Binary Stdout Contract ✅ Passed PASS. The pull request changes only five YAML CI configuration files. The changes update cron or interval scheduling, add shard counts, and regenerate Prow job metadata with SHARD_ARGS. No Go or oth…
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PASS. The authoritative diff changes only five YAML files: four release configurations and one generated periodic-job file. It adds no Ginkgo tests or test source, and the changes only alter cron sche…
No-Weak-Crypto ✅ Passed The pull request changes only four release YAML configurations and the generated periodic-job YAML. The source diff adds cron schedules and shard_count; the generated diff adds job metadata and `SHA…
Container-Privileges ✅ Passed PASS. The reviewed diff adds only schedules, shard counts, shard arguments, job names, and generated metadata. An audit of all added lines found no privileged, hostPID, hostNetwork, hostIPC, `…
No-Sensitive-Data-In-Logs ✅ Passed PASS. The pull request changes only release-test schedules, shard counts, and generated periodic Prow job definitions. The changed configuration contains no logging code and no passwords, tokens, API …
✨ Finishing Touches 💡 1
🛠️ Fix failing CI checks 💡
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Create a new PR

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

@jaypoulz

Copy link
Copy Markdown
Contributor

/retest-required
/lgtm
/approve

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

Copy link
Copy Markdown
Contributor

/retest-required

@jaypoulz

Copy link
Copy Markdown
Contributor

/test agent-model-policy

@jaypoulz

Copy link
Copy Markdown
Contributor

/test core-valid

@jaypoulz

Copy link
Copy Markdown
Contributor

/retest-required

@neisw

neisw commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

/approve

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 17, 2026
@jaypoulz

Copy link
Copy Markdown
Contributor

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 17, 2026
Schedule the recovery jobs at the requested weekly and daily cadences while preserving shard allocation.
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 17, 2026
@jaypoulz

Copy link
Copy Markdown
Contributor

/retest-required

@redhat-chai-bot

Copy link
Copy Markdown
Contributor Author

Follow-up to the cadence update in 80efb9e8a9ec4e3af8f980c096e6ce73a41f7029:

  • OCP 4.22 standard recovery: Monday 10:19 (19 10 * * 1)
  • OCP 4.22 IPv6 recovery: Wednesday 10:19 (19 10 * * 3)
  • OCP 4.22 dual-stack recovery: Friday 07:19 (19 7 * * 5)

The other release streams retain their approved daily fixed schedules. Shard counts, the annual recovery-repo-ra schedule, RHCOS10 definitions, and generated SHARD_ARGS are unchanged.


AI-generated. Review for accuracy.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@redhat-chai-bot: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
periodic-ci-openshift-release-main-nightly-4.23-e2e-metal-ovn-two-node-fencing-ipv6-recovery-2of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-recovery-repo-ra-1of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-4.23-e2e-metal-ovn-two-node-fencing-recovery-repo-ra-1of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-recovery-repo-ra-2of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-5.1-e2e-metal-ovn-two-node-fencing-ipv6-recovery-1of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ovn-two-node-fencing-recovery-repo-ra-1of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ovn-two-node-fencing-ipv6-recovery-2of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ovn-two-node-fencing-dualstack-recovery-1of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-5.1-e2e-metal-ovn-two-node-fencing-dualstack-recovery-2of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ovn-two-node-fencing-recovery-repo-ra-2of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-recovery-2of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-5.1-e2e-metal-ovn-two-node-fencing-dualstack-recovery-1of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-4.23-e2e-metal-ovn-two-node-fencing-dualstack-recovery-2of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-dualstack-recovery-2of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-4.23-e2e-metal-ovn-two-node-fencing-recovery-repo-ra-2of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-5.1-e2e-metal-ovn-two-node-fencing-ipv6-recovery-2of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-4.23-e2e-metal-ovn-two-node-fencing-dualstack-recovery-1of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-4.23-e2e-metal-ovn-two-node-fencing-ipv6-recovery-1of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ovn-two-node-fencing-ipv6-recovery-1of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-dualstack-recovery-1of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ovn-two-node-fencing-dualstack-recovery-2of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-5.1-e2e-metal-ovn-two-node-fencing-recovery-repo-ra-1of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-5.1-e2e-metal-ovn-two-node-fencing-recovery-repo-ra-2of2 N/A periodic Periodic changed
periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-recovery-1of2 N/A periodic Periodic changed
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.

@jaypoulz

Copy link
Copy Markdown
Contributor

/retest-required
/lgtm
/unhold

@openshift-ci openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Sep 17, 2026
@openshift-ci

openshift-ci Bot commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jaypoulz, neisw, redhat-chai-bot

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

@redhat-chai-bot

Copy link
Copy Markdown
Contributor Author

/retest-required


AI-generated. Review for accuracy.

@jaypoulz

Copy link
Copy Markdown
Contributor

/retest-required

@openshift-ci

openshift-ci Bot commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

@redhat-chai-bot: 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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants