ci: tag both amd and arm containers

This PR meant to resolve the CI regression introduced by a413783.

diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index c0ff7c80f2907823d545eb7b8afdf2816005dbe6..6f492b0041d8a6341befbba89c7331274f214683 100644 (file)
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -32,8 +32,8 @@ jobs:
             fail-fast: false
             matrix:
                 architecture:
-                    - {platform: 'linux/amd64', runner: 'ubuntu-24.04'}
-                    - {platform: 'linux/arm64', runner: 'ubuntu-24.04-arm'}
+                    - {platform: 'linux/amd64', runner: 'ubuntu-24.04', tag: 'amd'}
+                    - {platform: 'linux/arm64', runner: 'ubuntu-24.04-arm', tag: 'arm'}
                 config:
                     - {dockerfile: 'Dockerfile-debian', tag: 'debian:latest'}
                     - {dockerfile: 'Dockerfile-fedora', tag: 'fedora:latest'}
@@ -63,6 +63,6 @@ jobs:
               uses: docker/build-push-action@v6
               with:
                   file: test/container/${{ matrix.config.dockerfile }}
-                  tags: ghcr.io/${{env.repository_owner}}/${{ matrix.config.tag }}
+                  tags: ghcr.io/${{env.repository_owner}}/${{ matrix.config.tag }}-${{ matrix.architecture.tag }}
                   push: ${{ github.event_name == 'push' ||  github.event_name == 'schedule' }}
                   platforms: ${{ matrix.architecture.platform }}

diff --git a/.github/workflows/integration-extra.yml b/.github/workflows/integration-extra.yml
index 600ab4263e10d26772c88a9c3ec817fc71001532..871e3d252629b6eeab4272290ff7464ff61ab9e8 100644 (file)
--- a/.github/workflows/integration-extra.yml
+++ b/.github/workflows/integration-extra.yml
@@ -55,7 +55,7 @@ jobs:
                     - "81"
                     - "82"
         container:
-            image: ghcr.io/dracut-ng/${{ matrix.container }}
+            image: ghcr.io/dracut-ng/${{ matrix.container }}-amd
             options: '--device=/dev/kvm --privileged'
         steps:
             - name: "Checkout Repository"

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 6f46e38d2db79a39424e6197be81b980c9a4e1ac..977d1022edec52ba204906303631c7218ae0414c 100644 (file)
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -41,7 +41,7 @@ jobs:
                 test:
                     - "10"
         container:
-            image: ghcr.io/dracut-ng/${{ matrix.container }}
+            image: ghcr.io/dracut-ng/${{ matrix.container }}:latest-amd
             options: '--device=/dev/kvm'
         steps:
             - name: "Checkout Repository"
@@ -90,7 +90,7 @@ jobs:
                     - "80"
                     - "81"
         container:
-            image: ghcr.io/dracut-ng/${{ matrix.container }}
+            image: ghcr.io/dracut-ng/${{ matrix.container }}:latest-amd
             options: '--device=/dev/kvm'
         steps:
             - name: "Checkout Repository"
@@ -120,7 +120,7 @@ jobs:
                     - "41"
                     - "42"
         container:
-            image: ghcr.io/dracut-ng/${{ matrix.container }}
+            image: ghcr.io/dracut-ng/${{ matrix.container }}:latest-amd
             options: '--device=/dev/kvm --privileged'
         steps:
             - name: "Checkout Repository"
@@ -144,7 +144,7 @@ jobs:
                 test:
                     - "82"
         container:
-            image: ghcr.io/dracut-ng/${{ matrix.container }}
+            image: ghcr.io/dracut-ng/${{ matrix.container }}:latest-amd
             options: '--device=/dev/kvm'
         steps:
             - name: "Checkout Repository"
@@ -163,12 +163,12 @@ jobs:
             fail-fast: false
             matrix:
                 container:
-                    - debian-arm64
-                    - fedora-arm64
+                    - debian
+                    - fedora
                 test:
                     - "80"
         container:
-            image: ghcr.io/dracut-ng/${{ matrix.container }}
+            image: ghcr.io/dracut-ng/${{ matrix.container }}:latest-arm
             options: '--privileged'
         steps:
             - name: "Checkout Repository"
@@ -207,7 +207,7 @@ jobs:
                     - container: "opensuse"
                       network: "network-legacy"
         container:
-            image: ghcr.io/dracut-ng/${{ matrix.container }}
+            image: ghcr.io/dracut-ng/${{ matrix.container }}:latest-amd
             options: '--device=/dev/kvm'
         steps:
             - name: "Checkout Repository"
@@ -234,7 +234,7 @@ jobs:
                     - container: "opensuse"
                       network: "network-legacy"
         container:
-            image: ghcr.io/dracut-ng/${{ matrix.container }}
+            image: ghcr.io/dracut-ng/${{ matrix.container }}:latest-amd
             options: '--device=/dev/kvm'
         steps:
             - name: "Checkout Repository"