From 804d83af30f41a68843b2cce03ef326aa5710e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 13 Aug 2022 11:56:22 +0200 Subject: [PATCH] CI: On CentOS Stream, use EPEL Next, not EPEL proper Also, make sure to never pull from EPEL's Koji repo, as is also exposes RHEL packages in the metadata, but they error 403. [MIRROR] libgcrypt-1.10.0-4.el9_0.x86_64.rpm: Status code: 403 for https://infrastructure.fedoraproject.org/repo/rhel/rhel9/x86_64/rhel-9-for-x86_64-baseos-rpms/Packages/l/libgcrypt-1.10.0-4.el9_0.x86_64.rpm We just pull from the CentOS Stream Koji repo and EPEL Next Koji repo. See the mock config for centos-stream+epel-next-9. Related: rhbz#2117571 --- tests/mocktest.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/mocktest.sh b/tests/mocktest.sh index 2e578cb..08ed838 100755 --- a/tests/mocktest.sh +++ b/tests/mocktest.sh @@ -7,10 +7,12 @@ arch="x86_64" case $NAME in "Fedora Linux"|"Fedora") mock="fedora-${version}-${arch}" + repos="local" ;; "CentOS Stream"|"Red Hat Enterprise Linux") - mock="centos-stream+epel-${version}-${arch}" + mock="centos-stream+epel-next-${version}-${arch}" + repos="local,local-centos-stream" ;; *) @@ -57,8 +59,8 @@ rpmbuild -bs ${pkgname}.spec # build the SRPM in mock res=0 -mock -r $config --enablerepo=local init -mock -r $config --enablerepo=local "$@" ~/rpmbuild/SRPMS/${pkgname}-*.src.rpm || res=$? +mock -r $config --enablerepo="$repos" init +mock -r $config --enablerepo="$repos" "$@" ~/rpmbuild/SRPMS/${pkgname}-*.src.rpm || res=$? # move the results to the artifacts directory, so we can examine them artifacts=${TEST_ARTIFACTS:-/tmp/artifacts}