Skip to content

Commit 4f5c7c6

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

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -358,11 +358,6 @@ 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: |
368363
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
@@ -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/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)