From 21a866fdc3bfabfb8357c6ae5496ed298aa19da6 Mon Sep 17 00:00:00 2001
From: Alex-Welsh <alex@stackhpc.com>
Date: Fri, 8 Sep 2023 11:44:35 +0100
Subject: [PATCH] DNM - CI test

Updated checkout action to v4
using kayobe-automation feature branch
Changed path on .gitreview awk
removed dhclient workaround
change state of selinux in ci-builder
removed dhclient for ubuntu
---
 .github/workflows/overcloud-host-image-build.yml | 12 ++----------
 etc/kayobe/environments/ci-builder/globals.yml   |  2 +-
 etc/kayobe/globals.yml                           |  2 +-
 etc/kayobe/overcloud-dib.yml                     |  4 ++--
 etc/kayobe/stackhpc-overcloud-dib.yml            |  1 +
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/overcloud-host-image-build.yml b/.github/workflows/overcloud-host-image-build.yml
index 13bf071f7..5149f0c7d 100644
--- a/.github/workflows/overcloud-host-image-build.yml
+++ b/.github/workflows/overcloud-host-image-build.yml
@@ -34,14 +34,14 @@ jobs:
     runs-on: [self-hosted, stackhpc-kayobe-config-kolla-builder-rl9]
     permissions: {}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: src/kayobe-config
 
       - name: Determine OpenStack release
         id: openstack_release
         run: |
-          BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' .gitreview)
+          BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' src/kayobe-config/.gitreview)
           echo "openstack_release=${BRANCH}" | sed "s|stable/||" >> $GITHUB_OUTPUT
 
       # Generate a tag to apply to all built overcloud host images.
@@ -84,14 +84,6 @@ jobs:
           sudo ip l set dummy1 up
           sudo ip l set dummy1 master breth1
 
-      # FIXME: Without this workaround we see the following issue after the runner is power cycled:
-      # TASK [MichaelRigart.interfaces : RedHat | ensure network service is started and enabled] ***
-      #   Unable to start service network: Job for network.service failed because the control process exited with error code.
-      #   See \"systemctl status network.service\" and \"journalctl -xe\" for details.
-      - name: Kill dhclient (workaround)
-        run: |
-          (sudo killall dhclient || true) && sudo systemctl restart network
-
       - name: Install Kayobe
         run: |
           mkdir -p venvs &&
diff --git a/etc/kayobe/environments/ci-builder/globals.yml b/etc/kayobe/environments/ci-builder/globals.yml
index 8240da331..7efb44f44 100644
--- a/etc/kayobe/environments/ci-builder/globals.yml
+++ b/etc/kayobe/environments/ci-builder/globals.yml
@@ -12,4 +12,4 @@ os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 # SELinux.
 
 # Avoid a reboot.
-selinux_do_reboot: false
+selinux_state: disabled
diff --git a/etc/kayobe/globals.yml b/etc/kayobe/globals.yml
index 3956dca36..b0c226a88 100644
--- a/etc/kayobe/globals.yml
+++ b/etc/kayobe/globals.yml
@@ -52,7 +52,7 @@
 # OS release. Valid options are "9-stream" when os_distribution is "centos", or
 # "9" when os_distribution is "rocky", or "jammy" when os_distribution is
 # "ubuntu".
-#os_release:
+#os_release: test
 
 ###############################################################################
 # Ansible configuration.
diff --git a/etc/kayobe/overcloud-dib.yml b/etc/kayobe/overcloud-dib.yml
index 9631c3981..75ce8e882 100644
--- a/etc/kayobe/overcloud-dib.yml
+++ b/etc/kayobe/overcloud-dib.yml
@@ -11,8 +11,8 @@
 overcloud_dib_build_host_images: "{{ not stackhpc_download_overcloud_host_images | bool }}"
 
 # List of additional build host packages to install. Default is an empty list.
-overcloud_dib_host_packages_extra:
-  - "{% if 'ubuntu-minimal' in overcloud_dib_host_images | map(attribute='elements') | flatten | list %}debootstrap{% endif %}"
+# overcloud_dib_host_packages_extra:
+#   - "{% if 'ubuntu-minimal' in overcloud_dib_host_images | map(attribute='elements') | flatten | list %}debootstrap{% endif %}"
 
 # List of overcloud host disk images to build. Each element is a dict defining
 # an image in a format accepted by the stackhpc.os-images role. Default is to
diff --git a/etc/kayobe/stackhpc-overcloud-dib.yml b/etc/kayobe/stackhpc-overcloud-dib.yml
index ddb93600e..8f80b33b0 100644
--- a/etc/kayobe/stackhpc-overcloud-dib.yml
+++ b/etc/kayobe/stackhpc-overcloud-dib.yml
@@ -71,6 +71,7 @@ stackhpc_overcloud_dib_packages:
   - "{% if os_distribution == 'ubuntu' %}iputils-ping{% endif %}"
   - "{% if os_distribution == 'ubuntu' %}curl{% endif %}"
   - "{% if os_distribution == 'ubuntu' %}apt-utils{% endif %}"
+  - "{% if os_distribution == 'ubuntu' %}debootstrap{% endif %}"
   - "{% if os_distribution == 'rocky' %}NetworkManager-config-server{% endif %}"
 
 # StackHPC overcloud DIB image block device configuration.