Skip to content

Move aks jobs to their own platform to differentiate from standard azure #2912

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

Open
dgoodwin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move aks jobs to their own platform to differentiate from standard azure #2912

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 pkg/variantregistry/ocp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@ func setPlatform(jLog logrus.FieldLogger, variants map[string]string, jobName st
{"-alibaba", "alibaba"},
{"-azure-aro-hcp", "aro"},
Copy link
Contributor

@neisw neisw Aug 29, 2025

Choose a reason for hiding this comment

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

Look here for ARO, are you sure all AKS is ARO?

{"-azure", "azure"},
{"-aks", "azure"},
{"-aks", "aks"},
Copy link
Contributor

@coderabbitai coderabbitai bot Nov 29, 2025

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

Critical: Move the -aks pattern before -azure to prevent misclassification.

The -aks pattern on line 873 is checked after -azure (line 872). Since pattern matching returns on first match, jobs containing both strings (e.g., periodic-ci-openshift-hypershift-...-e2e-azure-aks-... as seen on line 680) will match -azure first and be incorrectly categorized as "azure" instead of "aks". This defeats the purpose of this PR.

Apply this diff to fix the ordering:

 		{"-azure-aro-hcp", "aro"},
-		{"-azure", "azure"},
 		{"-aks", "aks"},
+		{"-azure", "azure"},

This follows the same pattern as -rosa being checked before -aws (lines 868-869) and -azure-aro-hcp before -azure (lines 871-872).

📝 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
{"-aks", "aks"},
{"-azure-aro-hcp", "aro"},
{"-aks", "aks"},
{"-azure", "azure"},
🤖 Prompt for AI Agents 
In pkg/variantregistry/ocp.go around line 873, the "-aks" pattern is currently
listed after "-azure" causing jobs that contain both to be misclassified as
"azure"; move the {"-aks", "aks"} entry to appear before the {"-azure", "azure"}
entry so "-aks" is checked first, keeping the existing list formatting and
ordering conventions (similar to how "-rosa" precedes "-aws" and
"-azure-aro-hcp" precedes "-azure").

{"-osd-ccs-gcp", "osd-gcp"},
{"-gcp", "gcp"},
{"-libvirt", "libvirt"},
Expand Down
14 changes: 7 additions & 7 deletions pkg/variantregistry/snapshot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ aggregated-hypershift-aks-conformance-4.19-release-openshift-release-analysis-ag
NetworkAccess: default
NetworkStack: ipv4
Owner: eng
Platform: azure
Platform: aks
Procedure: none
Release: "4.19"
ReleaseMajor: "4"
Expand Down Expand Up @@ -20461,7 +20461,7 @@ periodic-ci-openshift-hypershift-release-4.19-periodics-e2e-aks:
NetworkAccess: default
NetworkStack: ipv4
Owner: eng
Platform: azure
Platform: aks
Procedure: none
Release: "4.19"
ReleaseMajor: "4"
Expand All @@ -20484,7 +20484,7 @@ periodic-ci-openshift-hypershift-release-4.19-periodics-e2e-aks-multi-x-ax:
NetworkAccess: default
NetworkStack: ipv4
Owner: eng
Platform: azure
Platform: aks
Procedure: none
Release: "4.19"
ReleaseMajor: "4"
Expand Down Expand Up @@ -21560,7 +21560,7 @@ periodic-ci-openshift-hypershift-release-4.20-periodics-e2e-aks:
NetworkAccess: default
NetworkStack: ipv4
Owner: eng
Platform: azure
Platform: aks
Procedure: none
Release: "4.20"
ReleaseMajor: "4"
Expand All @@ -21583,7 +21583,7 @@ periodic-ci-openshift-hypershift-release-4.20-periodics-e2e-aks-multi-x-ax:
NetworkAccess: default
NetworkStack: ipv4
Owner: eng
Platform: azure
Platform: aks
Procedure: none
Release: "4.20"
ReleaseMajor: "4"
Expand Down Expand Up @@ -22158,7 +22158,7 @@ periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aks:
NetworkAccess: default
NetworkStack: ipv4
Owner: eng
Platform: azure
Platform: aks
Procedure: none
Release: "4.21"
ReleaseMajor: "4"
Expand All @@ -22181,7 +22181,7 @@ periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aks-multi-x-ax:
NetworkAccess: default
NetworkStack: ipv4
Owner: eng
Platform: azure
Platform: aks
Procedure: none
Release: "4.21"
ReleaseMajor: "4"
Expand Down