Skip to content

Commit 2a0d422

Browse files
bbezakmarkgoddardm-bull
committed
Pin Ubuntu Focal base image tag
Co-Authored-By: Mark Goddard <[email protected]> Co-Authored-By: Matt Anson <[email protected]>
1 parent edd037b commit 2a0d422

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

etc/kayobe/kolla/kolla-build.conf

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
[DEFAULT]
2-
{# Pinning to Rocky 9 minor version used in our repos #}
3-
{% if kolla_base_distro == 'rocky' %}
1+
{# Packages in the latest upstream Ubuntu base image can be ahead of our package repo #}
2+
{# snapshots, so pin to a specific tag. #}
3+
{# This tag should be updated when Ubuntu package repo snapshot versions are changed. #}
4+
{% if kolla_base_distro == 'ubuntu' %}
5+
base_tag = focal-20231003
6+
{# Similarly pinning to Rocky 9 minor version used in our repos #}
7+
{% elif kolla_base_distro == 'rocky' %}
48
base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
59
{% endif %}
6-
build_args = {{ kolla_build_args.items() | map('join', ':') | join(',') }}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
fixes:
3+
- |
4+
Pin the OCI image tag used for the Ubuntu Focal base-image
5+
of Kolla image builds. This prevents packages in the image
6+
with the latest tag getting in front of StackHPC release-train
7+
package repositories. Ubuntu tag should be bumped when new
8+
packages are available in StackHPC release-train.

0 commit comments

Comments
 (0)