From e10da77da88a58f3c2e6f9a88c6eafb2b327c23f Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Fri, 11 Oct 2019 00:37:14 +0200 Subject: [PATCH] copr: set best=0 for epel-8 chroots, but outside of a template Because having it in a template didn't work for me, so either PEBKAC or we need to figure out, how to do it. --- .../provision/files/mock/epel-8-aarch64.cfg | 10 ++++++ .../provision/files/mock/epel-8-ppc64le.cfg | 10 ++++++ .../provision/files/mock/epel-8-x86_64.cfg | 10 ++++++ .../provision/files/mock/templates/epel-8.tpl | 34 ------------------- 4 files changed, 30 insertions(+), 34 deletions(-) create mode 100644 roles/copr/backend/files/provision/files/mock/epel-8-aarch64.cfg create mode 100644 roles/copr/backend/files/provision/files/mock/epel-8-ppc64le.cfg create mode 100644 roles/copr/backend/files/provision/files/mock/epel-8-x86_64.cfg delete mode 100644 roles/copr/backend/files/provision/files/mock/templates/epel-8.tpl diff --git a/roles/copr/backend/files/provision/files/mock/epel-8-aarch64.cfg b/roles/copr/backend/files/provision/files/mock/epel-8-aarch64.cfg new file mode 100644 index 0000000000..feb1ab2155 --- /dev/null +++ b/roles/copr/backend/files/provision/files/mock/epel-8-aarch64.cfg @@ -0,0 +1,10 @@ +include('/etc/mock/templates/centos-8.tpl') +include('/etc/mock/templates/epel-8.tpl') + +config_opts['root'] = 'epel-8-aarch64' +config_opts['target_arch'] = 'aarch64' +config_opts['legal_host_arches'] = ('aarch64',) + +# Unfortunately, we need to temporarily set this +# See: RHBZ 1756681 and RHBZ 1758467 +best=False diff --git a/roles/copr/backend/files/provision/files/mock/epel-8-ppc64le.cfg b/roles/copr/backend/files/provision/files/mock/epel-8-ppc64le.cfg new file mode 100644 index 0000000000..d2b7a705f9 --- /dev/null +++ b/roles/copr/backend/files/provision/files/mock/epel-8-ppc64le.cfg @@ -0,0 +1,10 @@ +include('/etc/mock/templates/centos-8.tpl') +include('/etc/mock/templates/epel-8.tpl') + +config_opts['root'] = 'epel-8-ppc64le' +config_opts['target_arch'] = 'ppc64le' +config_opts['legal_host_arches'] = ('ppc64le',) + +# Unfortunately, we need to temporarily set this +# See: RHBZ 1756681 and RHBZ 1758467 +best=False diff --git a/roles/copr/backend/files/provision/files/mock/epel-8-x86_64.cfg b/roles/copr/backend/files/provision/files/mock/epel-8-x86_64.cfg new file mode 100644 index 0000000000..1baab64133 --- /dev/null +++ b/roles/copr/backend/files/provision/files/mock/epel-8-x86_64.cfg @@ -0,0 +1,10 @@ +include('/etc/mock/templates/centos-8.tpl') +include('/etc/mock/templates/epel-8.tpl') + +config_opts['root'] = 'epel-8-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) + +# Unfortunately, we need to temporarily set this +# See: RHBZ 1756681 and RHBZ 1758467 +best=False diff --git a/roles/copr/backend/files/provision/files/mock/templates/epel-8.tpl b/roles/copr/backend/files/provision/files/mock/templates/epel-8.tpl deleted file mode 100644 index 4d67a6cf75..0000000000 --- a/roles/copr/backend/files/provision/files/mock/templates/epel-8.tpl +++ /dev/null @@ -1,34 +0,0 @@ -config_opts['yum.conf'] += """ - -# We temporarily want to set this because of RHBZ: 1756681 -best=0 - -[epel] -name=epel -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=$basearch -failovermethod=priority -gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 -skip_if_unavailable=False - -[testing] -name=epel-testing -enabled=0 -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel8&arch=$basearch -failovermethod=priority -skip_if_unavailable=False - -[local] -name=local -baseurl=https://kojipkgs.fedoraproject.org/repos/epel8-build/latest/$basearch/ -cost=2000 -enabled=0 -skip_if_unavailable=False - -[epel-debuginfo] -name=epel-debug -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-8&arch=$basearch -failovermethod=priority -enabled=0 -skip_if_unavailable=False -"""