From b9c69f5cac314c18a539c42d1ca3bf28e59dd51e Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Wed, 14 Jun 2023 10:56:42 +0200
Subject: [PATCH] copr: move epel-6 to rhel+epel from centos+epel

Relates to the certificate issues
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/KOR3HE2VHHIPDBLDLXTYRMON6JQXCHMW/

The problem was the centos-6 key, not EPEL-6 key.

Reverts: 7b1cf87845c5c595b810fbc3523df96b0e128cd4
Reverts: 0fc0655e47679ab650070c56fadba3ccb0a7e341
---
 .../files/mock/templates/centos-6.tpl         | 85 -------------------
 .../provision/files/mock/templates/epel-6.tpl |  4 +-
 2 files changed, 2 insertions(+), 87 deletions(-)
 delete mode 100644 roles/copr/backend/files/provision/files/mock/templates/centos-6.tpl

diff --git a/roles/copr/backend/files/provision/files/mock/templates/centos-6.tpl b/roles/copr/backend/files/provision/files/mock/templates/centos-6.tpl
deleted file mode 100644
index a621870d67..0000000000
--- a/roles/copr/backend/files/provision/files/mock/templates/centos-6.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-# This list is taken from 'epel-6-x86_64' @buildsys-build group, minus the
-# 'epel-*' specific stuff.
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux-ng which xz'
-
-config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
-# beware RHEL uses 6Server or 6Client
-config_opts['releasever'] = '6'
-config_opts['isolation'] = 'simple'
-config_opts['bootstrap_image'] = 'centos:6'
-config_opts['package_manager'] = 'yum'
-
-config_opts['yum_install_command'] += "{% if target_arch in ['x86_64'] %} --disablerepo=centos-sclo*{% endif %}"
-
-config_opts['yum.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=
-metadata_expire=0
-mdpolicy=group:primary
-best=1
-protected_packages=
-user_agent={{ user_agent }}
-
-# repos
-[base]
-name=CentOS-$releasever - Base
-enabled=1
-baseurl=https://vault.centos.org/6.10/os/$basearch/
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-6
-skip_if_unavailable=False
-
-[updates]
-name=CentOS-$releasever - Updates
-enabled=0
-baseurl=https://vault.centos.org/6.10/updates/$basearch/
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-6
-skip_if_unavailable=False
-
-[extras]
-name=CentOS-$releasever - Extras
-baseurl=https://vault.centos.org/6.10/extras/$basearch/
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-6
-skip_if_unavailable=False
-
-[fastrack]
-name=CentOS-$releasever - fasttrack
-baseurl=https://vault.centos.org/6.10/fasttrack/$basearch/
-failovermethod=priority
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-6
-skip_if_unavailable=False
-enabled=0
-
-[centosplus]
-name=CentOS-$releasever - Plus
-baseurl=https://vault.centos.org/6.10/centosplus/$basearch/
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-6
-enabled=0
-
-{% if target_arch == "x86_64" %}
-[centos-sclo-sclo]
-name=CentOS-$releasever - SCLo sclo
-baseurl=https://vault.centos.org/6.10/sclo/$basearch/sclo/
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-SCLo
-includepkgs=devtoolset*
-skip_if_unavailable=False
-
-[centos-sclo-rh]
-name=CentOS-$releasever - SCLo rh
-baseurl=https://vault.centos.org/6.10/sclo/$basearch/rh/
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-SCLo
-includepkgs=devtoolset*
-skip_if_unavailable=False
-{% endif %}
-"""
diff --git a/roles/copr/backend/files/provision/files/mock/templates/epel-6.tpl b/roles/copr/backend/files/provision/files/mock/templates/epel-6.tpl
index ce1bfc584b..33e9de0219 100644
--- a/roles/copr/backend/files/provision/files/mock/templates/epel-6.tpl
+++ b/roles/copr/backend/files/provision/files/mock/templates/epel-6.tpl
@@ -1,4 +1,4 @@
-include('templates/centos-6.tpl')
+include('eol/templates/rhel-6.tpl')
 
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 
@@ -8,7 +8,7 @@ name=Extra Packages for Enterprise Linux $releasever - $basearch
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch
 failovermethod=priority
 gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-6
-gpgcheck=0
+gpgcheck=1
 skip_if_unavailable=False
 
 [epel-testing]