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

tests: Remove useless JSON file overrides

Browse source 
See comment
https://github.com/osbuild/osbuild-composer/pull/2881/files#r940065803

for explanation why
This commit is contained in:
Alexander Todorov 2022-08-05 11:10:55 +03:00 • committed by Alexander Todorov
parent df22e8b686
commit 860b122f2c
5 changed files with 8 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.yml
View file

@ -144,7 +144,6 @@ Prepare-rhel-internal:
paths: paths:
- rhel-${RHEL_MAJOR}.json - rhel-${RHEL_MAJOR}.json
- rhel${RHEL_MAJOR}internal.repo - rhel${RHEL_MAJOR}internal.repo
- rhel-${RHEL_MAJOR}-beta.json
- COMPOSE_ID - COMPOSE_ID
parallel: parallel:
matrix: matrix:

2
schutzbot/prepare-rhel-internal.sh
View file

@ -88,8 +88,6 @@ tee -a rhel-"${VERSION_ID%.*}".json << EOF
} }
EOF EOF
cp rhel-"${VERSION_ID%.*}".json rhel-"${VERSION_ID%.*}"-beta.json
# Create tests .repo file if REPO_URL is provided from ENV # Create tests .repo file if REPO_URL is provided from ENV
# Otherwise osbuild-composer-tests.rpm will be downloaded from # Otherwise osbuild-composer-tests.rpm will be downloaded from
# existing repositories # existing repositories

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

@ -65,14 +65,8 @@ case "${ID}" in
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 ".")
if grep beta /etc/os-release; DISTRO_NAME="rhel-8"
then REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
DISTRO_NAME="rhel-8-beta"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}-beta.json"
else
DISTRO_NAME="rhel-8"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
fi
REPO1_NAME="baseos" REPO1_NAME="baseos"
REPO2_NAME="appstream" REPO2_NAME="appstream"
if [ -n "${NIGHTLY:-}" ]; then if [ -n "${NIGHTLY:-}" ]; then
@ -84,14 +78,8 @@ case "${ID}" in
echo "Running on RHEL ${VERSION_ID}" echo "Running on RHEL ${VERSION_ID}"
# in 9.0 the override file contains minor version number as well # in 9.0 the override file contains minor version number as well
VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".") VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
if grep beta /etc/os-release; DISTRO_NAME="rhel-90"
then REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
DISTRO_NAME="rhel-90-beta"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}-beta.json"
else
DISTRO_NAME="rhel-90"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
fi
REPO1_NAME="baseos" REPO1_NAME="baseos"
REPO2_NAME="appstream" REPO2_NAME="appstream"
if [ -n "${NIGHTLY:-}" ]; then if [ -n "${NIGHTLY:-}" ]; then

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

@ -94,14 +94,8 @@ case "${ID}" in
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 ".")
if grep beta /etc/os-release; DISTRO_NAME="rhel-8"
then REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
DISTRO_NAME="rhel-8-beta"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}-beta.json"
else
DISTRO_NAME="rhel-8"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
fi
REPO1_NAME="baseos" REPO1_NAME="baseos"
REPO2_NAME="appstream" REPO2_NAME="appstream"
if [ -n "${NIGHTLY:-}" ]; then if [ -n "${NIGHTLY:-}" ]; then
@ -113,14 +107,8 @@ case "${ID}" in
echo "Running on RHEL ${VERSION_ID}" echo "Running on RHEL ${VERSION_ID}"
# in 9.0 the override file contains minor version number as well # in 9.0 the override file contains minor version number as well
VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".") VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
if grep beta /etc/os-release; DISTRO_NAME="rhel-90"
then REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
DISTRO_NAME="rhel-90-beta"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}-beta.json"
else
DISTRO_NAME="rhel-90"
REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
fi
REPO1_NAME="baseos" REPO1_NAME="baseos"
REPO2_NAME="appstream" REPO2_NAME="appstream"
if [ -n "${NIGHTLY:-}" ]; then if [ -n "${NIGHTLY:-}" ]; then

21
tools/provision.sh
View file

@ -141,32 +141,11 @@ else # AUTH_METHOD_NONE
sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-90.json "$REPODIR" sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-90.json "$REPODIR"
sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-91.json "$REPODIR" sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-91.json "$REPODIR"
# RHEL nightly repos need to be overridden
case "${ID}-${VERSION_ID}" in
"rhel-8.6")
# Override old rhel-8.json and rhel-8-beta.json because RHEL 8.6 test needs nightly repos
sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-86.json "$REPODIR/rhel-8.json"
# If multiple tests are run and call provision.sh the symlink will need to be overridden with -f
sudo ln -sf /etc/osbuild-composer/repositories/rhel-8.json "$REPODIR/rhel-8-beta.json"
;;
"rhel-9.0")
# Override old rhel-90.json and rhel-90-beta.json because RHEL 9.0 test needs nightly repos
sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-90.json "$REPODIR/rhel-90.json"
# If multiple tests are run and call provision.sh the symlink will need to be overridden with -f
sudo ln -sf /etc/osbuild-composer/repositories/rhel-90.json "$REPODIR/rhel-90-beta.json"
;;
*) ;;
esac
# overrides for RHEL nightly builds testing # overrides for RHEL nightly builds testing
VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".") VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
if [ -f "rhel-${VERSION_ID%.*}.json" ]; then if [ -f "rhel-${VERSION_ID%.*}.json" ]; then
sudo cp rhel-"${VERSION_ID%.*}".json "$REPODIR/rhel-${VERSION_SUFFIX}.json" sudo cp rhel-"${VERSION_ID%.*}".json "$REPODIR/rhel-${VERSION_SUFFIX}.json"
fi fi
if [ -f "rhel-${VERSION_ID%.*}-beta.json" ]; then
sudo cp rhel-"${VERSION_ID%.*}"-beta.json "$REPODIR/rhel-${VERSION_SUFFIX}-beta.json"
fi
fi fi
# start appropriate units # start appropriate units