Skip to content

Commit 059f1ec

Browse files
committed
Merge branch 'stackhpc/2024.1' into cross-arch-builds-2024.1
Change-Id: Idccd8dabe04c001da8df172548bbb5de9d831529
2 parents ff0ae1f + 88ab336 commit 059f1ec

File tree

3 files changed

+55
-12
lines changed

3 files changed

+55
-12
lines changed

.github/workflows/stackhpc-container-image-build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -358,14 +358,9 @@ jobs:
358358
- container-image-build
359359
- runner-selection
360360
steps:
361-
- name: Install package dependencies
362-
run: |
363-
sudo apt update
364-
sudo apt install -y git unzip python3-wheel python3-pip python3-venv curl jq wget openssh-server openssh-client
365-
366361
- name: Install gh
367362
run: |
368-
sudo mkdir -p -m 755 /etc/apt/keyrings && wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null
363+
sudo mkdir -p -m 755 /etc/apt/keyrings && curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null
369364
sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg
370365
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
371366
sudo apt update
@@ -385,8 +380,13 @@ jobs:
385380
username: ${{ secrets.RLS_TRAIN_CI_ARK_REGISTRY_USER }}
386381
password: ${{ secrets.RLS_TRAIN_CI_ARK_REGISTRY_PASS }}
387382

383+
- name: Checkout
384+
uses: actions/checkout@v4
385+
with:
386+
path: src/kayobe-config
387+
388388
- name: Create and push Docker manifests
389-
run: tools/multiarch-manifests.sh
389+
run: src/kayobe-config/tools/multiarch-manifests.sh
390390

391391
- name: Upload manifest logs
392392
uses: actions/upload-artifact@v4

etc/kayobe/kolla-image-tags.yml

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,49 @@
44
# where the key is the OS distro and the value is the tag to deploy.
55
kolla_image_tags:
66
openstack:
7-
rocky-9: 2024.1-rocky-9-20250715T083226
8-
ubuntu-jammy: 2024.1-ubuntu-jammy-20250715T083226
9-
ubuntu-noble: 2024.1-ubuntu-noble-20250715T083226
7+
rocky-9: 2024.1-rocky-9-20250716T041633
8+
ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
9+
ubuntu-noble: 2024.1-ubuntu-noble-20250404T150323
10+
bifrost:
11+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250325T141125
12+
glance:
13+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250213T103134
14+
horizon:
15+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250227T091118
16+
ironic:
17+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250213T110505
18+
ironic_dnsmasq:
19+
ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
20+
ironic_prometheus_exporter:
21+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250124T081816
22+
kolla_toolbox:
23+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
24+
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
25+
magnum:
26+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250522T143506
27+
ubuntu-noble: 2024.1-ubuntu-noble-20250522T143506
28+
manila:
29+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
30+
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
31+
neutron:
32+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
33+
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
34+
neutron_bgp_dragent:
35+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
36+
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
37+
nova:
38+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
39+
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
40+
octavia:
41+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
42+
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
43+
openvswitch:
44+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
45+
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
46+
ovn:
47+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
48+
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
49+
prometheus:
50+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250219T145255
51+
prometheus_alertmanager:
52+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250422T103147

etc/kayobe/stackhpc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
165165

166166
# Kolla source repository.
167167
stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
168-
stackhpc_kolla_source_version: stackhpc/18.7.0.2
168+
stackhpc_kolla_source_version: stackhpc/18.7.0.4
169169

170170
# Kolla Ansible source repository.
171171
stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
172-
stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.1
172+
stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.2
173173

174174
###############################################################################
175175
# Container image registry

0 commit comments

Comments
 (0)