NO-JIRA: Change hypershift azure v2 job to standard - #3613
Merged
openshift-merge-bot[bot] merged 1 commit intoJun 12, 2026
Conversation
Contributor
|
Pipeline controller notification For optional jobs, comment This repository is configured in: automatic mode |
|
@xueqzhan: This pull request explicitly references no jira issue. 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. |
openshift-ci-robot
added
the
jira/valid-reference
Contributor
WalkthroughThis PR adds JobTier assignment for Hypershift jobs running Azure self-managed e2e tests. The pattern matcher now recognizes these jobs and assigns them ChangesHypershift Azure JobTier Support
🎯 1 (Trivial) | ⏱️ ~3 minutes 🚥 Pre-merge checks | ✅ 19 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (19 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
openshift-ci
Bot
added
the
approved
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
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 `@pkg/variantregistry/snapshot.yaml`:
- 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.
🪄 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: 18283b29-6868-4827-92fb-ba2bf93c0d8f
📒 Files selected for processing (3)
pkg/variantregistry/ocp.gopkg/variantregistry/ocp_test.gopkg/variantregistry/snapshot.yaml
| FeatureSet: default | ||
| Installer: hypershift | ||
| JobTier: candidate | ||
| JobTier: standard |
Contributor
There was a problem hiding this comment.
🧩 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 || trueRepository: 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 || trueRepository: 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 || trueRepository: 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 || trueRepository: 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 || trueRepository: 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 || trueRepository: 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 || trueRepository: 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: azureentries withJobTier: 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.
Contributor
|
Scheduling required tests: |
petr-muller
approved these changes
Jun 12, 2026
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: petr-muller, xueqzhan 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 |
Contributor
|
@xueqzhan: 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. |
4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary by CodeRabbit
Bug Fixes
Tests