From 67c5f91ea40cfad564fa30988742fccca38b0a46 Mon Sep 17 00:00:00 2001
From: Jakub Rusz <jrusz@redhat.com>
Date: Fri, 25 Feb 2022 13:26:57 +0100
Subject: [PATCH] mockbuild: use public EPEL-9

---
 .../centos-stream-9-aarch64.cfg               |  5 --
 .../centos-stream-9-ppc64le.cfg               |  5 --
 .../centos-stream-9-s390x.cfg                 |  5 --
 .../centos-stream-9-x86_64.cfg                |  5 --
 .../templates/centos-stream-9.tpl             | 86 -------------------
 schutzbot/mockbuild.sh                        | 10 +--
 6 files changed, 2 insertions(+), 114 deletions(-)
 delete mode 100644 schutzbot/el9-mock-configs/centos-stream-9-aarch64.cfg
 delete mode 100644 schutzbot/el9-mock-configs/centos-stream-9-ppc64le.cfg
 delete mode 100644 schutzbot/el9-mock-configs/centos-stream-9-s390x.cfg
 delete mode 100644 schutzbot/el9-mock-configs/centos-stream-9-x86_64.cfg
 delete mode 100644 schutzbot/el9-mock-configs/templates/centos-stream-9.tpl

diff --git a/schutzbot/el9-mock-configs/centos-stream-9-aarch64.cfg b/schutzbot/el9-mock-configs/centos-stream-9-aarch64.cfg
deleted file mode 100644
index fc5121b76..000000000
--- a/schutzbot/el9-mock-configs/centos-stream-9-aarch64.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-include('templates/centos-stream-9.tpl')
-
-config_opts['root'] = 'centos-stream-9-aarch64'
-config_opts['target_arch'] = 'aarch64'
-config_opts['legal_host_arches'] = ('aarch64',)
diff --git a/schutzbot/el9-mock-configs/centos-stream-9-ppc64le.cfg b/schutzbot/el9-mock-configs/centos-stream-9-ppc64le.cfg
deleted file mode 100644
index 746484377..000000000
--- a/schutzbot/el9-mock-configs/centos-stream-9-ppc64le.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-include('templates/centos-stream-9.tpl')
-
-config_opts['root'] = 'centos-stream-9-ppc64le'
-config_opts['target_arch'] = 'ppc64le'
-config_opts['legal_host_arches'] = ('ppc64le',)
diff --git a/schutzbot/el9-mock-configs/centos-stream-9-s390x.cfg b/schutzbot/el9-mock-configs/centos-stream-9-s390x.cfg
deleted file mode 100644
index 21ca5c262..000000000
--- a/schutzbot/el9-mock-configs/centos-stream-9-s390x.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-include('templates/centos-stream-9.tpl')
-
-config_opts['root'] = 'centos-stream-9-s390x'
-config_opts['target_arch'] = 's390x'
-config_opts['legal_host_arches'] = ('s390x',)
diff --git a/schutzbot/el9-mock-configs/centos-stream-9-x86_64.cfg b/schutzbot/el9-mock-configs/centos-stream-9-x86_64.cfg
deleted file mode 100644
index 9c0206bb2..000000000
--- a/schutzbot/el9-mock-configs/centos-stream-9-x86_64.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-include('templates/centos-stream-9.tpl')
-
-config_opts['root'] = 'centos-stream-9-x86_64'
-config_opts['target_arch'] = 'x86_64'
-config_opts['legal_host_arches'] = ('x86_64',)
diff --git a/schutzbot/el9-mock-configs/templates/centos-stream-9.tpl b/schutzbot/el9-mock-configs/templates/centos-stream-9.tpl
deleted file mode 100644
index d4554de89..000000000
--- a/schutzbot/el9-mock-configs/templates/centos-stream-9.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-config_opts['chroot_setup_cmd'] = 'install tar redhat-rpm-config redhat-release which xz sed make bzip2 gzip coreutils unzip shadow-utils diffutils cpio bash gawk rpm-build info patch util-linux findutils grep glibc-minimal-langpack'
-config_opts['dist'] = 'el9'  # only useful for --resultdir variable subst
-config_opts['releasever'] = '9'
-config_opts['package_manager'] = 'dnf'
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-
-config_opts['bootstrap_image'] = 'quay.io/centos/centos:stream9'
-
-config_opts['dnf.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-best=1
-install_weak_deps=0
-protected_packages=
-module_platform_id=platform:el9
-user_agent={{ user_agent }}
-
-[baseos]
-name=CentOS Stream $releasever - BaseOS
-#baseurl=http://mirror.stream.centos.org/$releasever-stream/BaseOS/$basearch/os/
-metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-enabled=1
-skip_if_unavailable=False
-
-[appstream]
-name=CentOS Stream $releasever - AppStream
-#baseurl=http://mirror.stream.centos.org/$releasever-stream/AppStream/$basearch/os/
-metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-enabled=1
-skip_if_unavailable=False
-
-[crb]
-name=CentOS Stream $releasever - CRB
-#baseurl=http://mirror.stream.centos.org/$releasever-stream/CRB/$basearch/os/
-metalink=https://mirrors.centos.org/metalink?repo=centos-crb-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-enabled=1
-skip_if_unavailable=False
-
-[highavailability]
-name=CentOS Stream $releasever - HighAvailability
-#baseurl=http://mirror.stream.centos.org/$releasever-stream/HighAvailability/$basearch/os/
-metalink=https://mirrors.centos.org/metalink?repo=centos-highavailability-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-enabled=0
-
-[nfv]
-name=CentOS Stream $releasever - NFV
-#baseurl=http://mirror.stream.centos.org/$releasever-stream/NFV/$basearch/os/
-metalink=https://mirrors.centos.org/metalink?repo=centos-nfv-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-enabled=0
-
-[rt]
-name=CentOS Stream $releasever - RT
-#baseurl=http://mirror.stream.centos.org/$releasever-stream/RT/$basearch/os/
-metalink=https://mirrors.centos.org/metalink?repo=centos-rt-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-enabled=0
-
-[resilientstorage]
-name=CentOS Stream $releasever - ResilientStorage
-#baseurl=http://mirror.stream.centos.org/$releasever-stream/ResilientStorage/$basearch/os/
-metalink=https://mirrors.centos.org/metalink?repo=centos-resilientstorage-$releasever-stream&arch=$basearch
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-enabled=0
-
-"""
diff --git a/schutzbot/mockbuild.sh b/schutzbot/mockbuild.sh
index ca9610db2..0e509b203 100755
--- a/schutzbot/mockbuild.sh
+++ b/schutzbot/mockbuild.sh
@@ -55,17 +55,11 @@ if curl --silent --fail --head --output /dev/null "${REPO_URL}/repodata/repomd.x
 fi
 
 # Mock and s3cmd is only available in EPEL for RHEL.
-if [[ $ID == rhel || $ID == centos ]] && [[ ${VERSION_ID%.*} == 8 ]] && ! rpm -q epel-release; then
+if [[ $ID == rhel || $ID == centos ]] && ! rpm -q epel-release; then
     greenprint "📦 Setting up EPEL repository"
     curl -Ls --retry 5 --output /tmp/epel.rpm \
-        https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+        https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${VERSION_ID%.*}".noarch.rpm
     sudo rpm -Uvh /tmp/epel.rpm
-elif [[ $ID == rhel || $ID == centos ]] && [[ ${VERSION_ID%.*} == 9 ]]; then
-    # we have our own small epel for EL9, let's install it
-    # install Red Hat certificate, otherwise dnf copr fails
-    curl -LO --insecure https://hdn.corp.redhat.com/rhel8-csb/RPMS/noarch/redhat-internal-cert-install-0.1-23.el7.csb.noarch.rpm
-    sudo dnf install -y ./redhat-internal-cert-install-0.1-23.el7.csb.noarch.rpm dnf-plugins-core
-    sudo dnf copr enable -y copr.devel.redhat.com/osbuild-team/epel-el9 "rhel-9.dev-$ARCH"
 fi
 
 # Install requirements for building RPMs in mock.