mockbuild: fix CS9 mockbuild

- name mangling from centos to centos-stream was enabled also for
  centos 9
- CS9 mock configs from mock-core-configs-36.3-1.fc35.noarch were added

Signed-off-by: Ondřej Budai <ondrej@budai.cz>

schutzbot/el9-mock-configs/centos-stream-9-aarch64.cfg

@@ -0,0 +1,5 @@
+include('templates/centos-stream-9.tpl')
+
+config_opts['root'] = 'centos-stream-9-aarch64'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)

schutzbot/el9-mock-configs/centos-stream-9-ppc64le.cfg

@@ -0,0 +1,5 @@
+include('templates/centos-stream-9.tpl')
+
+config_opts['root'] = 'centos-stream-9-ppc64le'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['legal_host_arches'] = ('ppc64le',)

schutzbot/el9-mock-configs/centos-stream-9-s390x.cfg

@@ -0,0 +1,5 @@
+include('templates/centos-stream-9.tpl')
+
+config_opts['root'] = 'centos-stream-9-s390x'
+config_opts['target_arch'] = 's390x'
+config_opts['legal_host_arches'] = ('s390x',)

schutzbot/el9-mock-configs/centos-stream-9-x86_64.cfg

@@ -0,0 +1,5 @@
+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',)

schutzbot/el9-mock-configs/templates/centos-stream-9.tpl

@@ -0,0 +1,86 @@
+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
+
+"""

schutzbot/mockbuild.sh

@@ -12,8 +12,8 @@ source tools/set-env-variables.sh
 # Mock configuration file to use for building RPMs.
 MOCK_CONFIG="${ID}-${VERSION_ID%.*}-$(uname -m)"
 
-if [[ $ID == centos && ${VERSION_ID%.*} == 8 ]]; then
-  MOCK_CONFIG="centos-stream-8-$(uname -m)"
+if [[ $ID == centos ]]; then
+  MOCK_CONFIG="centos-stream-${VERSION_ID%.*}-$(uname -m)"
 fi
 
 # The commit this script operates on.
@@ -88,10 +88,9 @@ if [[ "$ID" == rhel && ${VERSION_ID%.*} == 8 ]] && ! sudo subscription-manager s
     cat /etc/yum.repos.d/rhel8internal.repo | sudo tee -a /etc/mock/templates/rhel-8.tpl > /dev/null
     # We need triple quotes at the end of the template to mark the end of the repo list.
     echo '"""' | sudo tee -a /etc/mock/templates/rhel-8.tpl
-elif [[ $VERSION_ID == 9.0 ]]; then
-    greenprint "📋 Inserting RHEL 9 mock template"
-    sudo cp schutzbot/rhel-9-mock-configs/templates/rhel-9.tpl /etc/mock/templates/
-    sudo cp schutzbot/rhel-9-mock-configs/*.cfg /etc/mock/
+elif [[ ${VERSION_ID%.*} == 9 ]]; then
+    greenprint "📋 Inserting EL9 mock templates"
+    sudo cp -r schutzbot/el9-mock-configs/* /etc/mock/
 fi
 
 greenprint "🔧 Building source RPM"