Skip to content

TRT-2623: Turn off aggregation for 4.22 at GA#80134

Open
arnavmeduri wants to merge 2 commits into
openshift:mainfrom
arnavmeduri:turn-off-aggregation-4.22
Open

TRT-2623: Turn off aggregation for 4.22 at GA#80134
arnavmeduri wants to merge 2 commits into
openshift:mainfrom
arnavmeduri:turn-off-aggregation-4.22

Conversation

@arnavmeduri
Copy link
Copy Markdown
Contributor

@arnavmeduri arnavmeduri commented Jun 5, 2026

Update 4.22 nightlies and CI payload to turn off aggregation, and replace with 1 retry.

Summary by CodeRabbit

This PR disables job aggregation for OpenShift Container Platform 4.22's General Availability release and reduces retry logic across the CI infrastructure.

What's being changed:

The PR updates three release configuration files for OCP 4.22:

  • release-ocp-4.22.json (nightly/private releases)
  • release-ocp-4.22-ci.json (CI stream)
  • A private variant

Key modifications:

  1. Aggregation removal: Several aggregated job definitions (prefixed with aggregated-*) are converted to standard per-job entries. This includes AWS OVN upgrades, Azure OVN upgrades, GCP OVN upgrades, and HyperShift conformance jobs.

  2. Retry reduction: All converted jobs have their maxRetries value reduced from 2 to 1, simplifying the retry strategy for 4.22 GA testing.

  3. Analysis job cleanup: The aggregatedProwJob.analysisJobCount blocks are removed from the replaced job definitions, as they are no longer needed without aggregation.

  4. New job additions: Several new conformance and upgrade jobs are added with maxRetries: 1 (e.g., hypershift-aks-conformance-4.22, hypershift-ovn-conformance-4.22).

  5. Minor field changes: The optional field is removed from rosa-classic-sts-conformance while preserving its maxRetries: 1 setting.

Impact:

This affects the CI pipeline for OCP 4.22 GA release testing, simplifying the aggregated testing infrastructure and reducing the number of retries per job from 2 to 1, likely to accelerate the testing feedback loop for the GA release.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 5, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Jun 5, 2026

@arnavmeduri: This pull request references TRT-2626 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Update 4.22 nightlies and CI payload to turn off aggregation, and replace with 1 retry.

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.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jun 5, 2026
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jun 5, 2026

Walkthrough

This PR updates OCP 4.22 release job configurations across three files by converting aggregated job definitions to non-aggregated per-cloud entries, reducing maxRetries from 2 to 1, and adding/disabling specific jobs in the private release pipeline.

Changes

OCP 4.22 Job Configuration Refactoring

Layer / File(s) Summary
Private release job configuration
core-services/release-controller/_releases/priv/release-ocp-4.22.json
Added new disabled job entries for AWS OVN single-node/upgrade (micro-fips), Azure OVN upgrade (micro), GCP OVN RT upgrade (minor), and HyperShift conformance (aks/ovn), all with maxRetries: 1 and upgrade: true configurations.
CI release job conversions
core-services/release-controller/_releases/release-ocp-4.22-ci.json
Converted aggregated-aws and aggregated-azure OVN upgrade jobs to non-aggregated entries with reduced maxRetries: 1 and removed aggregated wrapper blocks. GCP OVN micro upgrade similarly converted from aggregated form while preserving prowJob names and upgrade settings.
Release verify job conversions and cleanup
core-services/release-controller/_releases/release-ocp-4.22.json
Converted verify job definitions for AWS, Azure, GCP OVN/RT upgrades and HyperShift conformance from aggregated entries to non-aggregated form with maxRetries: 1 and removed aggregatedProwJob.analysisJobCount blocks. Removed optional: true field from rosa-classic-sts-conformance while preserving other settings.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Suggested labels

lgtm, approved

Suggested reviewers

  • Akrog
  • Prucek
  • Billy99
🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 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 PR contains only JSON configuration files for release controller; the check is specific to Ginkgo test names in Go code, which are not present in this PR.
Test Structure And Quality ✅ Passed PR modifies only JSON release configuration files, not Ginkgo test code; check for test structure quality is not applicable.
Microshift Test Compatibility ✅ Passed PR contains only JSON release controller configuration changes, no Ginkgo e2e tests added. Check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR modifies only JSON release controller configuration files with no new Ginkgo e2e tests added; SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies only release controller configuration files (JSON), not deployment manifests, operator code, or pod scheduling constraints. Check is not applicable.
Ote Binary Stdout Contract ✅ Passed PR contains only JSON configuration file changes with no executable code that could violate stdout contract.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR modifies only JSON release configuration files for the release controller; no new Ginkgo e2e tests (It(), Describe(), Context(), When()) are added, so the check is not applicable.
No-Weak-Crypto ✅ Passed The PR modifies only JSON CI/CD configuration files with no cryptographic code, implementations, or secret comparisons. Check is not applicable.
Container-Privileges ✅ Passed PR modifies JSON release controller config files, not Kubernetes manifests or container configurations where the security check applies.
No-Sensitive-Data-In-Logs ✅ Passed PR modifies only JSON configuration files with no logging statements or exposed sensitive data (passwords, tokens, API keys, PII, or customer data); changes involve job metadata only.
Title check ✅ Passed The title 'TRT-2623: Turn off aggregation for 4.22 at GA' clearly describes the main change: disabling job aggregation for OCP 4.22 release configuration at general availability, which matches the changeset's removal of aggregated job definitions and their replacement with per-job entries.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@arnavmeduri arnavmeduri changed the title TRT-2626: Turn of aggregation for 4.22 at GA TRT-2623: Turn of aggregation for 4.22 at GA Jun 5, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Jun 5, 2026

@arnavmeduri: This pull request references TRT-2623 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the epic to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Update 4.22 nightlies and CI payload to turn off aggregation, and replace with 1 retry.

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.

@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 5, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 5, 2026

Hi @arnavmeduri. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 5, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: arnavmeduri
Once this PR has been reviewed and has the lgtm label, please assign bradmwilliams for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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 requested review from neisw and xueqzhan June 5, 2026 02:31
@arnavmeduri arnavmeduri changed the title TRT-2623: Turn of aggregation for 4.22 at GA TRT-2623: Turn off aggregation for 4.22 at GA Jun 5, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@arnavmeduri: no rehearsable tests are affected by this change

Note: If this PR includes changes to step registry files (ci-operator/step-registry/) and you expected jobs to be found, try rebasing your PR onto the base branch. This helps pj-rehearse accurately detect changes when the base branch has moved forward.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants