Skip to content

sync 2023.1 from zed #837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 13, 2023
Merged

sync 2023.1 from zed #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
21794a8
Merge pull request #822 from stackhpc/zed-yoga-merge
markgoddard Dec 7, 2023
2fb3e1b
Fix upgrading docs typo
Alex-Welsh Dec 7, 2023
c42fce3
Merge pull request #825 from stackhpc/docs-fix
Alex-Welsh Dec 7, 2023
157fdb8
Pin base image tag
bbezak Dec 12, 2023
0f5f21a
Merge pull request #835 from stackhpc/zed-pin-base-image
mnasiadka Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/source/operations/upgrading.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ Compare the old & new configuration:

.. code-block:: console

diff -ru ~/kolla-diff-{old,new} > ~/kolla-diff.diff
diff -ru ~/kolla-diff/{old,new} > ~/kolla-diff.diff
less ~/kolla-diff.diff

Upgrading the Seed Hypervisor
Expand Down
9 changes: 9 additions & 0 deletions etc/kayobe/kolla/kolla-build.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(',') }}
7 changes: 7 additions & 0 deletions releasenotes/notes/pin-baseimage-3d224df5b6f56b10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.