Skip to content

Commit b650363

Browse files
authored
Merge branch 'stackhpc/2024.1' into dnm-caracal-ci-testing
2 parents 9c9058a + e4b6fbe commit b650363

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

.github/workflows/stackhpc-all-in-one.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
# NOTE(upgrade): Reference the PREVIOUS release here.
8484
PREVIOUS_KAYOBE_IMAGE: ghcr.io/stackhpc/stackhpc-kayobe-config:stackhpc-2023.1
8585
# NOTE(upgrade): Reference the PREVIOUS release branch here.
86+
8687
PREVIOUS_BRANCH: dnm-ci-test
8788
steps:
8889
- name: Install Package

etc/kayobe/kolla-image-tags.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ kolla_image_tags:
88
ubuntu-jammy: 2024.1-ubuntu-jammy-20240725T165045
99
heat:
1010
rocky-9: 2024.1-rocky-9-20240805T142526
11-
ubuntu-jammy: 2024.1-ubuntu-jammy-20240805T142526
11+
ubuntu-jammy: 2024.1-ubuntu-jammy-20240805T142526

etc/kayobe/kolla/globals.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ kolla_image_tags:
2222
# Variables defining which tag to use for each container's image.
2323
{{ lookup('pipe', 'python3 ' ~ kayobe_config_path ~ '/../../tools/kolla-images.py list-tag-vars') }}
2424

25-
# NOTE(priteau): Nova container images can use Rocky Linux 9.3 to avoid
26-
# Libvirt/QEMU version bump.
27-
{% if stackhpc_pulp_repo_rocky_9_minor_version < 4 %}
28-
nova_tag: 2023.1-rocky-9-20240725T200915
29-
{% endif %}
30-
3125
#############################################################################
3226
# Monitoring and alerting related settings
3327

releasenotes/notes/update-haproxy-dashboard-b8807c2a0645ca5e.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ features:
44
The HAProxy dashboard and alerts have been updated to use the new metrics
55
source in Kolla Ansible. For further details see `here
66
<https://review.opendev.org/c/openstack/kolla-ansible/+/877118>`__.
7+

0 commit comments

Comments
 (0)