From d3806102e93303f5d2e8fa32f21a2bcbbc03370b Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sun, 9 Jan 2022 19:48:00 +0100 Subject: [PATCH] copr-builder: fixes for s390x spawning --- .../backend/files/provision/provision_builder_tasks.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index 49faba11dd..15108de827 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -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 hostname: name="{{ lookup('env', 'RESALLOC_NAME') | default('unknown-builder') | replace('_', '-') }}" when: prepare_base_image is not defined @@ -230,7 +237,7 @@ password: "{{ copr_red_hat_subscription_password }}" consumer_name: "{{ lookup('env', 'RESALLOC_NAME') | default('unknown-builder') }}" pool_ids: - - "{% if ansible_architecture == 's390x' %}2c96015276f1cf9d0176f248febd1241{% else %}8a85f9a17c71102f017ce611251c770f{% endif %}" + - "{% if 's390x' in lookup('env', 'RESALLOC_NAME') %}2c96015276f1cf9d0176f248febd1241{% else %}8a85f9a17c71102f017ce611251c770f{% endif %}" when: - prepare_base_image is not defined - copr_red_hat_subscription_password is defined