Skip to content

NO-JIRA: Change hypershift azure v2 job to standard #3613

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
Jun 12, 2026
Merged

NO-JIRA: Change hypershift azure v2 job to standard #3613

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
1 change: 1 addition & 0 deletions pkg/variantregistry/ocp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ func (v *OCPVariantLoader) setJobTier(_ logrus.FieldLogger, variants map[string]
// Only a select few Hypershift jobs are ready for blocking signal, the rest will default to candidate below.
{[]string{"periodic-ci-openshift-hypershift-", "-e2e-azure-aks-ovn-conformance"}, "standard"},
{[]string{"periodic-ci-openshift-hypershift-", "-e2e-aws-ovn-conformance"}, "standard"},
{[]string{"periodic-ci-openshift-hypershift-", "-e2e-azure-v2-self-managed"}, "standard"},

// All other Hypershift jobs will default to candidate.
{[]string{"periodic-ci-openshift-hypershift-"}, "candidate"},
Expand Down
28 changes: 28 additions & 0 deletions pkg/variantregistry/ocp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,34 @@ func TestVariantSyncer(t *testing.T) {
VariantOS: "rhcos9",
},
},
{
job: "periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-azure-v2-self-managed",
expected: map[string]string{
VariantRelease: "5.0",
VariantReleaseMajor: "5",
VariantReleaseMinor: "0",
VariantArch: "amd64",
VariantInstaller: "hypershift",
VariantPlatform: "azure",
VariantProcedure: "none",
VariantJobTier: "standard",
VariantNetwork: "ovn",
VariantNetworkStack: "ipv4",
VariantOwner: "eng",
VariantTopology: "external",
VariantSuite: "unknown",
VariantUpgrade: VariantNoValue,
VariantAggregation: VariantNoValue,
VariantFeatureSet: VariantDefaultValue,
VariantNetworkAccess: VariantDefaultValue,
VariantScheduler: VariantDefaultValue,
VariantSecurityMode: VariantDefaultValue,
VariantContainerRuntime: "crun",
VariantCGroupMode: "v2",
VariantLayeredProduct: VariantNoValue,
VariantOS: "rhcos9",
},
},
{
job: "periodic-ci-openshift-hypershift-release-4.20-periodics-e2e-aws-multi",
expected: map[string]string{
Expand Down
4 changes: 2 additions & 2 deletions pkg/variantregistry/snapshot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39254,7 +39254,7 @@ periodic-ci-openshift-hypershift-release-4.23-periodics-e2e-azure-v2-self-manage
ContainerRuntime: crun
FeatureSet: default
Installer: hypershift
JobTier: candidate
JobTier: standard

@coderabbitai coderabbitai Bot Jun 11, 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: Find all hypershift configurations in the snapshot to verify JobTier consistency.
# Expected: All hypershift azure v2 configurations should use 'standard' tier after this change.

# Search for hypershift entries and show their JobTier values
rg -A 10 'Installer: hypershift' pkg/variantregistry/snapshot.yaml | rg -B 5 -A 5 'JobTier:'

echo "---"
echo "Summary: Hypershift entries still using 'candidate' tier (should be none after this PR):"
rg -B 3 'Installer: hypershift' pkg/variantregistry/snapshot.yaml | rg -B 3 'JobTier: candidate'

Repository: openshift/sippy

Length of output: 50372

🏁 Script executed:

#!/bin/bash
set -euo pipefail
FILE="pkg/variantregistry/snapshot.yaml"

# Show narrow context around the two claimed hunks.
echo "=== Context around line 39257 ==="
sed -n '39240,39275p' "$FILE" | nl -ba

echo "=== Context around line 40003 ==="
sed -n '39985,40025p' "$FILE" | nl -ba

# Find "azure v2" hints near hypershift entries (if any explicit marker exists).
echo "=== Lines containing hypershift + azure + (v2|azurev2|AzureV2) ==="
rg -n --no-heading 'Installer:\s*hypershift' -S "$FILE" | head -n 5 || true
rg -n --no-heading 'Platform:\s*azure' "$FILE" | head -n 5 || true
rg -n --no-heading '(azure.?v2|Azure.?V2|v2)' "$FILE" | head -n 50 || true

# Collect all hypershift entries where Platform is azure, but only show the immediately surrounding JobTier lines.
echo "=== Hypershift+azure JobTier occurrences (limited output) ==="
rg -n --no-heading -C 6 'Installer:\s*hypershift' "$FILE" | rg -n --no-heading 'Platform:\s*azure|JobTier:\s*(candidate|standard|hidden)' | head -n 200 || true

# Specifically list hypershift+azure blocks where JobTier is candidate, to see if any look like the "azure v2" change target.
echo "=== Hypershift+azure blocks with JobTier: candidate (limited) ==="
rg -n --no-heading -C 12 'Installer:\s*hypershift' "$FILE" \
  | rg -n --no-heading 'JobTier:\s*candidate|Platform:\s*azure|Release:\s*|LayeredProduct:|NetworkAccess:|Network:\s*|NetworkStack:' \
  | head -n 250 || true

Repository: openshift/sippy

Length of output: 154

🏁 Script executed:

#!/bin/bash
set -euo pipefail
FILE="pkg/variantregistry/snapshot.yaml"

echo "=== Context around line 39257 ==="
sed -n '39240,39275p' "$FILE" | nl -ba

echo "=== Context around line 40003 ==="
sed -n '39985,40025p' "$FILE" | nl -ba

echo "=== Search for explicit azure v2 markers ==="
rg -n --no-heading '(azure.?v2|Azure.?V2|AzureV2|AZURE_V2|v2)' "$FILE" | head -n 200 || true

echo "=== Hypershift + Platform: azure + JobTier lines (limited) ==="
rg -n --no-heading -C 8 'Installer:\s*hypershift' "$FILE" \
  | rg -n --no-heading 'Platform:\s*azure|JobTier:\s*(candidate|standard|hidden)' \
  | head -n 200 || true

echo "=== Candidate hypershift + azure (limited) ==="
rg -n --no-heading -C 10 'Installer:\s*hypershift' "$FILE" \
  | rg -n --no-heading 'Platform:\s*azure|JobTier:\s*candidate|JobTier:\s*standard|JobTier:\s*hidden|Release:\s*|ReleaseMajor:|LayeredProduct:|Network:\s*|NetworkAccess:|NetworkStack:' \
  | head -n 250 || true

Repository: openshift/sippy

Length of output: 154

🏁 Script executed:

#!/bin/bash
set -euo pipefail
FILE="pkg/variantregistry/snapshot.yaml"

echo "=== Context around line 39257 ==="
sed -n '39240,39275p' "$FILE" | nl -ba

echo "=== Context around line 40003 ==="
sed -n '39985,40025p' "$FILE" | nl -ba

echo "=== Search for explicit azure v2 markers ==="
rg -n --no-heading '(azure.?v2|Azure.?V2|AzureV2|AZURE_V2|v2)' "$FILE" | head -n 200 || true

echo "=== Hypershift + Platform: azure + JobTier lines (limited) ==="
rg -n --no-heading -C 8 'Installer:\s*hypershift' "$FILE" \
  | rg -n --no-heading 'Platform:\s*azure|JobTier:\s*(candidate|standard|hidden)' \
  | head -n 200 || true

echo "=== Candidate hypershift + azure (limited) ==="
rg -n --no-heading -C 10 'Installer:\s*hypershift' "$FILE" \
  | rg -n --no-heading 'Platform:\s*azure|JobTier:\s*candidate|JobTier:\s*standard|JobTier:\s*hidden|Release:\s*|ReleaseMajor:|LayeredProduct:|Network:\s*|NetworkAccess:|NetworkStack:' \
  | head -n 250 || true

Repository: openshift/sippy

Length of output: 154

🏁 Script executed:

#!/bin/bash
set -euo pipefail
FILE="pkg/variantregistry/snapshot.yaml"

echo "=== Context around line 39257 ==="
sed -n '39240,39275p' "$FILE" | nl -ba

echo "=== Context around line 40003 ==="
sed -n '39985,40025p' "$FILE" | nl -ba

echo "=== Search for explicit azure v2 markers ==="
rg -n --no-heading '(azure.?v2|Azure.?V2|AzureV2|AZURE_V2|v2)' "$FILE" | head -n 200 || true

echo "=== Hypershift + Platform: azure + JobTier lines (limited) ==="
rg -n --no-heading -C 8 'Installer:\s*hypershift' "$FILE" \
  | rg -n --no-heading 'Platform:\s*azure|JobTier:\s*(candidate|standard|hidden)' \
  | head -n 200 || true

echo "=== Candidate hypershift + azure (limited) ==="
rg -n --no-heading -C 10 'Installer:\s*hypershift' "$FILE" \
  | rg -n --no-heading 'Platform:\s*azure|JobTier:\s*candidate|JobTier:\s*standard|JobTier:\s*hidden|Release:\s*|ReleaseMajor:|LayeredProduct:|Network:\s*|NetworkAccess:|NetworkStack:' \
  | head -n 250 || true

Repository: openshift/sippy

Length of output: 154

🏁 Script executed:

#!/bin/bash
set -euo pipefail
FILE="pkg/variantregistry/snapshot.yaml"

echo "=== Context around line 39257 ==="
sed -n '39240,39275p' "$FILE" | nl -ba

echo "=== Context around line 40003 ==="
sed -n '39985,40025p' "$FILE" | nl -ba

echo "=== Search for explicit azure v2 markers ==="
rg -n --no-heading '(azure.?v2|Azure.?V2|AzureV2|AZURE_V2|v2)' "$FILE" | head -n 200 || true

echo "=== Hypershift + Platform: azure + JobTier lines (limited) ==="
rg -n --no-heading -C 8 'Installer:\s*hypershift' "$FILE" \
  | rg -n --no-heading 'Platform:\s*azure|JobTier:\s*(candidate|standard|hidden)' \
  | head -n 200 || true

echo "=== Candidate hypershift + azure (limited) ==="
rg -n --no-heading -C 10 'Installer:\s*hypershift' "$FILE" \
  | rg -n --no-heading 'Platform:\s*azure|JobTier:\s*candidate|JobTier:\s*standard|JobTier:\s*hidden|Release:\s*|ReleaseMajor:|LayeredProduct:|Network:\s*|NetworkAccess:|NetworkStack:' \
  | head -n 250 || true

Repository: openshift/sippy

Length of output: 154

🏁 Script executed:

#!/bin/bash
set -euo pipefail
FILE="pkg/variantregistry/snapshot.yaml"

echo "=== Context around line 39257 ==="
sed -n '39240,39275p' "$FILE" | nl -ba

echo "=== Context around line 40003 ==="
sed -n '39985,40025p' "$FILE" | nl -ba

echo "=== Search for explicit azure v2 markers ==="
rg -n --no-heading '(azure.?v2|Azure.?V2|AzureV2|AZURE_V2|v2)' "$FILE" | head -n 200 || true

echo "=== Hypershift + Platform: azure + JobTier lines (limited) ==="
rg -n --no-heading -C 8 'Installer:\s*hypershift' "$FILE" \
  | rg -n --no-heading 'Platform:\s*azure|JobTier:\s*(candidate|standard|hidden)' \
  | head -n 200 || true

echo "=== Candidate hypershift + azure (limited) ==="
rg -n --no-heading -C 10 'Installer:\s*hypershift' "$FILE" \
  | rg -n --no-heading 'Platform:\s*azure|JobTier:\s*candidate|JobTier:\s*standard|JobTier:\s*hidden|Release:\s*|ReleaseMajor:|LayeredProduct:|Network:\s*|NetworkAccess:|NetworkStack:' \
  | head -n 250 || true

Repository: openshift/sippy

Length of output: 154

🏁 Script executed:

#!/bin/bash
set -euo pipefail
FILE="pkg/variantregistry/snapshot.yaml"

echo "=== Context around line 39257 ==="
sed -n '39240,39275p' "$FILE" | nl -ba

echo "=== Context around line 40003 ==="
sed -n '39985,40025p' "$FILE" | nl -ba

echo "=== Search for explicit azure v2 markers ==="
rg -n --no-heading '(azure.?v2|Azure.?V2|AzureV2|AZURE_V2|azurev2)' "$FILE" | head -n 200 || true

echo "=== Hypershift + Platform: azure + JobTier lines (limited) ==="
rg -n --no-heading -C 8 'Installer:\s*hypershift' "$FILE" \
  | rg -n --no-heading 'Platform:\s*azure|JobTier:\s*(candidate|standard|hidden)' \
  | head -n 200 || true

echo "=== Candidate hypershift + azure (limited) ==="
rg -n --no-heading -C 10 'Installer:\s*hypershift' "$FILE" \
  | rg -n --no-heading 'Platform:\s*azure|JobTier:\s*candidate|JobTier:\s*standard|JobTier:\s*hidden|Release:\s*|ReleaseMajor:|LayeredProduct:|Network:\s*|NetworkAccess:|NetworkStack:' \
  | head -n 250 || true

Repository: openshift/sippy

Length of output: 154

Ensure hypershift Azure JobTier is updated consistently to standard in pkg/variantregistry/snapshot.yaml.

  • The snapshot still contains Installer: hypershift + Platform: azure entries with JobTier: candidate, so updating only the hunks at ~39257 and ~40003 likely misses other “azure v2”/Azure variants and can lead to inconsistent downstream BigQuery filtering.
  • Update all hypershift+Azure variants that are in-scope for this PR to JobTier: standard (or narrow the PR if only specific variants should change).
🤖 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 `@pkg/variantregistry/snapshot.yaml` at line 39257, The snapshot still contains
entries where Installer: hypershift and Platform: azure but JobTier is set to
candidate; update every matching YAML document in
pkg/variantregistry/snapshot.yaml so that any variant object with Installer:
hypershift and Platform: azure has JobTier: standard (not just the hunk around
JobTier at ~39257 or ~40003). Search for the keys Installer: hypershift and
Platform: azure across the file and change the corresponding JobTier: candidate
-> JobTier: standard for all in-scope “azure v2”/Azure variants, ensuring
consistency for downstream BigQuery filtering.

LayeredProduct: none
Network: ovn
NetworkAccess: default
Expand Down Expand Up @@ -40000,7 +40000,7 @@ periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-azure-v2-self-managed
ContainerRuntime: crun
FeatureSet: default
Installer: hypershift
JobTier: candidate
JobTier: standard
LayeredProduct: none
Network: ovn
NetworkAccess: default
Expand Down