ci: Parallelize container build via matrix

Not only speeds things up, also reduces very similar code. We just need to align the image-tests folder names to the images to make a simple mapping possible. Signed-off-by: Jan Kiszka <[email protected]>
siemens · Mar 4, 2024 · 2a49f42 · 2a49f42
1 parent 3f6c0c9
commit 2a49f42
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 91 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -9,6 +9,9 @@ jobs:
   deploy_containers:
     name: Build and deploy container images
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        image-name: ["kas", "kas-isar"]
     steps:
       - name: Check out repo
         uses: actions/checkout@v4
@@ -27,28 +30,16 @@ jobs:
         with:
           deploy-user: ${{ secrets.PACKAGE_DEPLOY_USER }}
           deploy-token: ${{ secrets.PACKAGE_DEPLOY_TOKEN }}
-      - name: Build kas image
+      - name: Build ${{ matrix.image-name }} image
         uses: docker/build-push-action@v5
         if: ${{ env.PUSH_MASTER }}
         with:
           context: /home/runner/kas-clone
           no-cache: true
+          target: ${{ matrix.image-name }}
           platforms: linux/amd64,linux/arm64
           build-args: |
             SOURCE_DATE_EPOCH=${{ env.SOURCE_DATE_EPOCH }}
             DEBIAN_TAG=${{ env.DEBIAN_TAG }}
           outputs: type=registry,rewrite-timestamp=true
-          tags: ghcr.io/siemens/kas/kas
-      - name: Build kas-isar image
-        uses: docker/build-push-action@v5
-        if: ${{ env.PUSH_MASTER }}
-        with:
-          context: /home/runner/kas-clone
-          no-cache: true
-          target: kas-isar
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            SOURCE_DATE_EPOCH=${{ env.SOURCE_DATE_EPOCH }}
-            DEBIAN_TAG=${{ env.DEBIAN_TAG }}
-          outputs: type=registry,rewrite-timestamp=true
-          tags: ghcr.io/siemens/kas/kas-isar
+          tags: ghcr.io/siemens/kas/${{ matrix.image-name }}
diff --git a/.github/workflows/next.yml b/.github/workflows/next.yml
@@ -65,6 +65,9 @@ jobs:
     name: Build, test and deploy container images
     needs: perform_tests
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        image-name: ["kas", "kas-isar"]
     steps:
       - name: Check out repo
         uses: actions/checkout@v4
@@ -74,94 +77,50 @@ jobs:
           deploy-user: ${{ secrets.PACKAGE_DEPLOY_USER }}
           deploy-token: ${{ secrets.PACKAGE_DEPLOY_TOKEN }}
 
-      - name: Build amd64 kas image
-        uses: docker/build-push-action@v5
-        with:
-          context: /home/runner/kas-clone
-          no-cache: true
-          platforms: linux/amd64
-          build-args: |
-            SOURCE_DATE_EPOCH=${{ env.SOURCE_DATE_EPOCH }}
-            DEBIAN_TAG=${{ env.DEBIAN_TAG }}
-          outputs: type=docker,rewrite-timestamp=true
-          tags: ghcr.io/siemens/kas/kas:next
-      - name: Test kas image
-        run: |
-          cd image-tests/poky
-          KAS_IMAGE_VERSION=next ../../kas-container build kas.yml
-      - name: Build arm64 kas image
-        uses: docker/build-push-action@v5
-        with:
-          context: /home/runner/kas-clone
-          no-cache: true
-          platforms: linux/arm64
-          build-args: |
-            SOURCE_DATE_EPOCH=${{ env.SOURCE_DATE_EPOCH }}
-            DEBIAN_TAG=${{ env.DEBIAN_TAG }}
-          outputs: type=docker,rewrite-timestamp=true
-          tags: ghcr.io/siemens/kas/kas:next
-      - name: Deploy kas images
-        uses: docker/build-push-action@v5
-        with:
-          context: /home/runner/kas-clone
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            SOURCE_DATE_EPOCH=${{ env.SOURCE_DATE_EPOCH }}
-            DEBIAN_TAG=${{ env.DEBIAN_TAG }}
-          outputs: type=registry,rewrite-timestamp=true
-          tags: ghcr.io/siemens/kas/kas:next
-
-      - name: Build amd64 kas-isar image
+      - name: Build amd64 ${{ matrix.image-name }} image
         uses: docker/build-push-action@v5
         with:
           context: /home/runner/kas-clone
           no-cache: true
-          target: kas-isar
+          target: ${{ matrix.image-name }}
           platforms: linux/amd64
           build-args: |
             SOURCE_DATE_EPOCH=${{ env.SOURCE_DATE_EPOCH }}
             DEBIAN_TAG=${{ env.DEBIAN_TAG }}
           outputs: type=docker,rewrite-timestamp=true
