Add Quay 3.18, 3.16, 3.15, 3.14 upgrade testing on OCP 4.21#78885
Add Quay 3.18, 3.16, 3.15, 3.14 upgrade testing on OCP 4.21#78885LiZhang19817 wants to merge 2 commits intoopenshift:mainfrom
Conversation
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
WalkthroughAdded explicit OCP 4.21 upgrade test entries for Quay versions 3.18, 3.17 (updated image SHA), 3.16, 3.15, 3.14, and 3.13; removed CSO and QBO-specific upgrade test blocks. All changes are confined to the Quay upgrade CI config file. ChangesOCP 4.21 Quay Upgrade Test Matrix
🎯 2 (Simple) | ⏱️ ~8 minutes 🚥 Pre-merge checks | ✅ 12✅ Passed checks (12 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Tip 💬 Introducing Slack Agent: The best way for teams to turn conversations into code.Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.
Built for teams:
One agent for your entire SDLC. Right inside Slack. Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: LiZhang19817 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 |
openshift-ci
Bot
added
the
approved
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
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
`@ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-upgrade.yaml`:
- Line 46: The MULTISTAGE_PARAM_OVERRIDE_QUAY_INDEX_IMAGE variable is pinned to
the same sha256 across multiple versioned jobs, collapsing the version matrix;
update each occurrence of MULTISTAGE_PARAM_OVERRIDE_QUAY_INDEX_IMAGE used for
different upgrade-source jobs (the four entries currently on lines corresponding
to the four versioned jobs) so each versioned index image is pinned to its own
matching digest (or remove the `@sha256` digest if you prefer tag-based selection)
ensuring each job references a distinct catalog image.
🪄 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: 21db2019-6042-45f6-933b-be1ede65b853
⛔ Files ignored due to path filters (1)
ci-operator/jobs/quay/quay-tests/quay-quay-tests-master-periodics.yamlis excluded by!ci-operator/jobs/**
📒 Files selected for processing (1)
ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-upgrade.yaml
…annel from 3.15/3.14 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
|
[REHEARSALNOTIFIER]
Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
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
`@ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-upgrade.yaml`:
- Around line 95-112: The quay315-ocp421-upgrade (and similarly
quay314-ocp421-upgrade) job includes the
quay-tests-resource-provisioning-storage-odf step but omits
ODF_OPERATOR_CHANNEL, causing a silent fallback to the wrong channel; fix by
adding ODF_OPERATOR_CHANNEL: stable-4.21 to the job's env block (the env under
quay315-ocp421-upgrade) so the quay-tests-resource-provisioning-storage-odf step
uses the correct OCP 4.21 channel, or alternatively remove the
quay-tests-resource-provisioning-storage-odf ref from the job if ODF
provisioning isn't needed for these Quay versions.
🪄 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: 759f7096-6756-4044-a29a-b061eca2343f
⛔ Files ignored due to path filters (1)
ci-operator/jobs/quay/quay-tests/quay-quay-tests-master-periodics.yamlis excluded by!ci-operator/jobs/**
📒 Files selected for processing (1)
ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-upgrade.yaml
| - as: quay315-ocp421-upgrade | ||
| cron: '@yearly' | ||
| steps: | ||
| cluster_profile: aws-quay-qe | ||
| env: | ||
| BASE_DOMAIN: quayqe.devcluster.openshift.com | ||
| COMPUTE_NODE_REPLICAS: "6" | ||
| COMPUTE_NODE_TYPE: m6a.8xlarge | ||
| MULTISTAGE_PARAM_OVERRIDE_QUAY_INDEX_IMAGE: quay.io/redhat-user-workloads/quay-eng-tenant/stable-3-15-v4-21@sha256:9229c544bd8f93345c85bdd1facd9bdec9155c883a7476e3d249d304520acc2d | ||
| QUAY_OPERATOR_CHANNEL: stable-3.15 | ||
| QUAY_OPERATOR_SOURCE: fbc-operator-catalog | ||
| QUAY_UPGRADE_TESTCASE: Quay-Upgrade-High|Quay-Upgrade-Medium | ||
| QUAY_VERSION: "3.15" | ||
| test: | ||
| - ref: quay-tests-enable-quay-catalogsource | ||
| - ref: quay-tests-resource-provisioning-storage-odf | ||
| - ref: quay-tests-test-quay-upgrade | ||
| workflow: cucushift-installer-rehearse-aws-ipi |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
# Locate the step definition and check for ODF_OPERATOR_CHANNEL usage
fd -t f 'quay-tests-resource-provisioning-storage-odf' --exec cat {}
rg -n 'ODF_OPERATOR_CHANNEL' --type yaml -C3Repository: openshift/release
Length of output: 50374
ODF_OPERATOR_CHANNEL missing from quay315 and quay314 jobs; will silently fall back to incorrect default.
Both quay315-ocp421-upgrade and quay314-ocp421-upgrade include the quay-tests-resource-provisioning-storage-odf step but omit ODF_OPERATOR_CHANNEL. While the step has a built-in default of stable-4.17, this is mismatched for OCP 4.21. All other jobs in the file explicitly set ODF_OPERATOR_CHANNEL: stable-4.21, and omitting it from these two jobs will cause the ODF operator to deploy an older, incompatible channel without any error or warning.
Either add ODF_OPERATOR_CHANNEL: stable-4.21 to both jobs, or remove the quay-tests-resource-provisioning-storage-odf ref if ODF is not required for these older Quay versions on OCP 4.21.
🛠️ Option A – restore the missing channel variable
- as: quay315-ocp421-upgrade
...
env:
...
MULTISTAGE_PARAM_OVERRIDE_QUAY_INDEX_IMAGE: quay.io/redhat-user-workloads/quay-eng-tenant/stable-3-15-v4-21@sha256:9229c544bd8f93345c85bdd1facd9bdec9155c883a7476e3d249d304520acc2d
+ ODF_OPERATOR_CHANNEL: stable-4.21
QUAY_OPERATOR_CHANNEL: stable-3.15
- as: quay314-ocp421-upgrade
...
env:
...
MULTISTAGE_PARAM_OVERRIDE_QUAY_INDEX_IMAGE: quay.io/redhat-user-workloads/quay-eng-tenant/stable-3-14-v4-21@sha256:3002040ed207ad7b3b9b7ae862a04a082fe17c7e199a8c62163f2dfe09277122
+ ODF_OPERATOR_CHANNEL: stable-4.21
QUAY_OPERATOR_CHANNEL: stable-3.14🛠️ Option B – remove the ODF provisioning step if ODF is not required
- as: quay315-ocp421-upgrade
...
test:
- ref: quay-tests-enable-quay-catalogsource
- - ref: quay-tests-resource-provisioning-storage-odf
- ref: quay-tests-test-quay-upgrade
- as: quay314-ocp421-upgrade
...
test:
- ref: quay-tests-enable-quay-catalogsource
- - ref: quay-tests-resource-provisioning-storage-odf
- ref: quay-tests-test-quay-upgrade📝 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.
| - as: quay315-ocp421-upgrade | |
| cron: '@yearly' | |
| steps: | |
| cluster_profile: aws-quay-qe | |
| env: | |
| BASE_DOMAIN: quayqe.devcluster.openshift.com | |
| COMPUTE_NODE_REPLICAS: "6" | |
| COMPUTE_NODE_TYPE: m6a.8xlarge | |
| MULTISTAGE_PARAM_OVERRIDE_QUAY_INDEX_IMAGE: quay.io/redhat-user-workloads/quay-eng-tenant/stable-3-15-v4-21@sha256:9229c544bd8f93345c85bdd1facd9bdec9155c883a7476e3d249d304520acc2d | |
| QUAY_OPERATOR_CHANNEL: stable-3.15 | |
| QUAY_OPERATOR_SOURCE: fbc-operator-catalog | |
| QUAY_UPGRADE_TESTCASE: Quay-Upgrade-High|Quay-Upgrade-Medium | |
| QUAY_VERSION: "3.15" | |
| test: | |
| - ref: quay-tests-enable-quay-catalogsource | |
| - ref: quay-tests-resource-provisioning-storage-odf | |
| - ref: quay-tests-test-quay-upgrade | |
| workflow: cucushift-installer-rehearse-aws-ipi | |
| - as: quay315-ocp421-upgrade | |
| cron: '@yearly' | |
| steps: | |
| cluster_profile: aws-quay-qe | |
| env: | |
| BASE_DOMAIN: quayqe.devcluster.openshift.com | |
| COMPUTE_NODE_REPLICAS: "6" | |
| COMPUTE_NODE_TYPE: m6a.8xlarge | |
| MULTISTAGE_PARAM_OVERRIDE_QUAY_INDEX_IMAGE: quay.io/redhat-user-workloads/quay-eng-tenant/stable-3-15-v4-21@sha256:9229c544bd8f93345c85bdd1facd9bdec9155c883a7476e3d249d304520acc2d | |
| ODF_OPERATOR_CHANNEL: stable-4.21 | |
| QUAY_OPERATOR_CHANNEL: stable-3.15 | |
| QUAY_OPERATOR_SOURCE: fbc-operator-catalog | |
| QUAY_UPGRADE_TESTCASE: Quay-Upgrade-High|Quay-Upgrade-Medium | |
| QUAY_VERSION: "3.15" | |
| test: | |
| - ref: quay-tests-enable-quay-catalogsource | |
| - ref: quay-tests-resource-provisioning-storage-odf | |
| - ref: quay-tests-test-quay-upgrade | |
| workflow: cucushift-installer-rehearse-aws-ipi |
🤖 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/quay/quay-tests/quay-quay-tests-master__quay-upgrade.yaml`
around lines 95 - 112, The quay315-ocp421-upgrade (and similarly
quay314-ocp421-upgrade) job includes the
quay-tests-resource-provisioning-storage-odf step but omits
ODF_OPERATOR_CHANNEL, causing a silent fallback to the wrong channel; fix by
adding ODF_OPERATOR_CHANNEL: stable-4.21 to the job's env block (the env under
quay315-ocp421-upgrade) so the quay-tests-resource-provisioning-storage-odf step
uses the correct OCP 4.21 channel, or alternatively remove the
quay-tests-resource-provisioning-storage-odf ref from the job if ODF
provisioning isn't needed for these Quay versions.
|
@LiZhang19817: 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. |
1 participant
Summary
quay317-ocp421-upgradefor consistencyTest plan
make update🤖 Generated with Claude Code
Summary by CodeRabbit