From f19f8df6bfd24fff0adcccfc0c8cd81a88b33640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zachar?= Date: Tue, 2 Jul 2024 10:59:35 +0200 Subject: [PATCH 1/5] Use vault.centos for centos-7 image repos mirror/baseurl used in the image are gone now --- containers/centos/7/Containerfile.upstream | 1 + 1 file changed, 1 insertion(+) diff --git a/containers/centos/7/Containerfile.upstream b/containers/centos/7/Containerfile.upstream index 6d0c8f1f4c..f6b553a996 100644 --- a/containers/centos/7/Containerfile.upstream +++ b/containers/centos/7/Containerfile.upstream @@ -5,6 +5,7 @@ # FROM quay.io/centos/centos:7 +RUN cd /etc/yum.repos.d/ && sed '/mirrorlist/d' -i *repo && sed 's|#baseurl=http://mirror.centos.org/centos/$releasever|baseurl=https://vault.centos.org/7.9.2009|' -i *repo # Populate yum cache RUN yum makecache From 46e77b292b6732fd2afabc243e5e7f214fb062b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zachar?= Date: Tue, 2 Jul 2024 11:20:26 +0200 Subject: [PATCH 2/5] Use own local container images --- tests/prepare/require/test.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/prepare/require/test.sh b/tests/prepare/require/test.sh index 0c64bcf389..368705d13a 100755 --- a/tests/prepare/require/test.sh +++ b/tests/prepare/require/test.sh @@ -1,16 +1,24 @@ #!/bin/bash . /usr/share/beakerlib/beakerlib.sh || exit 1 +. ../../images.sh || exit 1 + +PROVISION_HOW=container rlJournalStart rlPhaseStartSetup + + build_container_image "centos/7/upstream\:latest" + build_container_image "fedora/40:\latest" + rlRun "pushd data" rlRun "set -o pipefail" rlPhaseEnd - for image in fedora centos:7 ; do + for image in $TEST_IMAGE_PREFIX/fedora/40:latest \ + $TEST_IMAGE_PREFIX/centos/7/upstream:latest; do # Prepare the tmt command and expected error message - tmt="tmt run -avr provision -h container -i $image" - if [[ $image == fedora ]]; then + tmt="tmt run -avr provision -h $PROVISION_HOW -i $image" + if [[ $image =~ fedora ]]; then error='Unable to find a match: forest' else error='No package forest available' From 523923a4c83d0bee5e105bf791aabe5f48998593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zachar?= Date: Tue, 2 Jul 2024 11:25:00 +0200 Subject: [PATCH 3/5] Skip centos-7 image in tests/prepare/install Until repofile is fixed --- tests/prepare/install/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/prepare/install/test.sh b/tests/prepare/install/test.sh index ae927222bb..8071de08e5 100755 --- a/tests/prepare/install/test.sh +++ b/tests/prepare/install/test.sh @@ -16,10 +16,10 @@ $TEST_IMAGE_PREFIX/fedora/coreos:stable $TEST_IMAGE_PREFIX/fedora/coreos/ostree:stable}" # TODO: enable Ubuntu +# TODO: enable centos-7 again with modified repo files) VIRTUAL_IMAGES="${VIRTUAL_IMAGES:-fedora-rawhide fedora-39 centos-stream-9 -centos-7 fedora-coreos}" # A couple of "is image this?" helpers, to simplify conditions. From aae163d7b6aff04bdcae3ac477c6b1e30a43052e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zachar?= Date: Tue, 2 Jul 2024 11:29:45 +0200 Subject: [PATCH 4/5] squash: Add comments --- containers/centos/7/Containerfile.upstream | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/containers/centos/7/Containerfile.upstream b/containers/centos/7/Containerfile.upstream index f6b553a996..bcc8a9d415 100644 --- a/containers/centos/7/Containerfile.upstream +++ b/containers/centos/7/Containerfile.upstream @@ -5,7 +5,11 @@ # FROM quay.io/centos/centos:7 -RUN cd /etc/yum.repos.d/ && sed '/mirrorlist/d' -i *repo && sed 's|#baseurl=http://mirror.centos.org/centos/$releasever|baseurl=https://vault.centos.org/7.9.2009|' -i *repo + +# Use latest vault repos, mirrors are gone after centos EOL +RUN cd /etc/yum.repos.d/ \ + && sed '/mirrorlist/d' -i *repo \ + && sed 's|#baseurl=http://mirror.centos.org/centos/$releasever|baseurl=https://vault.centos.org/7.9.2009|' -i *repo # Populate yum cache RUN yum makecache From 95e706155a9d8185af89c097c539fc31fae7ff91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= Date: Tue, 2 Jul 2024 12:59:45 +0200 Subject: [PATCH 5/5] squash: Update tests/prepare/require/test.sh --- tests/prepare/require/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/prepare/require/test.sh b/tests/prepare/require/test.sh index 368705d13a..843daef073 100755 --- a/tests/prepare/require/test.sh +++ b/tests/prepare/require/test.sh @@ -19,7 +19,7 @@ rlJournalStart # Prepare the tmt command and expected error message tmt="tmt run -avr provision -h $PROVISION_HOW -i $image" if [[ $image =~ fedora ]]; then - error='Unable to find a match: forest' + error='No match for argument: forest' else error='No package forest available' fi