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

tests: Make Satellite regression tests to use the SUT

Browse source
This commit is contained in:
Alexander Todorov 2022-08-09 15:12:37 +03:00 • committed by Alexander Todorov
parent 860b122f2c
commit d3dde77a6f
2 changed files with 4 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

17
test/cases/regression-composer-works-behind-satellite-fallback.sh
View file

@ -61,24 +61,11 @@ case "${ID}" in
"rhel") "rhel")
echo "Running on RHEL" echo "Running on RHEL"
case "${VERSION_ID%.*}" in case "${VERSION_ID%.*}" in
"8" ) "8" | "9")
echo "Running on RHEL ${VERSION_ID}" echo "Running on RHEL ${VERSION_ID}"
# starting in 8.5 the override file contains minor version number as well # starting in 8.5 the override file contains minor version number as well
VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".") VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
DISTRO_NAME="rhel-8" DISTRO_NAME="rhel-${VERSION_SUFFIX}"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
REPO1_NAME="baseos"
REPO2_NAME="appstream"
if [ -n "${NIGHTLY:-}" ]; then
REPO1_NAME="baseos-${ARCH}"
REPO2_NAME="appstream-${ARCH}"
fi
;;
"9" )
echo "Running on RHEL ${VERSION_ID}"
# in 9.0 the override file contains minor version number as well
VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
DISTRO_NAME="rhel-90"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json" REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
REPO1_NAME="baseos" REPO1_NAME="baseos"
REPO2_NAME="appstream" REPO2_NAME="appstream"

17
test/cases/regression-composer-works-behind-satellite.sh
View file

@ -90,24 +90,11 @@ case "${ID}" in
"rhel") "rhel")
echo "Running on RHEL" echo "Running on RHEL"
case "${VERSION_ID%.*}" in case "${VERSION_ID%.*}" in
"8" ) "8" | "9")
echo "Running on RHEL ${VERSION_ID}" echo "Running on RHEL ${VERSION_ID}"
# starting in 8.5 the override file contains minor version number as well # starting in 8.5 the override file contains minor version number as well
VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".") VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
DISTRO_NAME="rhel-8" DISTRO_NAME="rhel-${VERSION_SUFFIX}"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
REPO1_NAME="baseos"
REPO2_NAME="appstream"
if [ -n "${NIGHTLY:-}" ]; then
REPO1_NAME="baseos-${ARCH}"
REPO2_NAME="appstream-${ARCH}"
fi
;;
"9" )
echo "Running on RHEL ${VERSION_ID}"
# in 9.0 the override file contains minor version number as well
VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
DISTRO_NAME="rhel-90"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json" REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
REPO1_NAME="baseos" REPO1_NAME="baseos"
REPO2_NAME="appstream" REPO2_NAME="appstream"