copr-builder: fixes for s390x spawning

This commit is contained in:
Pavel Raiskup 2022-01-09 19:48:00 +01:00
parent 274d80ade8
commit d3806102e9

View file

@ -1,4 +1,11 @@
--- ---
- name: remove the hackish package breaking s390x subscriptions
shell:
cmd: rpm -evh `rpm -qa | grep katello-`
when:
- prepare_base_image is not defined
- "'s390x' in lookup('env', 'RESALLOC_NAME')"
- name: setup the hostname so we can easily identify the box - name: setup the hostname so we can easily identify the box
hostname: name="{{ lookup('env', 'RESALLOC_NAME') | default('unknown-builder') | replace('_', '-') }}" hostname: name="{{ lookup('env', 'RESALLOC_NAME') | default('unknown-builder') | replace('_', '-') }}"
when: prepare_base_image is not defined when: prepare_base_image is not defined
@ -230,7 +237,7 @@
password: "{{ copr_red_hat_subscription_password }}" password: "{{ copr_red_hat_subscription_password }}"
consumer_name: "{{ lookup('env', 'RESALLOC_NAME') | default('unknown-builder') }}" consumer_name: "{{ lookup('env', 'RESALLOC_NAME') | default('unknown-builder') }}"
pool_ids: pool_ids:
- "{% if ansible_architecture == 's390x' %}2c96015276f1cf9d0176f248febd1241{% else %}8a85f9a17c71102f017ce611251c770f{% endif %}" - "{% if 's390x' in lookup('env', 'RESALLOC_NAME') %}2c96015276f1cf9d0176f248febd1241{% else %}8a85f9a17c71102f017ce611251c770f{% endif %}"
when: when:
- prepare_base_image is not defined - prepare_base_image is not defined
- copr_red_hat_subscription_password is defined - copr_red_hat_subscription_password is defined