From d81a0556f575abbaeffbd812b859e489c3f035e4 Mon Sep 17 00:00:00 2001
From: Gregory Thiemonge <gthiemon@redhat.com>
Date: Thu, 17 Dec 2020 09:34:41 +0100
Subject: [PATCH] Fix periodic image builder jobs

publish-openstack-octavia-amphora-image* jobs started failing because
ubuntu no longer provides yum-utils package.
Now dependencies have been cleaned up for the ubuntu job, and the centos
job uses a centos node. The zuul playbook now works on Ubuntu and
RedHat/Centos nodes.

Change-Id: Ifca01d91d8eb92115d56744f4963e91ac537dd8e
---
 playbooks/image-build/run.yaml | 25 +++++++++++++++++++++++--
 zuul.d/jobs.yaml               |  2 ++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/playbooks/image-build/run.yaml b/playbooks/image-build/run.yaml
index bb262e2fe6..899ac9b40f 100644
--- a/playbooks/image-build/run.yaml
+++ b/playbooks/image-build/run.yaml
@@ -19,10 +19,31 @@
         - debootstrap
         - qemu
         - bc
-        - rpm
-        - yum-utils
         - python3-venv
         - python3-setuptools
+      when:
+        - ansible_os_family == 'Debian'
+    - name: Install rpm packages
+      dnf:
+        pkg: "{{ item }}"
+        state: "latest"
+        update_cache: yes
+      register: install_packages
+      become: yes
+      until: install_packages is success
+      retries: 5
+      delay: 2
+      with_items:
+        - qemu-img
+        - uuid
+        - curl
+        - kpartx
+        - python3-pyyaml
+        - qemu-kvm
+        - python3-setuptools
+        - yum
+      when:
+        - ansible_os_family == 'RedHat'
     - name: Install required pip packages
       pip:
         name: "{{  item }}"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index cabb3e4d10..638dfa9afb 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -19,6 +19,7 @@
 
 - job:
     name: publish-openstack-octavia-amphora-image-centos8
+    nodeset: centos-8
     parent: publish-openstack-octavia-amphora-image
     description: |
       Publish CentOS 8 based amphora image to tarballs.o.o.
@@ -163,6 +164,7 @@
 - job:
     name: octavia-amphora-image-build-live-centos8
     parent: octavia-amphora-image-build
+    nodeset: centos-8
     description: |
       Builds a CentOS 8 amphora image using diskimage-builder from Git
       master. This job does not publish the image.