Skip to content

USHIFT-4882: Bootc published image standard tests can now use public registry when available #4703

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
merged 1 commit into from
Mar 21, 2025
Merged

USHIFT-4882: Bootc published image standard tests can now use public registry when available #4703

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
13 changes: 5 additions & 8 deletions test/scenarios-bootc/periodics/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,20 @@ scenario_create_vms() {
exit 0
fi

local bootc_spec
if [[ "${CURRENT_RELEASE_REPO}" == http* ]] ; then
# Discover a pre-release MicroShift bootc image reference on the mirror
local -r mirror_url="$(dirname "${CURRENT_RELEASE_REPO}")/bootc-pullspec.txt"
local -r bootc_spec="$(curl -s "${mirror_url}")"

bootc_spec="$(curl -s "${mirror_url}")"
if [ -z "${bootc_spec}" ] || [[ "${bootc_spec}" != quay.io/openshift* ]] ; then
echo "ERROR: Failed to retrieve a bootc pull spec from '${mirror_url}'"
exit 1
fi
else
# Discover a released MicroShift bootc image reference in public registry.
#
# TODO: When the current release is updated to 'rhocp', this test will
# generate an error and will need to be updated to discover the public
# MicroShift bootc image references.
echo "ERROR: Code for detecting the released bootc images is missing"
exit 1
# Use the latest released MicroShift bootc image reference in public
# registry for the current minor version
bootc_spec="registry.redhat.io/openshift4/microshift-bootc-rhel9:v4.${MINOR_VERSION}"
fi

prepare_kickstart host1 kickstart-bootc.ks.template "${bootc_spec}"
Expand Down
20 changes: 9 additions & 11 deletions test/scenarios-bootc/periodics/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,24 @@ IMAGE_SIGSTORE_ENABLED=true

scenario_create_vms() {
if [[ "${CURRENT_RELEASE_REPO}" == "" ]] ; then
# TODO: While 4.19-ec is not available, it needs to exit without an error.
# Empty string means there's no EC build yet, so the test needs to be skipped.
Copy link
Member

Choose a reason for hiding this comment

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

I think that eventually it would be nice to have some report of skipped tests so they're not hidden away.

exit 0
fi

local bootc_spec
if [[ "${CURRENT_RELEASE_REPO}" == http* ]] ; then
# Discover a pre-release MicroShift bootc image reference on the mirror
local -r mirror_url="$(dirname "${CURRENT_RELEASE_REPO}")/bootc-pullspec.txt"
local -r bootc_spec="$(curl -s "${mirror_url}")"

bootc_spec="$(curl -s "${mirror_url}")"
if [ -z "${bootc_spec}" ] || [[ "${bootc_spec}" != quay.io/openshift* ]] ; then
echo "ERROR: Failed to retrieve a bootc pull spec from '${mirror_url}'"
exit 1
fi
else
# Discover a released MicroShift bootc image reference in public registry.
#
# TODO: When the current release is updated to 'rhocp', this test will
# generate an error and will need to be updated to discover the public
# MicroShift bootc image references.
echo "ERROR: Code for detecting the released bootc images is missing"
exit 1
# Use the latest released MicroShift bootc image reference in public
# registry for the current minor version
bootc_spec="registry.redhat.io/openshift4/microshift-bootc-rhel9:v4.${MINOR_VERSION}"
fi

prepare_kickstart host1 kickstart-bootc.ks.template "${bootc_spec}"
Expand All @@ -43,15 +41,15 @@ scenario_create_vms() {

scenario_remove_vms() {
if [[ "${CURRENT_RELEASE_REPO}" == "" ]] ; then
# TODO: While 4.19-ec is not available, it needs to exit without an error.
# Empty string means there's no EC build yet, so the test needs to be skipped.
exit 0
fi
remove_vm host1
}

scenario_run_tests() {
if [[ "${CURRENT_RELEASE_REPO}" == "" ]] ; then
# TODO: While 4.19-ec is not available, it needs to exit without an error.
# Empty string means there's no EC build yet, so the test needs to be skipped.
exit 0
fi
# Until 4.19 EC starts including correct default config,
Expand Down