Merge branch 'stackhpc/2024.1' into cross-arch-builds-2024.1

Change-Id: Idccd8dabe04c001da8df172548bbb5de9d831529

Author: bbezak

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

@@ -351,26 +351,13 @@ jobs:
   create-manifests:
     # Only for Rocky Linux for now
     name: Create Multiarch Docker Manifests
-    if: github.repository == 'stackhpc/stackhpc-kayobe-config' && inputs.push
+    if: github.repository == 'stackhpc/stackhpc-kayobe-config' && inputs.push && inputs.rocky-linux-9
     runs-on: ${{ needs.runner-selection.outputs.runner_name_container_image_build }}
     permissions: {}
     needs:
       - container-image-build
       - runner-selection
     steps:
-      - name: Install package dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y git unzip python3-wheel python3-pip python3-venv curl jq wget openssh-server openssh-client
-
-      - name: Install gh
-        run: |
-          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
-          sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg
-          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
-          sudo apt update
-          sudo apt install gh -y
-
       - name: Download artifacts
         uses: actions/download-artifact@v4
 
@@ -385,8 +372,13 @@ jobs:
           username: ${{ secrets.RLS_TRAIN_CI_ARK_REGISTRY_USER }}
           password: ${{ secrets.RLS_TRAIN_CI_ARK_REGISTRY_PASS }}
 
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          path: src/kayobe-config
+
       - name: Create and push Docker manifests
-        run: tools/multiarch-manifests.sh
+        run: src/kayobe-config/tools/multiarch-manifests.sh
 
       - name: Upload manifest logs
         uses: actions/upload-artifact@v4
@@ -398,6 +390,15 @@ jobs:
           retention-days: 7
         if: ${{ !cancelled() }}
 
+  trigger-image-sync:
+    name: Trigger container image repository sync
+    needs:
+      - container-image-build
+      - create-manifests
+    if: github.repository == 'stackhpc/stackhpc-kayobe-config' && inputs.push && !cancelled()
+    runs-on: ubuntu-latest
+    permissions: {}
+    steps:
       # NOTE(mgoddard): Trigger another CI workflow in the
       # stackhpc-release-train repository.
       - name: Trigger container image repository sync
@@ -414,9 +415,7 @@ jobs:
           -f sync-old-images=false
         env:
           GITHUB_TOKEN: ${{ secrets.STACKHPC_RELEASE_TRAIN_TOKEN }}
-        if: ${{ github.repository == 'stackhpc/stackhpc-kayobe-config' && inputs.push && !cancelled() }}
 
       - name: Display link to container image repository sync workflows
         run: |
           echo "::notice Container image repository sync workflows: https://github.com/stackhpc/stackhpc-release-train/actions/workflows/container-sync.yml"
-        if: ${{ github.repository == 'stackhpc/stackhpc-kayobe-config' && inputs.push && !cancelled() }}

etc/kayobe/kolla-image-tags.yml

@@ -4,6 +4,49 @@
 # where the key is the OS distro and the value is the tag to deploy.
 kolla_image_tags:
   openstack:
-    rocky-9: 2024.1-rocky-9-20250715T083226
-    ubuntu-jammy: 2024.1-ubuntu-jammy-20250715T083226
-    ubuntu-noble: 2024.1-ubuntu-noble-20250715T083226
+    rocky-9: 2024.1-rocky-9-20250716T041633
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
+    ubuntu-noble: 2024.1-ubuntu-noble-20250404T150323
+  bifrost:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250325T141125
+  glance:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250213T103134
+  horizon:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250227T091118
+  ironic:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250213T110505
+  ironic_dnsmasq:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
+  ironic_prometheus_exporter:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250124T081816
+  kolla_toolbox:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
+    ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
+  magnum:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250522T143506
+    ubuntu-noble: 2024.1-ubuntu-noble-20250522T143506
+  manila:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
+    ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
+  neutron:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
+    ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
+  neutron_bgp_dragent:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
+    ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
+  nova:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
+    ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
+  octavia:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
+    ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
+  openvswitch:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
+    ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
+  ovn:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
+    ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
+  prometheus:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250219T145255
+  prometheus_alertmanager:
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250422T103147

etc/kayobe/stackhpc.yml

@@ -165,11 +165,11 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
 
 # Kolla source repository.
 stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
-stackhpc_kolla_source_version: stackhpc/18.7.0.2
+stackhpc_kolla_source_version: stackhpc/18.7.0.4
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
-stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.1
+stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.2
 
 ###############################################################################
 # Container image registry