test: use new canonical image type names in tests

This commit is contained in:
Achilleas Koutsou 2022-09-19 16:52:47 +02:00 committed by Ondřej Budai
parent cdfd305e0f
commit 1d121126b0
3 changed files with 7 additions and 7 deletions

View file

@ -93,8 +93,8 @@ SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
case "${ID}-${VERSION_ID}" in
"fedora-"*)
CONTAINER_TYPE=fedora-iot-container
INSTALLER_TYPE=fedora-iot-installer
CONTAINER_TYPE=iot-container
INSTALLER_TYPE=iot-installer
OSTREE_REF="fedora/${VERSION_ID}/${ARCH}/iot"
OSTREE_OSNAME=fedora
OS_VARIANT="fedora-unknown"

View file

@ -102,8 +102,8 @@ case "${ID}-${VERSION_ID}" in
OS_VARIANT="centos-stream9"
;;
"fedora-"*)
CONTAINER_TYPE=fedora-iot-container
RAW_IMAGE_TYPE=fedora-iot-raw-image
CONTAINER_TYPE=iot-container
RAW_IMAGE_TYPE=iot-raw-image
OSTREE_REF="fedora/${VERSION_ID}/${ARCH}/iot"
OS_VARIANT="fedora-unknown"
OSTREE_OSNAME="fedora-iot"

View file

@ -16,7 +16,7 @@ fi
# Set os-variant and boot location used by virt-install.
case "${ID}-${VERSION_ID}" in
"fedora-35")
IMAGE_TYPE=fedora-iot-commit
IMAGE_TYPE=iot-commit
OSTREE_REF="fedora/35/${ARCH}/iot"
OS_VARIANT="fedora35"
USER_IN_COMMIT="false"
@ -24,7 +24,7 @@ case "${ID}-${VERSION_ID}" in
EMBEDED_CONTAINER="false"
;;
"fedora-36")
IMAGE_TYPE=fedora-iot-commit
IMAGE_TYPE=iot-commit
OSTREE_REF="fedora/36/${ARCH}/iot"
OS_VARIANT="fedora36"
USER_IN_COMMIT="false"
@ -32,7 +32,7 @@ case "${ID}-${VERSION_ID}" in
EMBEDED_CONTAINER="false"
;;
"fedora-37")
IMAGE_TYPE=fedora-iot-commit
IMAGE_TYPE=iot-commit
OSTREE_REF="fedora/37/${ARCH}/iot"
OS_VARIANT="fedora-unknown"
USER_IN_COMMIT="false"