-          tags: ghcr.io/siemens/kas/kas-isar:next
-      - name: Test kas-isar image
+          tags: ghcr.io/siemens/kas/${{ matrix.image-name }}:next
+      - name: Test ${{ matrix.image-name }} image
         run: |
-          cd image-tests/isar
+          cd image-tests/${{ matrix.image-name }}
           KAS_IMAGE_VERSION=next ../../kas-container build kas.yml
-      - name: Build arm64 kas-isar image
+      - name: Build arm64 ${{ matrix.image-name }} image
         uses: docker/build-push-action@v5
         with:
           context: /home/runner/kas-clone
           no-cache: true
-          target: kas-isar
+          target: ${{ matrix.image-name }}
           platforms: linux/arm64
           build-args: |
             SOURCE_DATE_EPOCH=${{ env.SOURCE_DATE_EPOCH }}
             DEBIAN_TAG=${{ env.DEBIAN_TAG }}
           outputs: type=docker,rewrite-timestamp=true
-          tags: ghcr.io/siemens/kas/kas-isar:next
-      - name: Deploy kas-isar images
+          tags: ghcr.io/siemens/kas/${{ matrix.image-name }}:next
+      - name: Deploy ${{ matrix.image-name }} images
         uses: docker/build-push-action@v5
         with:
           context: /home/runner/kas-clone
-          target: kas-isar
+          target: ${{ matrix.image-name }}
           platforms: linux/amd64,linux/arm64
           build-args: |
             SOURCE_DATE_EPOCH=${{ env.SOURCE_DATE_EPOCH }}
             DEBIAN_TAG=${{ env.DEBIAN_TAG }}
           outputs: type=registry,rewrite-timestamp=true
-          tags: ghcr.io/siemens/kas/kas-isar:next
+          tags: ghcr.io/siemens/kas/${{ matrix.image-name }}:next
 
-      - name: Purge oldest untagged kas images
-        uses: actions/delete-package-versions@v5
-        with:
-          package-name: kas/kas
-          package-type: container
-          min-versions-to-keep: 10
-          delete-only-untagged-versions: true
-      - name: Purge oldest untagged kas-isar images
+      - name: Purge oldest untagged ${{ matrix.image-name }} images
         uses: actions/delete-package-versions@v5
         with:
-          package-name: kas-isar
+          package-name: kas/${{ matrix.image-name }}
           package-type: container
           min-versions-to-keep: 10
           delete-only-untagged-versions: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,6 +9,9 @@ jobs:
   deploy_containers:
     name: Build and deploy container images
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        image-name: ["kas", "kas-isar"]
     steps:
       - name: Check out repo
         uses: actions/checkout@v4
@@ -19,32 +22,18 @@ jobs:
         with:
           deploy-user: ${{ secrets.PACKAGE_DEPLOY_USER }}
           deploy-token: ${{ secrets.PACKAGE_DEPLOY_TOKEN }}
-      - name: Build kas image
+      - name: Build ${{ matrix.image-name }} image
         uses: docker/build-push-action@v5
         with:
           context: /home/runner/kas-clone
           no-cache: true
+          target: ${{ matrix.image-name }}
           platforms: linux/amd64,linux/arm64
           build-args: |
             SOURCE_DATE_EPOCH=${{ env.SOURCE_DATE_EPOCH }}
             DEBIAN_TAG=${{ env.DEBIAN_TAG }}
           outputs: type=registry,rewrite-timestamp=true
           tags: |
-            ghcr.io/siemens/kas/kas
-            ghcr.io/siemens/kas/kas:${{ env.RELEASE_VERSION }}
-            ghcr.io/siemens/kas/kas:latest-release
-      - name: Build kas-isar image
-        uses: docker/build-push-action@v5
-        with:
-          context: /home/runner/kas-clone
-          no-cache: true
-          target: kas-isar
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            SOURCE_DATE_EPOCH=${{ env.SOURCE_DATE_EPOCH }}
-            DEBIAN_TAG=${{ env.DEBIAN_TAG }}
-          outputs: type=registry,rewrite-timestamp=true
-          tags: |
-            ghcr.io/siemens/kas/kas-isar
-            ghcr.io/siemens/kas/kas-isar:${{ env.RELEASE_VERSION }}
-            ghcr.io/siemens/kas/kas-isar:latest-release
+            ghcr.io/siemens/kas/${{ matrix.image-name }}
+            ghcr.io/siemens/kas/${{ matrix.image-name }}:${{ env.RELEASE_VERSION }}
+            ghcr.io/siemens/kas/${{ matrix.image-name }}:latest-release
diff --git a/image-tests/isar/kas.yml → image-tests/kas-isar/kas.yml b/image-tests/isar/kas.yml → image-tests/kas-isar/kas.yml
diff --git a/image-tests/poky/kas.yml → image-tests/kas/kas.yml b/image-tests/poky/kas.yml → image-tests/kas/kas.yml