diff --git a/.github/workflows/overcloud-host-image-build.yml b/.github/workflows/overcloud-host-image-build.yml index 9577b042f..72cd1d6de 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. @@ -67,7 +67,7 @@ jobs: - name: Install dependencies run: | - sudo dnf -y install zstd + sudo dnf -y install zstd debootstrap - name: Setup networking run: | @@ -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/pulp-host-image-versions.yml b/etc/kayobe/pulp-host-image-versions.yml index 7be308a6f..1477f632c 100644 --- a/etc/kayobe/pulp-host-image-versions.yml +++ b/etc/kayobe/pulp-host-image-versions.yml @@ -1,5 +1,5 @@ --- # Overcloud host image versioning tags # These images must be in SMS, since they are used by our AIO CI runners -stackhpc_rocky_9_overcloud_host_image_version: "yoga-20230929T133006" -stackhpc_ubuntu_jammy_overcloud_host_image_version: "yoga-20230609T120720" +stackhpc_rocky_9_overcloud_host_image_version: "zed-20231013T123933" +stackhpc_ubuntu_jammy_overcloud_host_image_version: "zed-20231013T123933"