Skip to content

Commit 3af6f35

Browse files
committed
Update overcloud host image builds for Zed
1 parent 813673a commit 3af6f35

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

.github/workflows/overcloud-host-image-build.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
runs-on: [self-hosted, stackhpc-kayobe-config-kolla-builder-rl9]
3535
permissions: {}
3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838
with:
3939
path: src/kayobe-config
4040

4141
- name: Determine OpenStack release
4242
id: openstack_release
4343
run: |
44-
BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' .gitreview)
44+
BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' src/kayobe-config/.gitreview)
4545
echo "openstack_release=${BRANCH}" | sed "s|stable/||" >> $GITHUB_OUTPUT
4646
4747
# Generate a tag to apply to all built overcloud host images.
@@ -67,7 +67,7 @@ jobs:
6767

6868
- name: Install dependencies
6969
run: |
70-
sudo dnf -y install zstd
70+
sudo dnf -y install zstd debootstrap
7171
7272
- name: Setup networking
7373
run: |
@@ -84,14 +84,6 @@ jobs:
8484
sudo ip l set dummy1 up
8585
sudo ip l set dummy1 master breth1
8686
87-
# FIXME: Without this workaround we see the following issue after the runner is power cycled:
88-
# TASK [MichaelRigart.interfaces : RedHat | ensure network service is started and enabled] ***
89-
# Unable to start service network: Job for network.service failed because the control process exited with error code.
90-
# See \"systemctl status network.service\" and \"journalctl -xe\" for details.
91-
- name: Kill dhclient (workaround)
92-
run: |
93-
(sudo killall dhclient || true) && sudo systemctl restart network
94-
9587
- name: Install Kayobe
9688
run: |
9789
mkdir -p venvs &&
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
22
# Overcloud host image versioning tags
33
# These images must be in SMS, since they are used by our AIO CI runners
4-
stackhpc_rocky_9_overcloud_host_image_version: "yoga-20230929T133006"
5-
stackhpc_ubuntu_jammy_overcloud_host_image_version: "yoga-20230609T120720"
4+
stackhpc_rocky_9_overcloud_host_image_version: "zed-20231013T123933"
5+
stackhpc_ubuntu_jammy_overcloud_host_image_version: "zed-20231013T123933"

0 commit comments

Comments
 (0)