Skip to content

Commit c9d1983

Browse files
committed
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
1 parent a8c4598 commit c9d1983

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

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

Lines changed: 2 additions & 10 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.
@@ -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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
# Allow insecure registries for testing
3+
kolla_docker_registry_insecure: true

etc/kayobe/environments/ci-builder/globals.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
1212
# SELinux.
1313

1414
# Avoid a reboot.
15-
selinux_do_reboot: false
15+
selinux_state: disabled

etc/kayobe/globals.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
# OS release. Valid options are "9-stream" when os_distribution is "centos", or
5353
# "9" when os_distribution is "rocky", or "jammy" when os_distribution is
5454
# "ubuntu".
55-
#os_release:
55+
#os_release:
5656

5757
###############################################################################
5858
# Ansible configuration.

0 commit comments

Comments
 (0)