Make package version assertions more precise for signed/unsigned and mono/multi-arch

Co-authored-by: neilime <314088+neilime@users.noreply.github.com>

Author: Copilot

.github/workflows/__test-workflow-docker-build-images.yml

@@ -117,10 +117,16 @@ jobs:
             image-name: test-mono-arch-signed
             platform-count: 1
             platforms: '["linux/amd64"]'
+            expected-tagged-versions: 2
+            expected-untagged-versions: 2
+            expected-total-versions: 4
           - arch-type: multi-arch
             image-name: test-multi-arch-signed
             platform-count: 2
             platforms: '["linux/amd64","linux/arm64"]'
+            expected-tagged-versions: 2
+            expected-untagged-versions: 3
+            expected-total-versions: 5
     steps:
       - name: Login to GitHub Container Registry
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
@@ -140,17 +146,40 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           IMAGE_NAME: ${{ matrix.image-name }}
+          EXPECTED_TOTAL_VERSIONS: ${{ matrix.expected-total-versions }}
+          EXPECTED_TAGGED_VERSIONS: ${{ matrix.expected-tagged-versions }}
+          EXPECTED_UNTAGGED_VERSIONS: ${{ matrix.expected-untagged-versions }}
         run: |
-          versions_count=$(gh api \
+          # Get all versions
+          versions=$(gh api \
             -H "Accept: application/vnd.github+json" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
-            /orgs/${{ github.repository_owner }}/packages/container/ci-github-container%2F"${IMAGE_NAME}"/versions | jq '. | length')
+            /orgs/${{ github.repository_owner }}/packages/container/ci-github-container%2F"${IMAGE_NAME}"/versions)
 
-          if [ "$versions_count" -ne 2 ]; then
-            echo "Expected 2 versions (1 tagged and 1 untagged), but found $versions_count"
+          total_count=$(echo "$versions" | jq '. | length')
+          tagged_count=$(echo "$versions" | jq '[.[] | select(.metadata.container.tags | length > 0)] | length')
+          untagged_count=$(echo "$versions" | jq '[.[] | select(.metadata.container.tags | length == 0)] | length')
+
+          echo "Found $total_count total versions ($tagged_count tagged, $untagged_count untagged)"
+          echo "Expected $EXPECTED_TOTAL_VERSIONS total versions ($EXPECTED_TAGGED_VERSIONS tagged, $EXPECTED_UNTAGGED_VERSIONS untagged)"
+
+          if [ "$total_count" -ne "$EXPECTED_TOTAL_VERSIONS" ]; then
+            echo "ERROR: Expected $EXPECTED_TOTAL_VERSIONS total versions, but found $total_count"
+            exit 1
+          fi
+
+          if [ "$tagged_count" -ne "$EXPECTED_TAGGED_VERSIONS" ]; then
+            echo "ERROR: Expected $EXPECTED_TAGGED_VERSIONS tagged versions, but found $tagged_count"
             exit 1
           fi
 
+          if [ "$untagged_count" -ne "$EXPECTED_UNTAGGED_VERSIONS" ]; then
+            echo "ERROR: Expected $EXPECTED_UNTAGGED_VERSIONS untagged versions, but found $untagged_count"
+            exit 1
+          fi
+
+          echo "✓ Package version counts are correct"
+
       - name: Verify image manifest and platforms
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         env:
@@ -214,10 +243,16 @@ jobs:
             image-name: test-mono-arch-unsigned
             platform-count: 1
             platforms: '["linux/amd64"]'
+            expected-tagged-versions: 1
+            expected-untagged-versions: 1
+            expected-total-versions: 2
           - arch-type: multi-arch
             image-name: test-multi-arch-unsigned
             platform-count: 2
             platforms: '["linux/amd64","linux/arm64"]'
+            expected-tagged-versions: 1
+            expected-untagged-versions: 2
+            expected-total-versions: 3
     steps:
       - name: Login to GitHub Container Registry
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
@@ -237,17 +272,40 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           IMAGE_NAME: ${{ matrix.image-name }}
+          EXPECTED_TOTAL_VERSIONS: ${{ matrix.expected-total-versions }}
+          EXPECTED_TAGGED_VERSIONS: ${{ matrix.expected-tagged-versions }}
+          EXPECTED_UNTAGGED_VERSIONS: ${{ matrix.expected-untagged-versions }}
         run: |
-          versions_count=$(gh api \
+          # Get all versions
+          versions=$(gh api \
             -H "Accept: application/vnd.github+json" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
-            /orgs/${{ github.repository_owner }}/packages/container/ci-github-container%2F"${IMAGE_NAME}"/versions | jq '. | length')
+            /orgs/${{ github.repository_owner }}/packages/container/ci-github-container%2F"${IMAGE_NAME}"/versions)
 
-          if [ "$versions_count" -ne 2 ]; then
-            echo "Expected 2 versions (1 tagged and 1 untagged), but found $versions_count"
+          total_count=$(echo "$versions" | jq '. | length')
+          tagged_count=$(echo "$versions" | jq '[.[] | select(.metadata.container.tags | length > 0)] | length')
+          untagged_count=$(echo "$versions" | jq '[.[] | select(.metadata.container.tags | length == 0)] | length')
+
+          echo "Found $total_count total versions ($tagged_count tagged, $untagged_count untagged)"
+          echo "Expected $EXPECTED_TOTAL_VERSIONS total versions ($EXPECTED_TAGGED_VERSIONS tagged, $EXPECTED_UNTAGGED_VERSIONS untagged)"
+
+          if [ "$total_count" -ne "$EXPECTED_TOTAL_VERSIONS" ]; then
+            echo "ERROR: Expected $EXPECTED_TOTAL_VERSIONS total versions, but found $total_count"
+            exit 1
+          fi
+
+          if [ "$tagged_count" -ne "$EXPECTED_TAGGED_VERSIONS" ]; then
+            echo "ERROR: Expected $EXPECTED_TAGGED_VERSIONS tagged versions, but found $tagged_count"
             exit 1
           fi
 
+          if [ "$untagged_count" -ne "$EXPECTED_UNTAGGED_VERSIONS" ]; then
+            echo "ERROR: Expected $EXPECTED_UNTAGGED_VERSIONS untagged versions, but found $untagged_count"
+            exit 1
+          fi
+
+          echo "✓ Package version counts are correct"
+
       - name: Verify image manifest and platforms
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         env: