Skip to content

Bump shard02 shard03#81399

Open
roivaz wants to merge 2 commits into
openshift:mainfrom
roivaz:bump-shard02-shard03
Open

Bump shard02 shard03#81399
roivaz wants to merge 2 commits into
openshift:mainfrom
roivaz:bump-shard02-shard03

Conversation

@roivaz

@roivaz roivaz commented Jul 2, 2026

Copy link
Copy Markdown
Contributor
  • Remove AKS mgmt cluster sizing overrides for e2e-parallel job
  • Bump slot counts for dev e2e shard02 and shard03

Depends on Azure/ARO-HCP#5895

Summary by CodeRabbit

This PR updates OpenShift CI infrastructure for ARO HCP workflows by removing the temporary AKS management cluster sizing override from the e2e-parallel provisioning path, so leased MSI container jobs no longer get special MGMT pool sizing treatment. It also expands the available slot capacity for the ARO HCP dev e2e shard02 and shard03 resources, increasing the number of reusable quota slices to support more parallel execution.

@coderabbitai

coderabbitai Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Walkthrough

This PR modifies the ARO-HCP provisioning script to apply an MGMT pool minCount override only when LEASED_MSI_CONTAINERS is unset (healthcheck workflows), removing the prior lease-based sizing override. Separately, it expands boskos dev-shard2 and shard3 slot resource generation from 3 to 6 slots.

Changes

ARO-HCP Provisioning and Boskos Slot Configuration

Layer / File(s) Summary
MGMT pool sizing override for healthcheck
ci-operator/step-registry/aro-hcp/provision/environment/aro-hcp-provision-environment-commands.sh
Replaces the lease-based MGMT sizing override with a guard that forces mgmt.aks.userAgentPool.minCount to 1 when LEASED_MSI_CONTAINERS is empty/unset, removing the prior larger-sizing branch.
Boskos shard slot expansion
core-services/prow/02_config/generate-boskos.py, core-services/prow/02_config/_boskos.yaml
Expands the aro-hcp-dev-shard2-slot generation loop from 3 to 6 iterations and adds corresponding -03 through -05 entries for shard2 and shard3 slot names in the generated config.

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

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Title check ✅ Passed The title is concise and refers to the shard02/shard03 slot-count increase, which is a real part of the changeset.
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 Touched files are a shell script and Boskos config; no It/Describe/Context/When titles were added or changed.
Test Structure And Quality ✅ Passed No Ginkgo test code was changed; the PR only touches a provisioning shell script and generated Boskos config, so the listed test-quality checks don’t apply.
Microshift Test Compatibility ✅ Passed Only a shell script and Boskos configs changed; no Ginkgo e2e tests or MicroShift-sensitive test code were added or modified.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No Go test sources changed; the PR only updates config/shell/python, so no new Ginkgo e2e tests or SNO assumptions were introduced.
Topology-Aware Scheduling Compatibility ✅ Passed No topology-sensitive scheduling was added; changes only adjust CI provisioning sizing and Boskos slot counts, with no affinities, selectors, spreads, or PDBs.
Ote Binary Stdout Contract ✅ Passed Changed files are a shell step, a YAML config, and a Python generator; no process-level stdout writes were added to any OTE binary entrypoint.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR only changes config generation and provisioning shell logic; no new Ginkgo tests or IPv4/public-internet assumptions were added.
No-Weak-Crypto ✅ Passed Touched files only adjust mgmt sizing and Boskos slot counts; scans found no weak-crypto primitives or secret/token comparisons.
Container-Privileges ✅ Passed Touched files are a shell script and Boskos config/generator; no privileged/hostPID/hostNetwork/allowPrivilegeEscalation settings were added.
No-Sensitive-Data-In-Logs ✅ Passed PASS: The PR only adjusts cluster sizing and Boskos slot counts; no new logging of secrets, tokens, PII, or hostnames was added in the changed hunks.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
✨ 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.

@openshift-ci openshift-ci Bot requested review from deepsm007 and raelga July 2, 2026 13:25
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@roivaz: 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
pull-ci-Azure-ARO-HCP-main-e2e-parallel Azure/ARO-HCP presubmit Registry content changed
pull-ci-Azure-ARO-HCP-main-capz-e2e-dev Azure/ARO-HCP presubmit Registry content changed
periodic-ci-Azure-ARO-HCP-main-periodic-healthcheck-provision-centralus N/A periodic Registry content changed
periodic-ci-Azure-ARO-HCP-main-periodic-healthcheck-provision-canadacentral N/A periodic Registry content changed
periodic-ci-Azure-ARO-HCP-main-periodic-healthcheck-provision-westus3 N/A periodic Registry content changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

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.

@roivaz

roivaz commented Jul 2, 2026

Copy link
Copy Markdown
Contributor Author

/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 Jul 2, 2026
@openshift-ci

openshift-ci Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

@roivaz: 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.

@raelga raelga 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
/approve

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

openshift-ci Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: raelga, roivaz
Once this PR has been reviewed and has the lgtm label, please assign danilo-gemoli 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

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

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants