From 4b0ec931b5990e758829082ac05eae2b37d0d5d8 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Nov 03 2023 21:23:01 +0000 Subject: Move repository replacement to prepare_test_env Local mirror should be used for all tests. Signed-off-by: Georg Pfuetzenreuter --- diff --git a/bin/prepare_test_env.sh b/bin/prepare_test_env.sh index ffc1335..e3a3fb8 100755 --- a/bin/prepare_test_env.sh +++ b/bin/prepare_test_env.sh @@ -57,6 +57,9 @@ if [[ "$INSTANCE" == 'opensuse' ]]; then VIRT_CLUSTER='atreju' fi +sed -i 's/download.opensuse.org/download-prg.infra.opensuse.org/' /etc/zypp/repos.d/* +zypper lr -d + if [ -n "${PKG[@]}" ]; then $SUDO zypper --gpg-auto-import-keys ref $SUDO zypper -qn install --no-recommends ${PKG[@]} diff --git a/bin/test_nginx.sh b/bin/test_nginx.sh index c899400..5f2d590 100755 --- a/bin/test_nginx.sh +++ b/bin/test_nginx.sh @@ -2,10 +2,6 @@ # Validate the salt-generated nginx configs -sed -i 's/download.opensuse.org/download-prg.infra.opensuse.org/' /etc/zypp/repos.d/* - -zypper lr -d - rpm -qa --qf '%{name}\n' | sort > /tmp/packages-before [[ $(whoami) == 'root' ]] || { echo 'Please run this script as root'; exit 1; }