Skip to content

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

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
sosiouxme wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

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
4 changes: 1 addition & 3 deletions test/e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,7 @@ test_kernel_version() {

# Check that driver-toolkit contains the right kernel-rt version
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

@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.

note that for 5.0 the repo is release-5

Copy link
Copy Markdown
Member

@sdodson sdodson Apr 9, 2026

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

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

@sdodson sdodson Apr 9, 2026

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 •
edited
Loading

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

@sdodson sdodson Apr 9, 2026

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


Expand Down