diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be76ec339..aa36365ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -144,7 +144,6 @@ Prepare-rhel-internal: paths: - rhel-${RHEL_MAJOR}.json - rhel${RHEL_MAJOR}internal.repo - - rhel-${RHEL_MAJOR}-beta.json - COMPOSE_ID parallel: matrix: diff --git a/schutzbot/prepare-rhel-internal.sh b/schutzbot/prepare-rhel-internal.sh index efd4b5489..6a29460c1 100755 --- a/schutzbot/prepare-rhel-internal.sh +++ b/schutzbot/prepare-rhel-internal.sh @@ -88,8 +88,6 @@ tee -a rhel-"${VERSION_ID%.*}".json << EOF } EOF -cp rhel-"${VERSION_ID%.*}".json rhel-"${VERSION_ID%.*}"-beta.json - # Create tests .repo file if REPO_URL is provided from ENV # Otherwise osbuild-composer-tests.rpm will be downloaded from # existing repositories diff --git a/test/cases/regression-composer-works-behind-satellite-fallback.sh b/test/cases/regression-composer-works-behind-satellite-fallback.sh index 51f880f58..a1a554407 100644 --- a/test/cases/regression-composer-works-behind-satellite-fallback.sh +++ b/test/cases/regression-composer-works-behind-satellite-fallback.sh @@ -65,14 +65,8 @@ case "${ID}" in 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-${VERSION_SUFFIX}-beta.json" - else - DISTRO_NAME="rhel-8" - REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json" - fi + DISTRO_NAME="rhel-8" + REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json" REPO1_NAME="baseos" REPO2_NAME="appstream" if [ -n "${NIGHTLY:-}" ]; then @@ -84,14 +78,8 @@ case "${ID}" in 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 ".") - if grep beta /etc/os-release; - then - 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 + DISTRO_NAME="rhel-90" + REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json" REPO1_NAME="baseos" REPO2_NAME="appstream" if [ -n "${NIGHTLY:-}" ]; then diff --git a/test/cases/regression-composer-works-behind-satellite.sh b/test/cases/regression-composer-works-behind-satellite.sh index 7930a0ab1..765964b9b 100644 --- a/test/cases/regression-composer-works-behind-satellite.sh +++ b/test/cases/regression-composer-works-behind-satellite.sh @@ -94,14 +94,8 @@ case "${ID}" in 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-${VERSION_SUFFIX}-beta.json" - else - DISTRO_NAME="rhel-8" - REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json" - fi + DISTRO_NAME="rhel-8" + REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json" REPO1_NAME="baseos" REPO2_NAME="appstream" if [ -n "${NIGHTLY:-}" ]; then @@ -113,14 +107,8 @@ case "${ID}" in 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 ".") - if grep beta /etc/os-release; - then - 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 + DISTRO_NAME="rhel-90" + REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json" REPO1_NAME="baseos" REPO2_NAME="appstream" if [ -n "${NIGHTLY:-}" ]; then diff --git a/tools/provision.sh b/tools/provision.sh index 4a94f5e97..6ae5d48d8 100755 --- a/tools/provision.sh +++ b/tools/provision.sh @@ -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-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 VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".") if [ -f "rhel-${VERSION_ID%.*}.json" ]; then sudo cp rhel-"${VERSION_ID%.*}".json "$REPODIR/rhel-${VERSION_SUFFIX}.json" fi - - if [ -f "rhel-${VERSION_ID%.*}-beta.json" ]; then - sudo cp rhel-"${VERSION_ID%.*}"-beta.json "$REPODIR/rhel-${VERSION_SUFFIX}-beta.json" - fi fi # start appropriate units