From ac3a331eeb761895958e3601f99c4086d68e9ddf Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 14 Dec 2021 16:14:03 +0100 Subject: [PATCH] copr-be: disable auto_packing https://docs.pagure.org/copr.copr/rpkg_util_2_vs_3.html https://lists.fedoraproject.org/archives/list/copr-devel@lists.fedorahosted.org/thread/3JORYRKDWFMJSR35Z4LIKDEXH2T5263H/ --- .../backend/files/provision/provision_builder_tasks.yml | 7 +++++++ roles/copr/backend/templates/provision/rpkg.conf.j2 | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index 52309c22d3..0f87a098a5 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -117,8 +117,12 @@ - name: put copr-rpmbuild configuration file in the right place copy: src=files/main.ini dest=/etc/copr-rpmbuild/main.ini +# This taks is to be dropped once we migrate to F35. On F35, we want to keep +# the default /etc/rpkg.conf untouched! - name: put rpkg configuration file to the right place copy: src=files/rpkg.conf dest=/etc/rpkg.conf + when: + - prepare_base_image is not defined - name: mockbuilder user user: name=mockbuilder groups=mock @@ -181,6 +185,9 @@ - name: Update gem2rpm package to the latest version dnf: state=latest pkg=rubygem-gem2rpm +# We want to drop this change with F35, too. # See https://pagure.io/copr/copr/pull-request/1950 - name: copy temporary rpkg.conf.j2 until builders run F35 copy: src=files/copr-rpmbuild/rpkg.conf.j2 dest=/etc/copr-rpmbuild/rpkg.conf.j2 + when: + - prepare_base_image is not defined diff --git a/roles/copr/backend/templates/provision/rpkg.conf.j2 b/roles/copr/backend/templates/provision/rpkg.conf.j2 index 8d67366405..b06b375b2a 100644 --- a/roles/copr/backend/templates/provision/rpkg.conf.j2 +++ b/roles/copr/backend/templates/provision/rpkg.conf.j2 @@ -1,8 +1,10 @@ [rpkg] preprocess_spec = True -# auto-packing is deprecated: -auto_pack = True +# Auto packing off. +# https://docs.pagure.org/copr.copr/rpkg_util_2_vs_3.html +# https://lists.fedoraproject.org/archives/list/copr-devel@lists.fedorahosted.org/thread/3JORYRKDWFMJSR35Z4LIKDEXH2T5263H/ +#auto_pack = True base_output_path = /tmp/rpkg