ci: centralize image tag computation in reusable script

Author: anokfireball

.github/scripts/compute-image-tag.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+# Computes the OCI image tag for Garden Linux ccloud images
+#
+# This script centralizes the image tag format computation to ensure consistency
+# across all workflows (nightly, dev, upload_oci).
+#
+# Usage:
+#   ./compute-image-tag.sh <version> [flavor]
+#
+# Arguments:
+#   version - The version for the tag (e.g., "1877.10.1", "pr-123")
+#   flavor  - The image flavor (e.g., "metal-sci-usi-amd64"). Defaults to "metal-sci-usi-amd64".
+#
+# Environment:
+#   GITHUB_SHA - Git commit SHA (required, set automatically by GitHub Actions)
+#
+# Output:
+#   Prints the computed image tag to stdout
+#
+# Tag format:
+#   {version}-{flavor}-{dashed_version}-{commit_sha_short}
+#
+# Examples:
+#   ./compute-image-tag.sh "1877.10.1"
+#   # Output: 1877.10.1-metal-sci-usi-amd64-1877-10-1-abcd1234
+#
+#   ./compute-image-tag.sh "pr-123" "metal-capi-amd64"
+#   # Output: pr-123-metal-capi-amd64-pr-123-abcd1234
+
+set -euo pipefail
+
+VERSION="${1:?Error: VERSION argument required}"
+FLAVOR="${2:-metal-sci-usi-amd64}"
+
+if [ -z "${GITHUB_SHA:-}" ]; then
+    echo "Error: GITHUB_SHA environment variable is required" >&2
+    exit 1
+fi
+
+COMMIT_SHA="${GITHUB_SHA::8}"
+DASHED_VERSION="${VERSION//./-}"
+
+IMAGE_TAG="${VERSION}-${FLAVOR}-${DASHED_VERSION}-${COMMIT_SHA}"
+
+echo "$IMAGE_TAG"

.github/workflows/dev.yml

@@ -54,16 +54,18 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       UPLOAD_VERSION: ${{ steps.meta.outputs.upload_version }}
-      COMMIT_SHA: ${{ steps.meta.outputs.sha }}
+      image_tag: ${{ steps.meta.outputs.image_tag }}
     steps:
-      - name: Derive image version
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Compute image metadata
         id: meta
         run: |
           PR_NUMBER=${{ github.event.pull_request.number }}
           UPLOAD_VERSION="pr-${PR_NUMBER}"
           echo "upload_version=${UPLOAD_VERSION}" >> $GITHUB_OUTPUT
-          SHA="${GITHUB_SHA::8}"
-          echo "sha=${SHA}" >> $GITHUB_OUTPUT
+          IMAGE_TAG=$(.github/scripts/compute-image-tag.sh "${UPLOAD_VERSION}")
+          echo "image_tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT
 
   upload:
     name: Upload PR image to OCI
@@ -82,7 +84,7 @@ jobs:
     if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && github.event.action != 'closed' }}
     uses: ./.github/workflows/test.yml
     with:
-      image_tag: "${{ needs.meta.outputs.UPLOAD_VERSION }}-metal-sci-usi-amd64-${{ needs.meta.outputs.UPLOAD_VERSION }}-${{ needs.meta.outputs.COMMIT_SHA }}"
+      image_tag: ${{ needs.meta.outputs.image_tag }}
 
   cleanup_images:
     name: Cleanup PR images

.github/workflows/nightly.yaml

@@ -36,20 +36,15 @@ jobs:
     needs: [build]
     runs-on: ubuntu-latest
     outputs:
-      VERSION: ${{ needs.build.outputs.version }}
-      DASHED_VERSION: ${{ steps.meta.outputs.dashed_version }}
-      COMMIT_SHA: ${{ steps.meta.outputs.sha }}
+      image_tag: ${{ steps.meta.outputs.image_tag }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Derive image metadata
+      - name: Compute image tag
         id: meta
         run: |
-          SHA="${GITHUB_SHA::8}"
-          echo "sha=${SHA}" >> $GITHUB_OUTPUT
-          VERSION="${{ needs.build.outputs.version }}"
-          DASHED_VERSION=${VERSION//./-}
-          echo "dashed_version=${DASHED_VERSION}" >> $GITHUB_OUTPUT
+          IMAGE_TAG=$(.github/scripts/compute-image-tag.sh "${{ needs.build.outputs.version }}")
+          echo "image_tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT
   upload_oci:
     name: Run glcli to publish to OCI
     needs: [build]
@@ -63,4 +58,4 @@ jobs:
     needs: [meta, upload_oci]
     uses: ./.github/workflows/test.yml
     with:
-      image_tag: "${{ needs.meta.outputs.VERSION }}-metal-sci-usi-amd64-${{ needs.meta.outputs.DASHED_VERSION }}-${{ needs.meta.outputs.COMMIT_SHA }}"
+      image_tag: ${{ needs.meta.outputs.image_tag }}