From dc1f5c0148ded4084826ab362376cb3b6f0f490c Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 25 Jan 2022 15:35:44 +0100 Subject: [PATCH] copr-builders: install the subscription-manager when preparing the image --- .../backend/files/provision/provision_builder_tasks.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index 64ed41de52..f94b1b9b3f 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -77,11 +77,6 @@ failed_when: false when: prepare_base_image is defined -# TODO: Drop this entirely once we are on F35+ -- package_facts: manager=auto - when: - - copr_builder_fedora_version == 34 - # TODO: Drop this entirely once we are on F35+ - name: install subscription-manager package: name=subscription-manager state=present @@ -89,8 +84,7 @@ # set of builder images needs to be generated first so the image contains the # subscription-manager by default. when: - - copr_builder_fedora_version == 34 - - "'subscription-manager' not in ansible_facts.packages" + - copr_builder_fedora_version == 34 or prepare_base_image is defined # TODO: Fix this once we are on F35+. This should be prepare_base_image only. - name: install the subscription-manager script