particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test/cases: Additional migration updates

Browse source 
Mostly addressing comments from review.
This commit is contained in:
Jakub Rusz 2023-11-24 10:58:04 +01:00 • committed by Jakub Rusz
parent 5cbc87eade
commit 4050aa92fe
7 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/cases/cross-distro.sh
View file

@ -109,9 +109,9 @@ fi
ALL_DISTROS=$(find "$REPO_PATH" -name '*.json' -printf '%P\n' | awk -F "." '{ print $1 }') ALL_DISTROS=$(find "$REPO_PATH" -name '*.json' -printf '%P\n' | awk -F "." '{ print $1 }')
ALL_EXPECTED_DISTROS=$(echo "$ALL_DISTROS" | grep -E "$PATTERN" | grep -Ev 'beta|stream' | sort) ALL_EXPECTED_DISTROS=$(echo "$ALL_DISTROS" | grep -E "$PATTERN" | grep -Ev 'beta|stream' | sort)
# Warning: filter out the remaining distros by matching whole words to avoid matching # Warning: filter out the remaining distros by matching whole words to avoid matching
# the value rhel-93 by the pattern rhel-9! # the value rhel-9X by the pattern rhel-9!
# If we're running on a RHEL 9.3 osbuild-composer doesn't know anything about 9.4 # If we're running on a RHEL 9.X osbuild-composer doesn't know anything about 9.X+1
# images so the value rhel-9.4 should be treated as unrecognized and error out as # images so the value rhel-9.X+1 should be treated as unrecognized and error out as
# expected in the test snippet further below # expected in the test snippet further below
ALL_REMAINDERS=$(echo "$ALL_DISTROS" | grep -vw "$RECOGNIZED_DISTROS") ALL_REMAINDERS=$(echo "$ALL_DISTROS" | grep -vw "$RECOGNIZED_DISTROS")

4
test/cases/koji.sh
View file

@ -352,9 +352,9 @@ koji --server="${KOJI_HUB_URL}" --user kojiadmin --password kojipass --authtype=
# Always build the latest RHEL - that suits the koji API usecase the most. # Always build the latest RHEL - that suits the koji API usecase the most.
if [[ "$DISTRO_CODE" == rhel-8* ]]; then if [[ "$DISTRO_CODE" == rhel-8* ]]; then
DISTRO_CODE=rhel-89 DISTRO_CODE=rhel-810
elif [[ "$DISTRO_CODE" == rhel-9* ]]; then elif [[ "$DISTRO_CODE" == rhel-9* ]]; then
DISTRO_CODE=rhel-93 DISTRO_CODE=rhel-94
fi fi
case ${TEST_TYPE} in case ${TEST_TYPE} in

4
test/cases/minimal-raw.sh
View file

@ -86,10 +86,10 @@ SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
EDGE_USER_PASSWORD=foobar EDGE_USER_PASSWORD=foobar
case "${ID}-${VERSION_ID}" in case "${ID}-${VERSION_ID}" in
"rhel-8.10") "rhel-8."*)
OS_VARIANT="rhel8-unknown" OS_VARIANT="rhel8-unknown"
;; ;;
"rhel-9.4") "rhel-9."*)
OS_VARIANT="rhel9-unknown" OS_VARIANT="rhel9-unknown"
;; ;;
"centos-8") "centos-8")

2
test/cases/oscap.sh
View file

@ -12,7 +12,7 @@ source /etc/os-release
source /usr/libexec/tests/osbuild-composer/shared_lib.sh source /usr/libexec/tests/osbuild-composer/shared_lib.sh
# workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660 # workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660
if [[ "$VERSION_ID" == "9.4" || "$VERSION_ID" == "9" ]]; then if [[ "$VERSION_ID" == "9.3" || "$VERSION_ID" == "9" ]]; then
sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null
LIBVIRTD_ARGS= LIBVIRTD_ARGS=
EOF EOF

2
test/cases/ostree-ami-image.sh
View file

@ -80,7 +80,7 @@ SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
IGNITION_USER=core IGNITION_USER=core
case "${ID}-${VERSION_ID}" in case "${ID}-${VERSION_ID}" in
"rhel-9.4") "rhel-9."*)
OSTREE_REF="rhel/9/${ARCH}/edge" OSTREE_REF="rhel/9/${ARCH}/edge"
SYSROOT_RO="true" SYSROOT_RO="true"
;; ;;

2
test/cases/ostree-ignition.sh
View file

@ -116,7 +116,7 @@ IGNITION_USER_PASSWORD=foobar
SYSROOT_RO="true" SYSROOT_RO="true"
case "${ID}-${VERSION_ID}" in case "${ID}-${VERSION_ID}" in
"rhel-9.4") "rhel-9."*)
OSTREE_REF="rhel/9/${ARCH}/edge" OSTREE_REF="rhel/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown" OS_VARIANT="rhel9-unknown"
;; ;;

2
test/cases/ostree-pulp.sh
View file

@ -15,7 +15,7 @@ fi
# Set os-variant and boot location used by virt-install. # Set os-variant and boot location used by virt-install.
case "${ID}-${VERSION_ID}" in case "${ID}-${VERSION_ID}" in
"rhel-9.4") "rhel-9."*)
IMAGE_TYPE=edge-commit IMAGE_TYPE=edge-commit
OSTREE_REF="rhel/9/${ARCH}/edge" OSTREE_REF="rhel/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown" OS_VARIANT="rhel9-unknown"