Skip to content

Commit

Permalink
DNM - CI test
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Alex-Welsh committed Sep 19, 2023
1 parent a8c4598 commit c9d1983
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .automation
12 changes: 2 additions & 10 deletions .github/workflows/overcloud-host-image-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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 &&
Expand Down
3 changes: 3 additions & 0 deletions etc/kayobe/environments/ci-aio/kolla.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
# Allow insecure registries for testing
kolla_docker_registry_insecure: true
2 changes: 1 addition & 1 deletion etc/kayobe/environments/ci-builder/globals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion etc/kayobe/globals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

###############################################################################
# Ansible configuration.
Expand Down

0 comments on commit c9d1983

Please sign in to comment.