Skip to content

Bump cs to 84b200b#5382

Merged
openshift-merge-bot[bot] merged 3 commits into
Azure:mainfrom
machi1990:bump/cs-to-84b200b
May 28, 2026
Merged

Bump cs to 84b200b#5382
openshift-merge-bot[bot] merged 3 commits into
Azure:mainfrom
machi1990:bump/cs-to-84b200b

Conversation

@machi1990
Copy link
Copy Markdown
Collaborator

@machi1990 machi1990 commented May 26, 2026

What

Bump cs to 84b200b and stop pinning it

Why

Bump CS and for a while use nightly for 5.0 which contains a fix for the NIC issue.
Work on backporting are underway and once Hypershift overrides are available, CS change will happen and we'll revert back to use the configured channel

Testing

Special notes for your reviewer

PR Checklist

  • PR is scoped to a single task (no mixed concerns)
  • Title follows Conventional Commits format
  • Summary explains the "Why" behind the change
  • Linked to relevant ticket/issue
  • Screenshots included (if graph/UI/metrics changes)
  • Self-reviewed the diff
  • CI/CD checks are passing (ignore Tide)
  • Draft PR used for WIP (if applicable)
  • Commit history is clean (rebased/squashed)
  • Tricky code blocks are commented
  • Specific reviewers tagged
  • All comment threads resolved before merge

Copilot AI review requested due to automatic review settings May 26, 2026 07:05
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Updates E2E multiversion cluster install behavior to use explicit channel groups (including nightly for specific versions) and bumps the clusters-service image digest across dev environments.

Changes:

  • Move channel-group selection into the multiversion table test and route specific versions to nightly.
  • Persist chosen channel groups into clusterParams.ChannelGroup and nodePoolParams.ChannelGroup.
  • Update rendered dev config YAMLs (and default config) to a new aro-hcp-clusters-service image digest.

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
test/e2e/complete_cluster_create_multiversion.go Selects per-version channel groups and passes them into cluster/nodepool params for install/version resolution.
config/rendered/dev/prow/westus3.yaml Bumps clusters-service image digest in dev prow environment.
config/rendered/dev/pers/westus3.yaml Bumps clusters-service image digest in dev pers environment.
config/rendered/dev/perf/westus3.yaml Bumps clusters-service image digest in dev perf environment.
config/rendered/dev/dev/westus3.yaml Bumps clusters-service image digest in dev dev environment.
config/rendered/dev/cspr/westus3.yaml Bumps clusters-service image digest in dev cspr environment.
config/rendered/dev/ci01/westus3.yaml Bumps clusters-service image digest in dev ci01 environment.
config/config.yaml Updates the default clusters-service image digest (and comment metadata).

Comment on lines +53 to +58
if version == "4.23" || version == "5.0" {
// Nightly channel picks up the Hypershift fix for Swift NIC scheduling overrides
// (https://github.com/openshift/hypershift/pull/8552) and test it against the CS bump.
channelGroup = "nightly"
nodePoolChannelGroup = "nightly"
}
Comment thread config/config.yaml
registry: quay.io
repository: app-sre/aro-hcp-clusters-service
digest: sha256:c7c3d1b499fbc29760eda173fa1a8c4eb2cd2b0aa3a872c7fe3aacfc2ff8abe5 # dbb022a3dd3f0533ae1c8eebd4e6929ba1ca1ede (2026-05-19 06:44)
digest: sha256:449827838d1e8d19a442ca470c86acfc206628345b1a4dea47c57cbd4865b7c9 # 84b200b1d25eddb2d09ea820adcf5208e1de9779
@machi1990
Copy link
Copy Markdown
Collaborator Author

/test e2e-parallel

@machi1990
Copy link
Copy Markdown
Collaborator Author

triggering the test again

@machi1990 machi1990 force-pushed the bump/cs-to-84b200b branch from f0c6120 to 010acc9 Compare May 27, 2026 11:00
Copilot AI review requested due to automatic review settings May 27, 2026 11:13
Copy link
Copy Markdown
Collaborator

@raelga raelga left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

machi1990 added 3 commits May 27, 2026 16:26
…ha 84b200b1d25eddb2d09ea820adcf5208e1de9779

To bring in the changes that's related to https://redhat.atlassian.net/browse/ARO-27209

See Azure#5346 for an attempt to add e2e that will gate against the hypershift change
…r NIC scheduling

Pick the fix done in this PR openshift/hypershift#8552 and test it against the CS bump to validate that it works end to end
Copy link
Copy Markdown
Collaborator

@raelga raelga left a comment

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 label May 27, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 27, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: machi1990, raelga

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

/retest-required

Remaining retests: 0 against base HEAD 3e438cb and 2 for PR HEAD adfd158 in total

@openshift-merge-bot openshift-merge-bot Bot merged commit 2af3db6 into Azure:main May 28, 2026
14 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants