From adacb350d15f0819bfecc8c53c8f7fe057168ed1 Mon Sep 17 00:00:00 2001 From: Kalibh Halford Date: Mon, 29 Jun 2026 12:12:15 +0100 Subject: [PATCH 1/3] BUG: Fix RL8 ansible version RL8 requires an older version of Ansible to work. Adding a separate requirements file and updatings docs to build the RL8 images. --- os_builders/README.md | 1 + os_builders/requirements-rl8.txt | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 os_builders/requirements-rl8.txt diff --git a/os_builders/README.md b/os_builders/README.md index 3fa3597c..966f31ca 100644 --- a/os_builders/README.md +++ b/os_builders/README.md @@ -37,6 +37,7 @@ The pipeline consists of the following steps: cd cloud-image-builders/os_builders pip install -r requirements.txt + # If you are building the RL8 image use requirements-rl8.txt ansible-playbook prep_builder.yml ``` diff --git a/os_builders/requirements-rl8.txt b/os_builders/requirements-rl8.txt new file mode 100644 index 00000000..c24b67a2 --- /dev/null +++ b/os_builders/requirements-rl8.txt @@ -0,0 +1,4 @@ +ansible==9.13.0 +ansible-core==2.16.16 +# The most compatible OpenStack CLI version with OpenStack Yoga +python-openstackclient==5.8.0 From c7ad0065a1f87ffd887a27d1619200176ee17943 Mon Sep 17 00:00:00 2001 From: Kalibh Halford Date: Mon, 29 Jun 2026 12:14:01 +0100 Subject: [PATCH 2/3] BUG: Fix reboot task hanging on SSH Sometimes the reboot task would hang with some SSH error. Changing the reboot task this way seems more reliable. We were only seeing it get stuck on Ubuntuy 22 but the new change has been checked against other OS's and is working --- os_builders/roles/tidy_image/tasks/reboot.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/os_builders/roles/tidy_image/tasks/reboot.yml b/os_builders/roles/tidy_image/tasks/reboot.yml index d2c274c6..4901349e 100644 --- a/os_builders/roles/tidy_image/tasks/reboot.yml +++ b/os_builders/roles/tidy_image/tasks/reboot.yml @@ -1,8 +1,6 @@ - name: Reboot machine ansible.builtin.reboot: - reboot_command: "shutdown -r" - post_reboot_delay: 30 - connect_timeout: 3600 + pre_reboot_delay: 4 become: true \ No newline at end of file From 352ac6a2b3e2d4efc28f56488114aaaaddad02ca Mon Sep 17 00:00:00 2001 From: Kalibh Halford Date: Mon, 29 Jun 2026 12:18:10 +0100 Subject: [PATCH 3/3] DOC: Update changelog Updating changelog for changes in https://github.com/stfc/cloud-image-builders/pull/153 --- os_builders/CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/os_builders/CHANGELOG b/os_builders/CHANGELOG index a20d3a4c..291b791f 100644 --- a/os_builders/CHANGELOG +++ b/os_builders/CHANGELOG @@ -11,8 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added new builders for Rocky 8 and 9 AQ images. [#148](https://github.com/stfc/cloud-image-builders/pull/148) ### Changed: +- Updated Ansible version for building. [#144](https://github.com/stfc/cloud-image-builders/pull/144) +- Created separate requirements file for RL8 image builds. [#153](https://github.com/stfc/cloud-image-builders/pull/153) ### Fixed: +- Ubuntu 22 stuck at reboot when building image. [#153](https://github.com/stfc/cloud-image-builders/pull/153) ## [0.1.0]