Skip to content

test/e2e: always use correct release pull spec in RELEASE_IMAGE_LATEST#188

Open
sosiouxme wants to merge 1 commit intoopenshift:masterfrom
sosiouxme:20260408-5.0-pullspec
Open

test/e2e: always use correct release pull spec in RELEASE_IMAGE_LATEST#188
sosiouxme wants to merge 1 commit intoopenshift:masterfrom
sosiouxme:20260408-5.0-pullspec

Conversation

@sosiouxme
Copy link
Copy Markdown
Member

with 5.0 the release repo changed; ci-operator should always supply the correct one in this var.

with 5.0 the release repo changed; ci-operator should always supply the
correct one in this var.
@openshift-ci openshift-ci Bot requested review from bthurber and pericnenad April 8, 2026 21:27
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Apr 8, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: fd6228f3-1d14-4861-a21e-97f557116dad

📥 Commits

Reviewing files that changed from the base of the PR and between 7aa4007 and f8f3317.

📒 Files selected for processing (1)
  • test/e2e

Walkthrough

The test_kernel_rt_version function is modified to retrieve the OCP release image reference from the RELEASE_IMAGE_LATEST environment variable instead of dynamically querying the cluster's desired OCP version. The test logic and validation flow remain unchanged.

Changes

Cohort / File(s) Summary
Test Runtime Version Check
test/e2e/...*
Modified test_kernel_rt_version to use RELEASE_IMAGE_LATEST environment variable for obtaining OCP release reference, replacing dynamic cluster query logic.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 8, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: sosiouxme
Once this PR has been reviewed and has the lgtm label, please assign enriquebelarte for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sosiouxme
Copy link
Copy Markdown
Member Author

/retest-required

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 9, 2026

@sosiouxme: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws f8f3317 link true /test e2e-aws
ci/prow/e2e-upgrade f8f3317 link true /test e2e-upgrade
ci/prow/verify-image-content-dtk-for-rhel-10 f8f3317 link true /test verify-image-content-dtk-for-rhel-10
ci/prow/images f8f3317 link true /test images

Full PR test history. Your PR dashboard.

Details

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 kubernetes-sigs/prow repository. I understand the commands that are listed here.

Comment thread test/e2e
rhel_coreos_extensions_image=$(oc adm release info registry.ci.openshift.org/ocp/release:${ocp_version} \
rhel_coreos_extensions_image=$(oc adm release info "${RELEASE_IMAGE_LATEST}" \
--registry-config "${CLUSTER_PROFILE_DIR}/pull-secret" \
--image-for=rhel-coreos-extensions)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
--image-for=rhel-coreos-extensions)
--image-for=rhel-coreos-10-extensions)

Is probably what would work as a quick hack on 5.0. Still a hack but a bit more complete would be to check both rhel-coreos-extensions and rhel-coreos-10-extensions image and if one of those has kernel packages that match the node then assume we're good enough.

Still that's naive and will need to be updated, we don't want to accept a payload that's got rhel9 content aligned but rhel10 ouf of sync.

Copy link
Copy Markdown
Member Author

@sosiouxme sosiouxme Apr 9, 2026

Choose a reason for hiding this comment

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

main will forward to 5.0 and 4.23 until those branch, so the code probably has to handle both. perhaps there is / could be another env var to provide the coreos major version.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Both 5.0 and 4.23 will have at least rhel-coreos-extensions and rhel-coreos-10-extensions so checking both for a match should be OK

Comment thread test/e2e
test_kernel_rt_version() {
ocp_version=$(oc get clusterversion -o json | jq -r '.items[0].status.desired.version')

rhel_coreos_extensions_image=$(oc adm release info registry.ci.openshift.org/ocp/release:${ocp_version} \
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

note that for 5.0 the repo is release-5

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

lets use the actual image, AFAIK this should always be populated.

oc get clusterversion -o json | jq -r '.items[0].status.desired.image'
quay.io/openshift-release-dev/ocp-release@sha256:9b7068aa6f6087c2f0a7cefa241c5dbb0ede0efaad783607dff0da98cac432d2

@ybettan
Copy link
Copy Markdown
Member

ybettan commented Apr 12, 2026

/hold
If you are OK with it, let's have the job optional for now until DTK is adapted to multi-stream.
We can fix the job once the DTK image is updated #180

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 12, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants