Fix kolla image builds for new name scheme

Author: Alex-Welsh

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

@@ -43,7 +43,7 @@ jobs:
     runs-on: [self-hosted, stackhpc-kayobe-config-kolla-builder]
     permissions: {}
     outputs:
-      kolla_tag: ${{ steps.kolla_tag.outputs.kolla_tag }}
+      datetime_tag: ${{ steps.datetime_tag.outputs.datetime_tag }}
       matrix: ${{ steps.set-matrix.outputs.matrix }}
       openstack_release: ${{ steps.openstack_release.outputs.openstack_release }}
     steps:
@@ -58,10 +58,10 @@ jobs:
 
       # Generate a tag to apply to all built container images.
       # Without this, each kayobe * container image build command would use a different tag.
-      - name: Generate container image tag
-        id: kolla_tag
+      - name: Generate container datetime tag
+        id: datetime_tag
         run: |
-          echo "kolla_tag=$(date +${{ steps.openstack_release.outputs.openstack_release }}-%Y%m%dT%H%M%S)" >> $GITHUB_OUTPUT
+          echo "datetime_tag=$(date +%Y%m%dT%H%M%S)" >> $GITHUB_OUTPUT
 
       # Dynamically define job matrix.
       # We need a separate matrix entry for each distribution, when the relevant input is true.
@@ -81,9 +81,9 @@ jobs:
           fi
           echo "]}" >> $GITHUB_OUTPUT
 
-      - name: Display container image tag
+      - name: Display container datetime tag
         run: |
-          echo "${{ steps.kolla_tag.outputs.kolla_tag }}"
+          echo "${{ steps.datetime_tag.outputs.datetime_tag }}"
 
   container-image-build:
     name: Build Kolla container images
@@ -162,7 +162,7 @@ jobs:
         run: |
           args="${{ github.event.inputs.regexes }}"
           args="$args -e kolla_base_distro=${{ matrix.distro }}"
-          args="$args -e kolla_tag=${{ needs.generate-tag.outputs.kolla_tag }}"
+          args="$args -e kolla_tag=$KOLLA_TAG"
           if ${{ inputs.push }} == 'true'; then
             args="$args --push"
           fi
@@ -171,12 +171,13 @@ jobs:
           kayobe overcloud container image build $args
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
+          KOLLA_TAG: "${{ needs.generate-tag.outputs.openstack_release }}-${{ matrix.distro }}-${{ matrix.distro == 'rocky' && '9' || 'jammy' }}-${{ needs.generate-tag.outputs.datetime_tag }}"
         if: github.event.inputs.overcloud == 'true'
 
       - name: Build and push kolla seed images
         run: |
           args="kolla_base_distro=${{ matrix.distro }}"
-          args="$args -e kolla_tag=${{ needs.generate-tag.outputs.kolla_tag }}"
+          args="$args -e kolla_tag=$KOLLA_TAG"
           if ${{ inputs.push }} == 'true'; then
             args="$args --push"
           fi
@@ -185,11 +186,12 @@ jobs:
           kayobe seed container image build $args
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
+          KOLLA_TAG: "${{ needs.generate-tag.outputs.openstack_release }}-${{ matrix.distro }}-${{ matrix.distro == 'rocky' && '9' || 'jammy' }}-${{ needs.generate-tag.outputs.datetime_tag }}"
         if: github.event.inputs.seed == 'true'
 
       - name: Get built container images
         run: |
-          sudo docker image ls --filter "reference=ark.stackhpc.com/stackhpc-dev/${{ matrix.distro }}-*:${{ needs.generate-tag.outputs.kolla_tag }}" > ${{ matrix.distro }}-container-images
+          sudo docker image ls --filter "reference=ark.stackhpc.com/stackhpc-dev/*:*${{ matrix.distro }}*${{ needs.generate-tag.outputs.datetime_tag }}" > ${{ matrix.distro }}-container-images
 
       - name: Upload container images artifact
         uses: actions/upload-artifact@v3

etc/kayobe/pulp-repo-versions.yml

@@ -21,8 +21,8 @@ stackhpc_pulp_repo_rocky_9_2_baseos_version: 20230627T185020
 stackhpc_pulp_repo_rocky_9_2_crb_version: 20230627T185020
 stackhpc_pulp_repo_rocky_9_2_extras_version: 20230612T072506
 stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20230628T031859
-stackhpc_pulp_repo_ubuntu_jammy_version: 20230809T045713
-stackhpc_pulp_repo_ubuntu_jammy_security_version: 20230809T045713
+stackhpc_pulp_repo_ubuntu_jammy_version: 20230811T044829
+stackhpc_pulp_repo_ubuntu_jammy_security_version: 20230811T044829
 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20230809T091421
 stackhpc_pulp_repo_docker_ce_ubuntu_version: 20230809T012447
 stackhpc_pulp_repo_opensearch_2_x_version: 20230725T013015