CNTRLPLANE-3222: add v2 lifecycle tests to Azure self-managed e2e#79347
Conversation
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
|
Skipping CI for Draft Pull Request. |
openshift-ci-robot
added
the
jira/valid-reference
|
@bryan-cox: This pull request references CNTRLPLANE-3222 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 task to target the "5.0.0" version, but no target version was set. DetailsIn response to this:
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. |
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
WalkthroughAdds an N-1 release dependency, delegates create/destroy/dump/test steps to packaged /hypershift/bin helpers, updates step refs/from images, sets HYPERSHIFT_PLATFORM="azure", and increases the e2e timeout. ChangesUpgrade cluster testing infrastructure
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Suggested labels
Suggested reviewers
🚥 Pre-merge checks | ✅ 12✅ Passed checks (12 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Warning Review ran into problems🔥 ProblemsGit: Failed to clone repository. Please run the Comment |
openshift-ci
Bot
added
the
approved
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@ci-operator/step-registry/hypershift/azure/create-selfmanaged-guests/hypershift-azure-create-selfmanaged-guests-commands.sh`:
- Around line 105-121: The hypershift create cluster azure invocation in
hypershift-azure-create-selfmanaged-guests-commands.sh omits the marketplace
image flags; update the command that constructs the cluster (the
`/usr/bin/hypershift create cluster azure \` block that uses variables like
${UPGRADE_NAME}, ${EXTERNAL_DNS_ARGS}, ${ETCD_STORAGE_CLASS_ARGS}`) to include
`${MARKETPLACE_ARGS}` (e.g., add `${MARKETPLACE_ARGS} \` alongside the other arg
variables before the background `&`) so marketplace-backed upgrade clusters
receive the same image flags as other clusters.
In
`@ci-operator/step-registry/hypershift/azure/run-e2e-v2-selfmanaged/hypershift-azure-run-e2e-v2-selfmanaged-chain.yaml`:
- Around line 83-84: The script logs the wait exit code incorrectly because it
echoes $? after running "wait ${PID_UPGRADE} || OVERALL_EXIT=1", which can print
0; change the sequence to capture the wait status into a variable (e.g.,
status=$(wait ${PID_UPGRADE}); or wait ${PID_UPGRADE}; status=$?), then if
status is non-zero set OVERALL_EXIT=1, and finally echo the captured status
variable in the message so the logged exit reflects the actual PID_UPGRADE exit
code; update references around PID_UPGRADE and OVERALL_EXIT accordingly.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 6272501e-9f67-415e-bfdb-e0e422607b35
📒 Files selected for processing (6)
ci-operator/config/openshift/hypershift/openshift-hypershift-main.yamlci-operator/step-registry/hypershift/azure/create-selfmanaged-guests/hypershift-azure-create-selfmanaged-guests-commands.shci-operator/step-registry/hypershift/azure/create-selfmanaged-guests/hypershift-azure-create-selfmanaged-guests-ref.yamlci-operator/step-registry/hypershift/azure/destroy-selfmanaged-guests/hypershift-azure-destroy-selfmanaged-guests-chain.yamlci-operator/step-registry/hypershift/azure/dump-selfmanaged-guests/hypershift-azure-dump-selfmanaged-guests-chain.yamlci-operator/step-registry/hypershift/azure/run-e2e-v2-selfmanaged/hypershift-azure-run-e2e-v2-selfmanaged-chain.yaml
bryan-cox
force-pushed
the
CNTRLPLANE-3222-v2-lifecycle
branch
from
8c51b16 to
62f3f13
Compare
|
@bryan-cox, Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@ci-operator/step-registry/hypershift/azure/dump-selfmanaged-guests/hypershift-azure-dump-selfmanaged-guests-chain.yaml`:
- Around line 9-10: Temporarily disable xtrace before sourcing the sensitive
file and restore it afterwards: save current xtrace state (e.g., inspect "$-" or
use a flag), run set +x, source "${SHARED_DIR}/proxy-conf.sh", then restore the
prior xtrace setting (re-enable with set -x if it was previously on); apply this
around the existing sourcing call so assignments inside proxy-conf.sh are not
echoed to logs.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 7b5ad206-e896-4241-b3ac-7ce02fdc733b
📒 Files selected for processing (7)
ci-operator/config/openshift/hypershift/openshift-hypershift-main.yamlci-operator/step-registry/hypershift/azure/create-selfmanaged-guests/hypershift-azure-create-selfmanaged-guests-commands.shci-operator/step-registry/hypershift/azure/create-selfmanaged-guests/hypershift-azure-create-selfmanaged-guests-ref.yamlci-operator/step-registry/hypershift/azure/destroy-selfmanaged-guests/hypershift-azure-destroy-selfmanaged-guests-chain.yamlci-operator/step-registry/hypershift/azure/dump-selfmanaged-guests/hypershift-azure-dump-selfmanaged-guests-chain.yamlci-operator/step-registry/hypershift/azure/e2e/v2-self-managed/hypershift-azure-e2e-v2-self-managed-workflow.yamlci-operator/step-registry/hypershift/azure/run-e2e-v2-selfmanaged/hypershift-azure-run-e2e-v2-selfmanaged-chain.yaml
🚧 Files skipped from review as they are similar to previous changes (2)
- ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
- ci-operator/step-registry/hypershift/azure/create-selfmanaged-guests/hypershift-azure-create-selfmanaged-guests-ref.yaml
bryan-cox
force-pushed
the
CNTRLPLANE-3222-v2-lifecycle
branch
from
62f3f13 to
0b5b041
Compare
|
@bryan-cox, Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
bryan-cox
force-pushed
the
CNTRLPLANE-3222-v2-lifecycle
branch
from
0b5b041 to
8278640
Compare
|
@bryan-cox, Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
Add a 4th HA cluster (N-1 release image) to the self-managed guest cluster creation step for upgrade and etcd chaos tests. Lifecycle tests run in parallel with existing topology tests: - Autoscaling + nodepool lifecycle tests run on the public cluster - Upgrade test runs on the HA cluster, then etcd chaos runs on the same cluster sequentially (both require HA) - Dump and destroy steps updated to handle the new cluster Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
bryan-cox
force-pushed
the
CNTRLPLANE-3222-v2-lifecycle
branch
from
8278640 to
d19aeb3
Compare
openshift-ci
Bot
removed
the
do-not-merge/work-in-progress
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: bryan-cox, csrwng The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
[REHEARSALNOTIFIER]
Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
/pj-rehearse skip I'll take care of testing this outside this PR |
|
@bryan-cox: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
openshift-merge-bot
Bot
added
the
rehearsals-ack
|
@bryan-cox: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
3 participants
Summary
Changes
OCP_IMAGE_N1release, writescluster-name-upgradetoSHARED_DIRnodepool-autoscaling || nodepool-lifecyclelabels to public cluster test run; runs upgrade → etcd-chaos sequentially on HA cluster in a subshellOCP_IMAGE_N1: release:n1minordependency toe2e-azure-v2-self-managedjobRelated
Test Plan
/pj-rehearse pull-ci-openshift-hypershift-main-e2e-azure-v2-self-managedto validate the full workflowSummary
This PR updates OpenShift CI configuration in openshift/release for the hypershift CI jobs to add v2 lifecycle testing to the Azure self-managed E2E workflow (e2e-azure-v2-self-managed). It provisions an additional HA "upgrade" guest cluster created with the N‑1 release image and wires lifecycle tests so upgrade → etcd-chaos run sequentially on that HA cluster. Public-cluster lifecycle tests (autoscaling and nodepool lifecycle) continue to run on the existing public cluster. Several create/test/dump/destroy steps were refactored to delegate orchestration to helper binaries under /hypershift/bin and the job now declares an explicit dependency on the N‑1 release artifact.
Practical CI / infrastructure effects
Job dependency and job config
Guest cluster provisioning
Test execution
Dump and destroy
Implementation / operational notes