From ea9c3916bdc709299c6ac05631ebebf0b6d5cdb7 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 17 Feb 2020 10:20:24 +0100 Subject: [PATCH] copr: be: make sure we use mock-core-configs contents ... and that we only apply our changes on top of that. --- .../copr/backend/files/provision/provision_builder_tasks.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index 8ac75dc739..780e2e3ee3 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -69,6 +69,11 @@ - name: run /bin/copr-update-builder from copr-builder package shell: /usr/bin/copr-update-builder +# temporarily, till https://pagure.io/copr/copr/pull-request/1273 lands +# production +- name: restore config files from mock-core-configs + shell: find /etc/mock -name '*.rpmnew' | while read file; do mv -f "$file" "${file%%.rpmnew}"; done + - name: put updated mock configs into /etc/mock copy: src=files/mock/ dest=/etc/mock # conditional, per https://pagure.io/copr/copr/issue/1189 - as we don't want