Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

copr-builders: install the subscription-manager when preparing the image

Browse source
This commit is contained in:
Pavel Raiskup 2022-01-25 15:35:44 +01:00
parent 8ec98e22bb
commit dc1f5c0148
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/copr/backend/files/provision/provision_builder_tasks.yml
View file

@ -77,11 +77,6 @@
failed_when: false failed_when: false
when: prepare_base_image is defined 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+ # TODO: Drop this entirely once we are on F35+
- name: install subscription-manager - name: install subscription-manager
package: name=subscription-manager state=present package: name=subscription-manager state=present
@ -89,8 +84,7 @@
# set of builder images needs to be generated first so the image contains the # set of builder images needs to be generated first so the image contains the
# subscription-manager by default. # subscription-manager by default.
when: when:
- copr_builder_fedora_version == 34 - copr_builder_fedora_version == 34 or prepare_base_image is defined
- "'subscription-manager' not in ansible_facts.packages"
# TODO: Fix this once we are on F35+. This should be prepare_base_image only. # TODO: Fix this once we are on F35+. This should be prepare_base_image only.
- name: install the subscription-manager script - name: install the subscription-manager script