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

tests: Override filename contains minor version number

Browse source
This commit is contained in:
Alexander Todorov 2021-08-31 11:24:22 +03:00 • committed by Alexander Todorov
parent 44c25b7a87
commit 38bb690e87
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,14 +65,16 @@ case "${ID}" in
echo "Running on RHEL"
case "${VERSION_ID%.*}" in
"8" )
echo "Running on RHEL 8"
echo "Running on RHEL ${VERSION_ID}"
# starting in 8.5 the override file contains minor version number as well
VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
if grep beta /etc/os-release;
then
DISTRO_NAME="rhel-8-beta"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-8-beta.json"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}-beta.json"
else
DISTRO_NAME="rhel-8"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-8.json"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
fi
REPO1_NAME="baseos"
REPO2_NAME="appstream"

5
tools/provision.sh
View file

@ -85,12 +85,13 @@ case "${ID}-${VERSION_ID}" in
esac
# overrides for RHEL nightly builds testing
VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
if [ -f "rhel-8.json" ]; then
sudo cp rhel-8.json "$REPODIR"
sudo cp rhel-8.json "$REPODIR/rhel-${VERSION_SUFFIX}.json"
fi
if [ -f "rhel-8-beta.json" ]; then
sudo cp rhel-8-beta.json "$REPODIR"
sudo cp rhel-8-beta.json "$REPODIR/rhel-${VERSION_SUFFIX}-beta.json"
fi
# Generate all X.509 certificates for the tests