From c9c24f7aca99600b9a435360045084fc90b88661 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 18 Mar 2022 10:48:14 +0100 Subject: [PATCH] copr-builders: drop centos-stream configuration hack This will be provided in the new copr-rpmbuild release, deployed on Monday, 2022-03-21 (ie. we shouldn't run the playbook against production till then). --- .../files/copr-distgit-client/centos-stream.ini | 4 ---- .../playbook-prepare-builder-to-create-images.yml | 1 - .../backend/files/provision/provision_builder_tasks.yml | 9 --------- 3 files changed, 14 deletions(-) delete mode 100644 roles/copr/backend/files/provision/files/copr-distgit-client/centos-stream.ini diff --git a/roles/copr/backend/files/provision/files/copr-distgit-client/centos-stream.ini b/roles/copr/backend/files/provision/files/copr-distgit-client/centos-stream.ini deleted file mode 100644 index b734aee521..0000000000 --- a/roles/copr/backend/files/provision/files/copr-distgit-client/centos-stream.ini +++ /dev/null @@ -1,4 +0,0 @@ -[centos-stream] -clone_hostnames = gitlab.com -lookaside_location = https://sources.stream.centos.org -lookaside_uri_pattern = sources/rpms/{name}/{filename}/{hashtype}/{hash}/{filename} diff --git a/roles/copr/backend/files/provision/playbook-prepare-builder-to-create-images.yml b/roles/copr/backend/files/provision/playbook-prepare-builder-to-create-images.yml index 3bf1861f4b..01535ca187 100644 --- a/roles/copr/backend/files/provision/playbook-prepare-builder-to-create-images.yml +++ b/roles/copr/backend/files/provision/playbook-prepare-builder-to-create-images.yml @@ -89,7 +89,6 @@ - files/main.ini - files/dnf/infra-tags.repo - files/copr-rpmbuild/rpkg.conf.j2 - - files/copr-distgit-client/centos-stream.ini - name: eimg.sh config copy: diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index 1af2b750ed..542b3a2bee 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -275,15 +275,6 @@ - prepare_base_image is not defined - copr_builder_fedora_version == 34 -# Should be dropped once we resolve: https://pagure.io/copr/copr/issue/2015 -- name: install the CentOS DistGit config file - copy: - src: files/copr-distgit-client/centos-stream.ini - dest: /etc/copr-distgit-client/centos-stream.ini - mode: 0644 - when: - - prepare_base_image is not defined - - name: patch from https://pagure.io/rpkg-util/pull-request/38 patch: src=patches/rpkg-v3.patch dest=/usr/lib/python3.10/site-packages/rpkglib/lookaside_cache.py