From 3b4fb5016118ee7b693376a3560a715f0f52553e Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 8 Jan 2018 13:10:47 +0100 Subject: [PATCH] copr-builder: exclude infra mock => allow installing mock 1.4.8 from Fedora --- .../files/provision/files/dnf/infra-tags-stg.repo | 1 + .../backend/files/provision/files/dnf/infra-tags.repo | 1 + .../files/provision/provision_builder_tasks.yml | 10 ---------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/roles/copr/backend/files/provision/files/dnf/infra-tags-stg.repo b/roles/copr/backend/files/provision/files/dnf/infra-tags-stg.repo index fd3a25dee7..4a5f9fdc32 100644 --- a/roles/copr/backend/files/provision/files/dnf/infra-tags-stg.repo +++ b/roles/copr/backend/files/provision/files/dnf/infra-tags-stg.repo @@ -4,3 +4,4 @@ baseurl=https://kojipkgs.fedoraproject.org/repos-dist/f$releasever-infra-stg/lat enabled=1 gpgcheck=1 gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS +exclude=mock diff --git a/roles/copr/backend/files/provision/files/dnf/infra-tags.repo b/roles/copr/backend/files/provision/files/dnf/infra-tags.repo index c7c6b8b709..d0796929b6 100644 --- a/roles/copr/backend/files/provision/files/dnf/infra-tags.repo +++ b/roles/copr/backend/files/provision/files/dnf/infra-tags.repo @@ -4,3 +4,4 @@ baseurl=https://kojipkgs.fedoraproject.org/repos-dist/f$releasever-infra/latest/ enabled=1 gpgcheck=1 gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS +exclude=mock diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index 1b6c5de0c4..d583ba3b8c 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -19,10 +19,6 @@ - name: set bigger timeout for dnf ini_file: dest=/etc/dnf/dnf.conf section=main option=timeout value=1000 -# hack for 2:mock-1.3.4-2 currently being the latest version in infra repos -- name: ensure absent - dnf: state=absent pkg="mock-core-configs" - - name: install pkgs dnf: state=present pkg={{ item }} with_items: @@ -59,12 +55,6 @@ - name: put updated mock configs into /etc/mock template: src=files/mock/{{ item }} dest=/etc/mock with_items: - - mageia-cauldron-i586.cfg - - mageia-cauldron-x86_64.cfg - - fedora-26-ppc64le.cfg - - fedora-27-i386.cfg - - fedora-27-ppc64le.cfg - - fedora-27-x86_64.cfg - site-defaults.cfg - name: put copr-rpmbuild configuration file in the right place