Skip to content

Commit 7fc686b

Browse files
Merge branch 'stackhpc/2025.1' into multi-env-kolla-images
2 parents d752f12 + acbf4c9 commit 7fc686b

7 files changed

Lines changed: 34 additions & 17 deletions

File tree

.github/workflows/stackhpc-build-kayobe-image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
base_image:
2525
type: string
2626
required: false
27-
default: "rockylinux:9"
27+
default: "rockylinux/rockylinux:9"
2828
if:
2929
description: Whether to run the workflow (workaround for required status checks issue)
3030
type: boolean
@@ -92,7 +92,7 @@ jobs:
9292
build-args: |
9393
http_proxy=${{ inputs.http_proxy }}
9494
https_proxy=${{ inputs.https_proxy }}
95-
BASE_IMAGE=${{ inputs.base_image || 'rockylinux:9' }}
95+
BASE_IMAGE=${{ inputs.base_image || 'rockylinux/rockylinux:9' }}
9696
USE_PYTHON_312=true
9797
KAYOBE_USER_UID=1001
9898
KAYOBE_USER_GID=1001

doc/source/operations/tempest.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Build a Kayobe automation image:
103103
git submodule update
104104
# If running on Ubuntu, the fact cache can confuse Kayobe in the Rocky-based container
105105
mv etc/kayobe/facts{,-old}
106-
sudo DOCKER_BUILDKIT=1 docker build --network host --build-arg BASE_IMAGE=rockylinux:9 --file .automation/docker/kayobe/Dockerfile --tag kayobe:latest .
106+
sudo DOCKER_BUILDKIT=1 docker build --network host --build-arg BASE_IMAGE=rockylinux/rockylinux:9 --file .automation/docker/kayobe/Dockerfile --tag kayobe:latest .
107107
108108
Configuration
109109
=============

etc/kayobe/environments/ci-aio/automated-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ run_tempest() {
203203
if ! sudo docker image inspect kayobe:latest > /dev/null 2>&1; then
204204
echo "Building Kayobe Automation image"
205205
sudo DOCKER_BUILDKIT=1 docker build \
206-
--build-arg BASE_IMAGE=rockylinux:9 \
206+
--build-arg BASE_IMAGE=rockylinux/rockylinux:9 \
207207
--build-arg USE_PYTHON_312=true \
208208
--file .automation/docker/kayobe/Dockerfile \
209209
--tag kayobe:latest \

etc/kayobe/kolla-image-tags.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@ kolla_image_tags:
77
rocky-9: 2025.1-rocky-9-20260205T152450
88
ubuntu-noble: 2025.1-ubuntu-noble-20260205T152450
99
nova:
10-
rocky-9: 2025.1-rocky-9-20260220T102812
10+
rocky-9: 2025.1-rocky-9-20260226T161930
1111
ubuntu-noble: 2025.1-ubuntu-noble-20260220T102812
12+
octavia:
13+
rocky-9: 2025.1-rocky-9-20260226T091552
14+
ubuntu-noble: 2025.1-ubuntu-noble-20260226T091552

etc/kayobe/pulp-repo-versions.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,21 @@ stackhpc_pulp_repo_rocky_9_6_extras_aarch64_version: 20250726T045704
7878
stackhpc_pulp_repo_rocky_9_6_extras_version: 20250726T040613
7979
stackhpc_pulp_repo_rocky_9_6_highavailability_aarch64_version: 20250605T150141
8080
stackhpc_pulp_repo_rocky_9_6_highavailability_version: 20250605T150141
81-
stackhpc_pulp_repo_rocky_9_7_appstream_aarch64_version: 20260130T210847
82-
stackhpc_pulp_repo_rocky_9_7_appstream_source_version: 20260130T211649
83-
stackhpc_pulp_repo_rocky_9_7_appstream_version: 20260130T205631
84-
stackhpc_pulp_repo_rocky_9_7_baseos_aarch64_version: 20260130T210847
85-
stackhpc_pulp_repo_rocky_9_7_baseos_source_version: 20260130T211649
86-
stackhpc_pulp_repo_rocky_9_7_baseos_version: 20260130T212743
87-
stackhpc_pulp_repo_rocky_9_7_crb_aarch64_version: 20260130T210847
88-
stackhpc_pulp_repo_rocky_9_7_crb_source_version: 20260130T211649
89-
stackhpc_pulp_repo_rocky_9_7_crb_version: 20260130T205631
81+
stackhpc_pulp_repo_rocky_9_7_appstream_aarch64_version: 20260224T214928
82+
stackhpc_pulp_repo_rocky_9_7_appstream_source_version: 20260224T211933
83+
stackhpc_pulp_repo_rocky_9_7_appstream_version: 20260224T210434
84+
stackhpc_pulp_repo_rocky_9_7_baseos_aarch64_version: 20260224T214928
85+
stackhpc_pulp_repo_rocky_9_7_baseos_source_version: 20260224T211933
86+
stackhpc_pulp_repo_rocky_9_7_baseos_version: 20260224T213540
87+
stackhpc_pulp_repo_rocky_9_7_crb_aarch64_version: 20260224T214928
88+
stackhpc_pulp_repo_rocky_9_7_crb_source_version: 20260208T212722
89+
stackhpc_pulp_repo_rocky_9_7_crb_version: 20260224T210434
9090
stackhpc_pulp_repo_rocky_9_7_extras_aarch64_version: 20251229T153210
9191
stackhpc_pulp_repo_rocky_9_7_extras_source_version: 20251229T150242
9292
stackhpc_pulp_repo_rocky_9_7_extras_version: 20251229T144024
93-
stackhpc_pulp_repo_rocky_9_7_highavailability_aarch64_version: 20260112T224827
94-
stackhpc_pulp_repo_rocky_9_7_highavailability_source_version: 20251220T210727
95-
stackhpc_pulp_repo_rocky_9_7_highavailability_version: 20260108T204618
93+
stackhpc_pulp_repo_rocky_9_7_highavailability_aarch64_version: 20260212T231318
94+
stackhpc_pulp_repo_rocky_9_7_highavailability_source_version: 20260212T230226
95+
stackhpc_pulp_repo_rocky_9_7_highavailability_version: 20260213T205816
9696
stackhpc_pulp_repo_rocky_9_sig_security_common_aarch64_version: 20251109T211404
9797
stackhpc_pulp_repo_rocky_9_sig_security_common_source_version: 20251203T103807
9898
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20251108T211425
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Updates Nova container images on Rocky Linux 9 to resolve the following
5+
issue: ``operation failed: guest CPU doesn't match specification: missing
6+
features: pdcm``.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes an issue where the Octavia health worker gets stuck in an infinite
5+
loop if the connection to the database is interrupted. See `LP#2129562
6+
<https://review.opendev.org/c/openstack/octavia/+/964549>`_ for more
7+
details. Also pulls in other fixes from the upstream stable/2025.1
8+
branch for Octavia. See: https://github.com/stackhpc/octavia/pull/59

0 commit comments

Comments
 (0)