Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions test/bin/scenario.sh
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ sos_report_for_vm_offline() {

get_lrel_release_image_url() {
local -r brew_lrel_release_version="$1"
local -r rhel_version="${2:-9}"
local image_url=""

# Strip the rpm release suffix and convert tilde to dash.
Expand All @@ -327,7 +328,7 @@ get_lrel_release_image_url() {

if [ -n "${mirror_path}" ]; then
if ! image_url="$(curl -fsS --retry 3 \
"https://mirror.openshift.com/pub/openshift-v4/${UNAME_M}/microshift/${mirror_path}/${release_version}/el9/bootc-pullspec.txt")"; then
"https://mirror.openshift.com/pub/openshift-v4/${UNAME_M}/microshift/${mirror_path}/${release_version}/el${rhel_version}/bootc-pullspec.txt")"; then
image_url=""
fi
echo "${image_url}"
Expand All @@ -343,7 +344,7 @@ get_lrel_release_image_url() {
fi

# Resolve the arch-specific digest from both registries
local -r image_path="openshift4/microshift-bootc-rhel9"
local -r image_path="openshift4/microshift-bootc-rhel${rhel_version}"
local -r image_tag="v${release_version}"
local -r prod_registry="registry.redhat.io"
local -r stage_registry="registry.stage.redhat.io"
Expand Down
1 change: 1 addition & 0 deletions test/package-sources/fast-datapath-rhel9.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ type = "yum-baseurl"
url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/fast-datapath/os"
check_gpg = true
check_ssl = true
gpgkeys = ["file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"]
system = false
rhsm = true
1 change: 1 addition & 0 deletions test/package-sources/rhocp-y.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ type = "yum-baseurl"
url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.RHOCP_MINOR_Y }}/os"
check_gpg = true
check_ssl = true
gpgkeys = ["file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"]
system = false
rhsm = true
{{- else if env.Getenv "RHOCP_MINOR_Y_BETA" "" -}}
Expand Down
1 change: 1 addition & 0 deletions test/package-sources/rhocp-y1.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ type = "yum-baseurl"
url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.RHOCP_MINOR_Y1 }}/os"
check_gpg = true
check_ssl = true
gpgkeys = ["file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"]
system = false
rhsm = true
{{- else if env.Getenv "RHOCP_MINOR_Y1_BETA" "" -}}
Expand Down
1 change: 1 addition & 0 deletions test/package-sources/rhocp-y2.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ type = "yum-baseurl"
url = "https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.RHOCP_MINOR_Y2 }}/os"
check_gpg = true
check_ssl = true
gpgkeys = ["file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"]
system = false
rhsm = true
{{- end -}}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# shellcheck disable=SC2034 # used elsewhere
IMAGE_SIGSTORE_ENABLED=true

LATEST_RELEASE_IMAGE_URL="$(get_lrel_release_image_url "${BREW_LREL_RELEASE_VERSION}")"
LATEST_RELEASE_IMAGE_URL="$(get_lrel_release_image_url "${BREW_LREL_RELEASE_VERSION}" 10)"

scenario_create_vms() {
exit_if_image_not_set "${LATEST_RELEASE_IMAGE_URL}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# shellcheck disable=SC2034 # used elsewhere
IMAGE_SIGSTORE_ENABLED=true

LATEST_RELEASE_IMAGE_URL="$(get_lrel_release_image_url "${BREW_LREL_RELEASE_VERSION}")"
LATEST_RELEASE_IMAGE_URL="$(get_lrel_release_image_url "${BREW_LREL_RELEASE_VERSION}" 10)"

scenario_create_vms() {
exit_if_image_not_set "${LATEST_RELEASE_IMAGE_URL}"
Expand Down