From b9d52f1b6517901e0694aec67d6bf44960e2dff5 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 27 Jan 2021 09:40:12 +0100 Subject: [PATCH] copr: builders: drop best=0 EL8 hack The default config + command: $ mock -r centos-8-x86_64 --install perl-Test-Harness installs just perl-Test-Harness-1:3.42-1.el8.noarch, not and not perl-Test-Harness-1:3.42-440.module_f33+9369+dac0eadc.noarch or something alike. I think we are fine to drop the hack for rhbz#1758459. --- .../provision/files/mock/centos-stream-aarch64.cfg | 12 ------------ .../provision/files/mock/centos-stream-ppc64le.cfg | 12 ------------ .../provision/files/mock/centos-stream-x86_64.cfg | 12 ------------ .../files/provision/files/mock/epel-8-aarch64.cfg | 14 -------------- .../files/provision/files/mock/epel-8-ppc64le.cfg | 14 -------------- .../files/provision/files/mock/epel-8-x86_64.cfg | 14 -------------- 6 files changed, 78 deletions(-) delete mode 100644 roles/copr/backend/files/provision/files/mock/centos-stream-aarch64.cfg delete mode 100644 roles/copr/backend/files/provision/files/mock/centos-stream-ppc64le.cfg delete mode 100644 roles/copr/backend/files/provision/files/mock/centos-stream-x86_64.cfg delete mode 100644 roles/copr/backend/files/provision/files/mock/epel-8-aarch64.cfg delete mode 100644 roles/copr/backend/files/provision/files/mock/epel-8-ppc64le.cfg delete mode 100644 roles/copr/backend/files/provision/files/mock/epel-8-x86_64.cfg diff --git a/roles/copr/backend/files/provision/files/mock/centos-stream-aarch64.cfg b/roles/copr/backend/files/provision/files/mock/centos-stream-aarch64.cfg deleted file mode 100644 index 1bdbe3eac5..0000000000 --- a/roles/copr/backend/files/provision/files/mock/centos-stream-aarch64.cfg +++ /dev/null @@ -1,12 +0,0 @@ -include('templates/centos-stream.tpl') - -config_opts['root'] = 'centos-stream-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 -config_opts['dnf.conf'] += """ -[main] -best=False -""" diff --git a/roles/copr/backend/files/provision/files/mock/centos-stream-ppc64le.cfg b/roles/copr/backend/files/provision/files/mock/centos-stream-ppc64le.cfg deleted file mode 100644 index 2c77b4db32..0000000000 --- a/roles/copr/backend/files/provision/files/mock/centos-stream-ppc64le.cfg +++ /dev/null @@ -1,12 +0,0 @@ -include('templates/centos-stream.tpl') - -config_opts['root'] = 'centos-stream-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 -config_opts['dnf.conf'] += """ -[main] -best=False -""" diff --git a/roles/copr/backend/files/provision/files/mock/centos-stream-x86_64.cfg b/roles/copr/backend/files/provision/files/mock/centos-stream-x86_64.cfg deleted file mode 100644 index 65f37f7977..0000000000 --- a/roles/copr/backend/files/provision/files/mock/centos-stream-x86_64.cfg +++ /dev/null @@ -1,12 +0,0 @@ -include('templates/centos-stream.tpl') - -config_opts['root'] = 'centos-stream-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 -config_opts['dnf.conf'] += """ -[main] -best=False -""" 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 deleted file mode 100644 index 4fc09cfcc9..0000000000 --- a/roles/copr/backend/files/provision/files/mock/epel-8-aarch64.cfg +++ /dev/null @@ -1,14 +0,0 @@ -include('templates/centos-8.tpl') -include('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 -config_opts['dnf.conf'] += """ -[main] -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 deleted file mode 100644 index 95e361923f..0000000000 --- a/roles/copr/backend/files/provision/files/mock/epel-8-ppc64le.cfg +++ /dev/null @@ -1,14 +0,0 @@ -include('templates/centos-8.tpl') -include('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 -config_opts['dnf.conf'] += """ -[main] -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 deleted file mode 100644 index d901dbc8c4..0000000000 --- a/roles/copr/backend/files/provision/files/mock/epel-8-x86_64.cfg +++ /dev/null @@ -1,14 +0,0 @@ -include('templates/centos-8.tpl') -include('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 -config_opts['dnf.conf'] += """ -[main] -best=False -"""