Skip to content

CNTRLPLANE-3198: Extend Azure self-managed e2e test coverage #77597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 14, 2026
Merged

CNTRLPLANE-3198: Extend Azure self-managed e2e test coverage #77597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ tests:
OCP_IMAGE_N1: release:n1minor
OCP_IMAGE_N2: release:n2minor
env:
CI_TESTS_RUN: ^(TestCreateCluster|TestAzurePrivateTopology|TestAzureOAuthLoadBalancer)$
CI_TESTS_RUN: ^(TestCreateCluster$|TestAutoscaling|TestNodePool|TestUpgradeControlPlane|TestHAEtcdChaos|TestAzureOAuthLoadBalancer|TestAzurePrivateTopology)$
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Apr 13, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Main branch config still filters tests; full suite won’t run.

Line 222 keeps CI_TESTS_RUN, so e2e-azure-self-managed is still test-filtered instead of full-suite.

Proposed fix 
     env:
-      CI_TESTS_RUN: ^(TestCreateCluster$|TestAutoscaling|TestNodePool|TestUpgradeControlPlane|TestHAEtcdChaos|TestAzureOAuthLoadBalancer|TestAzurePrivateTopology)$
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
       HYPERSHIFT_AZURE_LOCATION: centralus
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
CI_TESTS_RUN: ^(TestCreateCluster$|TestAutoscaling|TestNodePool|TestUpgradeControlPlane|TestHAEtcdChaos|TestAzureOAuthLoadBalancer|TestAzurePrivateTopology)$
env:
ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
HYPERSHIFT_AZURE_LOCATION: centralus
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml` at
line 222, The CI config still restricts tests via the CI_TESTS_RUN regex; remove
or clear the CI_TESTS_RUN setting in the openshift-hypershift-main.yaml so the
e2e-azure-self-managed job runs the full test suite (e.g. delete the line
"CI_TESTS_RUN:
^(TestCreateCluster$|TestAutoscaling|TestNodePool|TestUpgradeControlPlane|TestHAEtcdChaos|TestAzureOAuthLoadBalancer|TestAzurePrivateTopology)$"
or set CI_TESTS_RUN to an empty value), ensuring the test filter is no longer
applied.

Copy link
Copy Markdown
Member Author

@bryan-cox bryan-cox Apr 14, 2026

Choose a reason for hiding this comment

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

Yes we do not want to run the full suite just yet

Copy link
Copy Markdown

@coderabbitai coderabbitai bot Apr 14, 2026

Choose a reason for hiding this comment

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

@bryan-cox, understood — the intent is to incrementally expand Azure self-managed e2e coverage (3 → 7 tests) rather than running the full suite immediately, especially with two known failing tests (TestAzureScheduler/Main and TestCreateClusterDefaultSecurityContextUID) still under investigation. I'll note this for future reviews.

📝 Learnings were identified and not saved (knowledge base disabled). Enable

ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
HYPERSHIFT_AZURE_LOCATION: centralus
post:
Expand Down
2 changes: 1 addition & 1 deletion ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.23.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ tests:
OCP_IMAGE_N1: release:n1minor
OCP_IMAGE_N2: release:n2minor
env:
CI_TESTS_RUN: ^(TestCreateCluster|TestAzurePrivateTopology|TestAzureOAuthLoadBalancer)$
CI_TESTS_RUN: ^(TestCreateCluster$|TestAutoscaling|TestNodePool|TestUpgradeControlPlane|TestHAEtcdChaos|TestAzureOAuthLoadBalancer|TestAzurePrivateTopology)$
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Apr 13, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

CI_TESTS_RUN should be removed here as well to meet full-suite intent.

Line 215 still constrains execution to a regex-selected subset, which prevents e2e-azure-self-managed from running the full suite on release-4.23.

Proposed fix 
     env:
-      CI_TESTS_RUN: ^(TestCreateCluster$|TestAutoscaling|TestNodePool|TestUpgradeControlPlane|TestHAEtcdChaos|TestAzureOAuthLoadBalancer|TestAzurePrivateTopology)$
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
       HYPERSHIFT_AZURE_LOCATION: centralus
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
CI_TESTS_RUN: ^(TestCreateCluster$|TestAutoscaling|TestNodePool|TestUpgradeControlPlane|TestHAEtcdChaos|TestAzureOAuthLoadBalancer|TestAzurePrivateTopology)$
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In
`@ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.23.yaml`
at line 215, The CI config still pins a subset of tests via the CI_TESTS_RUN
environment variable (CI_TESTS_RUN:
^(TestCreateCluster$|TestAutoscaling|TestNodePool|TestUpgradeControlPlane|TestHAEtcdChaos|TestAzureOAuthLoadBalancer|TestAzurePrivateTopology)$),
which blocks the full-suite run; remove the CI_TESTS_RUN entry (or clear its
value) from the job definition so e2e-azure-self-managed can run the full suite
on release-4.23, locating the variable by the exact name CI_TESTS_RUN in the
YAML and deleting that key/value pair.

Copy link
Copy Markdown
Member Author

@bryan-cox bryan-cox Apr 14, 2026

Choose a reason for hiding this comment

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

Yes we do not want to run the full suite just yet

Copy link
Copy Markdown

@coderabbitai coderabbitai bot Apr 14, 2026

Choose a reason for hiding this comment

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

@bryan-cox, understood! The expanded CI_TESTS_RUN regex is intentional — incrementally broadening the test subset rather than enabling the full suite all at once. I'll disregard this concern.

📝 Learnings were identified and not saved (knowledge base disabled). Enable

ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
HYPERSHIFT_AZURE_LOCATION: centralus
post:
Expand Down
2 changes: 1 addition & 1 deletion ci-operator/config/openshift/hypershift/openshift-hypershift-release-5.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ tests:
OCP_IMAGE_N1: release:n1minor
OCP_IMAGE_N2: release:n2minor
env:
CI_TESTS_RUN: ^(TestCreateCluster|TestAzurePrivateTopology|TestAzureOAuthLoadBalancer)$
CI_TESTS_RUN: ^(TestCreateCluster$|TestAutoscaling|TestNodePool|TestUpgradeControlPlane|TestHAEtcdChaos|TestAzureOAuthLoadBalancer|TestAzurePrivateTopology)$
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Apr 13, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Remove the test-name filter to actually run the full Azure self-managed suite.

Line 215 still sets CI_TESTS_RUN, so this job remains a scoped subset run instead of full e2e coverage.

Proposed fix 
     env:
-      CI_TESTS_RUN: ^(TestCreateCluster$|TestAutoscaling|TestNodePool|TestUpgradeControlPlane|TestHAEtcdChaos|TestAzureOAuthLoadBalancer|TestAzurePrivateTopology)$
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
       HYPERSHIFT_AZURE_LOCATION: centralus
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
CI_TESTS_RUN: ^(TestCreateCluster$|TestAutoscaling|TestNodePool|TestUpgradeControlPlane|TestHAEtcdChaos|TestAzureOAuthLoadBalancer|TestAzurePrivateTopology)$
env:
ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
HYPERSHIFT_AZURE_LOCATION: centralus
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In
`@ci-operator/config/openshift/hypershift/openshift-hypershift-release-5.0.yaml`
at line 215, Remove the CI_TESTS_RUN environment filter so the job runs the full
Azure self-managed e2e suite: locate the CI_TESTS_RUN entry in the job spec (the
line containing the regex
^(TestCreateCluster$|TestAutoscaling|TestNodePool|TestUpgradeControlPlane|TestHAEtcdChaos|TestAzureOAuthLoadBalancer|TestAzurePrivateTopology)$)
and delete that environment variable assignment entirely, leaving no
CI_TESTS_RUN filter in the job definition.

Copy link
Copy Markdown
Member Author

@bryan-cox bryan-cox Apr 14, 2026

Choose a reason for hiding this comment

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

Yes we do not want to run the full suite just yet

Copy link
Copy Markdown

@coderabbitai coderabbitai bot Apr 14, 2026

Choose a reason for hiding this comment

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

@bryan-cox, understood! The current approach of expanding the test list incrementally while keeping CI_TESTS_RUN scoped makes sense as a stepping stone toward full suite coverage. Thanks for the clarification!

📝 Learnings were identified and not saved (knowledge base disabled). Enable

ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
HYPERSHIFT_AZURE_LOCATION: centralus
post:
Expand Down
4 changes: 2 additions & 2 deletions ...ift/setup-nested-management-cluster/hypershift-setup-nested-management-cluster-chain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ chain:
export KUBECONFIG=/etc/hypershift-kubeconfig-azure/hypershift-ops-admin.kubeconfig
AZURE_GUEST_INFRA_CREDENTIALS_FILE="/etc/hypershift-ci-jobs-self-managed-azure/credentials.json"
DEFAULT_BASE_DOMAIN=hcp-sm-azure.azure.devcluster.openshift.com
HYPERSHIFT_INSTANCE_TYPE=Standard_D4s_v4
HYPERSHIFT_INSTANCE_TYPE=Standard_D16s_v3
HYPERSHIFT_AZURE_LOCATION=${HYPERSHIFT_AZURE_LOCATION:-centralus}
else
AWS_GUEST_INFRA_CREDENTIALS_FILE="/etc/hypershift-ci-jobs-awscreds/credentials"
Expand All @@ -61,7 +61,7 @@ chain:

DOMAIN=${HYPERSHIFT_BASE_DOMAIN:-$DEFAULT_BASE_DOMAIN}
DEFAULT_RELEASE_STREAM=4-stable
HYPERSHIFT_HC_RELEASE_IMAGE=${HYPERSHIFT_HC_RELEASE_IMAGE:-quay.io/openshift-release-dev/ocp-release:4.22.0-ec.1-multi}
HYPERSHIFT_HC_RELEASE_IMAGE=${HYPERSHIFT_HC_RELEASE_IMAGE:-quay.io/openshift-release-dev/ocp-release:4.22.0-ec.3-multi}

CLUSTER_NAME="$(echo -n $PROW_JOB_ID|sha256sum|cut -c-10)-mgmt"

Expand Down