Skip to content

2023.1: Update to Rocky 9.3 based kolla images #910

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 34 commits into from
Feb 6, 2024
Merged

2023.1: Update to Rocky 9.3 based kolla images #910

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
4c67cf3
CI: Add upgrade tests
markgoddard Jan 12, 2024
653c886
Move Kolla image tags to a separate file
markgoddard Sep 14, 2023
0cfa548
Add base distro version to Kolla image tag definitions
markgoddard Oct 3, 2023
fafc68a
Add kolla-images.py
markgoddard Oct 3, 2023
8d8f6e0
Remove iscsid from Pulp image list
markgoddard Oct 23, 2023
eee5481
CI: Trigger container image promotion automatically after merge
markgoddard Oct 24, 2023
d1262ba
Automatically define Kolla Ansible tag variables in globals.yml
markgoddard Oct 24, 2023
ae21932
CI: Add a job to check whether all expected images are in Test Pulp
markgoddard Oct 25, 2023
82a194a
kolla-images.py: Remove unnecessary strips, support unmaintained bran…
markgoddard Jan 29, 2024
4e90858
kolla-images.py: Check for existence of skopeo
markgoddard Jan 29, 2024
14f8eda
Merge pull request #899 from stackhpc/zed-yoga-merge
markgoddard Jan 29, 2024
0337190
zed: Update bifrost image for Ubuntu Jammy
markgoddard Jan 29, 2024
0bdc266
kolla-images.py: Fix container to image tag lookup corner case
markgoddard Jan 29, 2024
3d842a1
CI: Update to checkout action v4 in aio job
markgoddard Jan 29, 2024
85b1e3c
Merge pull request #869 from stackhpc/zed-upgrade-ci-test
markgoddard Jan 31, 2024
ee5fa79
Merge pull request #663 from stackhpc/zed-auto-tags
markgoddard Feb 2, 2024
db66fee
Merge remote-tracking branch 'origin/stackhpc/zed' into HEAD
jovial Feb 2, 2024
5466b08
Fix variable name
jovial Feb 2, 2024
62b9e2b
Fix issue with pulp sync
jovial Feb 2, 2024
d2424a9
Fix for haproxy-ssh
jovial Feb 2, 2024
189e00b
Merge remote-tracking branch 'origin/bugfix/zed/pulp-sync-fix' into HEAD
jovial Feb 2, 2024
e7a23b7
Adjust tags to container distro version
jovial Feb 2, 2024
806f838
2023.1: Update to Rocky 9.3 based kolla images
jovial Feb 2, 2024
7e44433
Update other variable
jovial Feb 2, 2024
46d126d
Another fixup
jovial Feb 2, 2024
f7b70e6
Merge remote-tracking branch 'origin/bugfix/zed/pulp-sync-fix' into s…
jovial Feb 2, 2024
793f876
Revert "Fix for haproxy-ssh"
jovial Feb 2, 2024
210d2f5
Real fix for haproxy-ssh
jovial Feb 2, 2024
95fd537
Merge remote-tracking branch 'origin/sync/zed-into-2023.1' into HEAD
jovial Feb 2, 2024
5c2aecb
Revert change to automation
jovial Feb 2, 2024
b653647
Merge remote-tracking branch 'origin/sync/zed-into-2023.1' into HEAD
jovial Feb 2, 2024
7b5f902
Update previous release
jovial Feb 5, 2024
12a24c1
Merge remote-tracking branch 'origin/sync/zed-into-2023.1' into featu…
jovial Feb 5, 2024
e9c68d4
Add letsencrypt and haproxy-ssh images
jovial Feb 5, 2024
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 .automation
Open in desktop
Submodule .automation updated 10 files
+0 −1 .github/CODEOWNERS
+3 −3 .github/workflows/ci.yml
+1 −1 README.md
+6 −7 ansible/kayobe-automation-run-tempest.yml
+2 −7 ansible/roles/config-diff-vars/filter_plugins/utils.py
+12 −14 docker/kayobe/Dockerfile
+6 −10 functions
+0 −7 scripts/config-diff.sh
+0 −25 scripts/kolla-ansible-run.sh
+0 −24 scripts/overcloud-service-configuration-generate.sh
2 changes: 1 addition & 1 deletion etc/kayobe/kolla-image-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kolla_image_tags:
ubuntu-jammy: 2023.1-ubuntu-jammy-20231228T140806
cloudkitty:
ubuntu-jammy: 2023.1-ubuntu-jammy-20231115T110235
haproxy-ssh:
haproxy_ssh:
ubuntu-jammy: 2023.1-ubuntu-jammy-20240104T071640
letsencrypt:
ubuntu-jammy: 2023.1-ubuntu-jammy-20240104T071640
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/pulp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ stackhpc_pulp_distribution_container_kolla_common:
stackhpc_pulp_distribution_container_kolla: >-
{%- set distributions = [] -%}
{%- for image in stackhpc_pulp_images_kolla_filtered -%}
{%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro]-%}
{%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro_and_version]-%}
{%- set image_repo = kolla_docker_namespace ~ "/" ~ image -%}
{%- set distribution = {"name": image_repo, "repository": image_repo, "base_path": image_repo} -%}
{%- set _ = distributions.append(stackhpc_pulp_distribution_container_kolla_common | combine(distribution)) -%}
Expand Down
4 changes: 2 additions & 2 deletions tools/kolla-images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def get_parent_tag_name(kolla_image_tags: KollaImageTags, base_distro: Optional[

if container in CONTAINER_TO_PREFIX_VAR_EXCEPTIONS:
prefix_var = CONTAINER_TO_PREFIX_VAR_EXCEPTIONS[container]
if prefix_var in kolla_image_tags:
if prefix_var in kolla_image_tags and (base_distro is None or base_distro in kolla_image_tags[prefix_var]):
return prefix_var
else:
prefix_var = container
Expand Down Expand Up @@ -221,7 +221,7 @@ def get_openstack_release() -> str:

def validate(kolla_image_tags: KollaImageTags):
"""Validate the kolla_image_tags variable."""
tag_var_re = re.compile(r"^[a-z0-9_-]+$")
tag_var_re = re.compile(r"^[a-z0-9_]+$")
openstack_release = get_openstack_release()
tag_res = {
base_distro: re.compile(f"^{openstack_release}-{base_distro}-[\d]{{8}}T[\d]{{6}}$")
Expand Down