From 157fdb840641fee52550a7e6fee41655405f73a4 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Tue, 12 Dec 2023 14:39:52 +0100 Subject: [PATCH] Pin base image tag Co-Authored-By: Mark Goddard Co-Authored-By: Matt Anson --- etc/kayobe/kolla/kolla-build.conf | 9 +++++++++ releasenotes/notes/pin-baseimage-3d224df5b6f56b10.yaml | 7 +++++++ 2 files changed, 16 insertions(+) create mode 100644 releasenotes/notes/pin-baseimage-3d224df5b6f56b10.yaml diff --git a/etc/kayobe/kolla/kolla-build.conf b/etc/kayobe/kolla/kolla-build.conf index 83d8bb715..d88c98ef6 100644 --- a/etc/kayobe/kolla/kolla-build.conf +++ b/etc/kayobe/kolla/kolla-build.conf @@ -1,2 +1,11 @@ [DEFAULT] +{# Packages in the latest upstream Ubuntu base image can be ahead of our package repo #} +{# snapshots, so pin to a specific tag. #} +{# This tag should be updated when Ubuntu package repo snapshot versions are changed. #} +{% if kolla_base_distro == 'ubuntu' %} +base_tag = jammy-20231004 +{# Similarly pinning to Rocky 9 minor version used in our repos #} +{% elif kolla_base_distro == 'rocky' %} +base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }} +{% endif %} build_args = {{ kolla_build_args.items() | map('join', ':') | join(',') }} diff --git a/releasenotes/notes/pin-baseimage-3d224df5b6f56b10.yaml b/releasenotes/notes/pin-baseimage-3d224df5b6f56b10.yaml new file mode 100644 index 000000000..b03d5c247 --- /dev/null +++ b/releasenotes/notes/pin-baseimage-3d224df5b6f56b10.yaml @@ -0,0 +1,7 @@ +fixes: + - | + Pin the OCI image tag used for the base-image of Kolla image + builds. This prevents packages in the image with + the latest tag getting in front of StackHPC release-train + package repositories. Ubuntu tag should be bumped when new + packages are available in StackHPC release-train.