From 7f42d1cadf57edf1d7f5c2ee6a2aa87820a809a3 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Wed, 17 Apr 2024 08:16:54 +1200
Subject: [PATCH] Use bootloader element instead of grub2

bootloader is recommended since it aims to build a valid grub config
instead of just installing the packages.

Also, mark legacy job as non-voting for the time being

The legacy job is broken because of a know issue with tinycore related
to the glibc library.  Moving it to non-voting for the time being while
we evaluate if it's worth trying to fix it or jsut remove it.

Also, install diskimage-builder from the checked-out repo, so that
depends on works as expected.

Change-Id: I642a1579e95dfff2188206313ea6d315b0533a5f
---
 .zuul.yaml                               | 7 +++++--
 playbooks/integration/centos8-image.yaml | 6 +++---
 playbooks/integration/centos9-image.yaml | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 3f5a607..3c42fdf 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -187,7 +187,11 @@
     check:
       jobs:
         - metalsmith-integration-glance-centos9-uefi
-        - metalsmith-integration-glance-centos9-legacy
+        # NOTE(rpittau): this is broken because of an issue with tinycore
+        # moving to non-voting while we evaluate if it's worth trying to
+        # fix it or just removing it
+        - metalsmith-integration-glance-centos9-legacy:
+            voting: false
         - metalsmith-integration-http-cirros
         - openstack-tox-linters
         - metalsmith-tox-codespell:
@@ -195,6 +199,5 @@
     gate:
       jobs:
         - metalsmith-integration-glance-centos9-uefi
-        - metalsmith-integration-glance-centos9-legacy
         - metalsmith-integration-http-cirros
         - openstack-tox-linters
diff --git a/playbooks/integration/centos8-image.yaml b/playbooks/integration/centos8-image.yaml
index e69bbf4..be3a21f 100644
--- a/playbooks/integration/centos8-image.yaml
+++ b/playbooks/integration/centos8-image.yaml
@@ -14,7 +14,7 @@
 
 - name: Install DIB
   pip:
-    name: diskimage-builder
+    name: "/home/zuul/src/opendev.org/openstack/diskimage-builder"
   become: true
   vars:
     ansible_python_interpreter: /usr/bin/{{ metalsmith_python | default('python') }}
@@ -30,13 +30,13 @@
 
 - name: Build a centos8 wholedisk image
   command: >
-    disk-image-create centos grub2 vm {{ centos_block_device | default('') }}
+    disk-image-create centos bootloader vm {{ centos_block_device | default('') }}
     -o centos8-wholedisk
   environment:
     DIB_RELEASE: 8-stream
 
 - name: Build a centos8 partition image
-  command: disk-image-create centos grub2 baremetal -o centos8-partition
+  command: disk-image-create centos bootloader baremetal -o centos8-partition
   environment:
     DIB_RELEASE: 8-stream
 
diff --git a/playbooks/integration/centos9-image.yaml b/playbooks/integration/centos9-image.yaml
index 49d63d7..c49a967 100644
--- a/playbooks/integration/centos9-image.yaml
+++ b/playbooks/integration/centos9-image.yaml
@@ -14,7 +14,7 @@
 
 - name: Install DIB
   pip:
-    name: diskimage-builder
+    name: "/home/zuul/src/opendev.org/openstack/diskimage-builder"
   become: true
   vars:
     ansible_python_interpreter: /usr/bin/{{ metalsmith_python | default('python') }}
@@ -30,13 +30,13 @@
 
 - name: Build a centos9 wholedisk image
   command: >
-    disk-image-create centos grub2 vm {{ centos_block_device | default('') }}
+    disk-image-create -x centos bootloader vm {{ centos_block_device | default('') }}
     -o centos9-wholedisk
   environment:
     DIB_RELEASE: 9-stream
 
 - name: Build a centos9 partition image
-  command: disk-image-create centos grub2 baremetal -o centos9-partition
+  command: disk-image-create -x centos bootloader baremetal -o centos9-partition
   environment:
     DIB_RELEASE: 9-stream