Skip to content

ci: add AKS 4.20 e2e job and remove unsupported nodepool versions #80768

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
celebdor wants to merge 2 commits into
base: main
Choose a base branch
from
Open

ci: add AKS 4.20 e2e job and remove unsupported nodepool versions #80768

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0dd25b
ci: add AKS 4.20 e2e job and remove unsupported nodepool versions
celebdor Jun 18, 2026
53406ed
ci: add explicit OCP_IMAGE_N1 dependency to e2e-aks-4-20
celebdor Jun 18, 2026
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
28 changes: 25 additions & 3 deletions 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 @@ -66,6 +66,12 @@ releases:
relative: 1
stream: ci
version: "5.0"
initial-420:
candidate:
product: ocp
relative: 1
stream: ci
version: "4.20"
initial-422:
candidate:
product: ocp
Expand All @@ -77,6 +83,11 @@ releases:
include_built_images: true
name: "5.0"
namespace: ocp
latest-420:
candidate:
product: ocp
stream: ci
version: "4.20"
latest-421:
candidate:
product: ocp
Expand Down Expand Up @@ -132,7 +143,6 @@ tests:
NODEPOOL_N1_VERSION: "4.22"
NODEPOOL_N2_VERSION: "4.21"
NODEPOOL_N3_VERSION: "4.20"
NODEPOOL_N4_VERSION: "4.19"
post:
- ref: hypershift-analyze-e2e-failure
- chain: cucushift-installer-rehearse-azure-aks-deprovision
Expand All @@ -151,8 +161,20 @@ tests:
HYPERSHIFT_AZURE_LOCATION: centralus
NODEPOOL_N1_VERSION: "4.21"
NODEPOOL_N2_VERSION: "4.20"
NODEPOOL_N3_VERSION: "4.19"
NODEPOOL_N4_VERSION: "4.18"
workflow: hypershift-azure-aks-e2e
- always_run: false
as: e2e-aks-4-20
pipeline_run_if_changed: ^(test/e2e|hypershift-operator)
steps:
cluster_profile: hypershift-aks
dependencies:
OCP_IMAGE_LATEST: release:latest-420
OCP_IMAGE_N1: release:latest-420
OCP_IMAGE_PREVIOUS: release:initial-420
env:
AUTH_THROUGH_CERTS: "true"
ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
HYPERSHIFT_AZURE_LOCATION: centralus
workflow: hypershift-azure-aks-e2e
Comment on lines +165 to +178

@coderabbitai coderabbitai Bot Jun 18, 2026

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.

鈿狅笍 Potential issue | 馃煚 Major

馃З Analysis chain

馃弫 Script executed:

#!/bin/bash
# Description: Check how hypershift-azure-run-e2e handles OCP_IMAGE_N* variables
# and verify consistency across AKS E2E jobs

# Check the step commands script for OCP_IMAGE_N* usage
echo "=== Checking how OCP_IMAGE_N* variables are used in the step ==="
rg -A 5 -B 5 'OCP_IMAGE_N[1-4]' ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh

# Check all e2e-aks* jobs in the config for dependency patterns
echo -e "\n=== Checking dependency patterns in e2e-aks* jobs ==="
ast-grep --pattern $'- $$$
  as: e2e-aks$_
  $$$
  dependencies:
    $$$' ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml

Repository: openshift/release

Length of output: 1331

馃弫 Script executed:

# Find the step reference to see how OCP_IMAGE_N* variables are declared/defaulted
find ci-operator/step-registry -name "*hypershift-azure-run-e2e*ref.yaml" -exec cat -n {} \;

# Also check the step reference for dependency declarations
echo "=== Step reference for hypershift-azure-run-e2e ==="
find ci-operator/step-registry -path "*hypershift/azure/run-e2e/*" -type f -exec ls -la {} \;

Repository: openshift/release

Length of output: 3521

馃弫 Script executed:

# Extract e2e-aks-4-21 job configuration to compare with e2e-aks-4-20
echo "=== Checking e2e-aks-4-21 job for comparison ==="
rg -A 15 'as: e2e-aks-4-21' ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml

# Also check if there's default handling in step-ref.yaml
echo -e "\n=== Looking for step reference metadata ==="
rg -B 5 -A 10 'env:' ci-operator/step-registry/hypershift/azure/run-e2e/ | head -60

Repository: openshift/release

Length of output: 4244

Provide explicit N1 dependency to match e2e-aks-4-21 pattern.

The e2e-aks-4-20 job omits explicit OCP_IMAGE_N1 and other N* dependencies, causing them to default to the unversioned release:latest from the step reference鈥攚hich resolves to the current development release, not a 4.20-compatible image.

The e2e-aks-4-21 job correctly provides OCP_IMAGE_N1: release:latest-420, ensuring N-1 compatibility testing uses a supported version. For consistency and correctness, add the same to e2e-aks-4-20:

dependencies:
  OCP_IMAGE_LATEST: release:latest-420
  OCP_IMAGE_PREVIOUS: release:initial-420
  OCP_IMAGE_N1: release:latest-420

This prevents the step from passing an incompatible (unversioned latest) image to the test when checking N-1 nodepool version support, and aligns the configuration with the proven e2e-aks-4-21 pattern.

馃 Prompt for 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.

In `@ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml`
around lines 190 - 202, The e2e-aks-4-20 job is missing the explicit
OCP_IMAGE_N1 dependency, causing it to default to the unversioned release:latest
instead of a 4.20-compatible version. Add OCP_IMAGE_N1: release:latest-420 to
the dependencies section of the e2e-aks-4-20 job (alongside OCP_IMAGE_LATEST and
OCP_IMAGE_PREVIOUS) to ensure N-1 nodepool version compatibility testing uses a
supported 4.20 image, matching the pattern already established in the
e2e-aks-4-21 job.

- as: e2e-aks-override
run_if_changed: (/overrides\.yaml$)
Expand Down