From dbae281924b3327755af1ecd0023b792097212ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Mon, 6 Mar 2023 11:30:27 +0100
Subject: [PATCH] workflows: Properly set the kata-tarball architecture
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Let's make sure the kata-tarball architecture upload / downloaded / used
is exactly the same one that we need as part of the architecture we're
using to generate the image.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 .github/workflows/payload-after-push-amd64.yaml | 8 ++++----
 .github/workflows/payload-after-push-arm64.yaml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/payload-after-push-amd64.yaml b/.github/workflows/payload-after-push-amd64.yaml
index 88497ca458..2b4814b84a 100644
--- a/.github/workflows/payload-after-push-amd64.yaml
+++ b/.github/workflows/payload-after-push-amd64.yaml
@@ -45,7 +45,7 @@ jobs:
       - name: store-artifact ${{ matrix.asset }}
         uses: actions/upload-artifact@v3
         with:
-          name: kata-artifacts
+          name: kata-artifacts-amd64
           path: kata-build/kata-static-${{ matrix.asset }}.tar.xz
           retention-days: 1
           if-no-files-found: error
@@ -58,7 +58,7 @@ jobs:
       - name: get-artifacts
         uses: actions/download-artifact@v3
         with:
-          name: kata-artifacts
+          name: kata-artifacts-amd64
           path: kata-artifacts
       - name: merge-artifacts
         run: |
@@ -66,7 +66,7 @@ jobs:
       - name: store-artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: kata-static-tarball
+          name: kata-static-tarball-amd64
           path: kata-static.tar.xz
           retention-days: 1
           if-no-files-found: error
@@ -86,7 +86,7 @@ jobs:
       - name: get-kata-tarball
         uses: actions/download-artifact@v3
         with:
-          name: kata-static-tarball
+          name: kata-static-tarball-amd64
 
       - name: build-and-push-kata-payload
         id: build-and-push-kata-payload
diff --git a/.github/workflows/payload-after-push-arm64.yaml b/.github/workflows/payload-after-push-arm64.yaml
index 56faeb10e5..c7315bab01 100644
--- a/.github/workflows/payload-after-push-arm64.yaml
+++ b/.github/workflows/payload-after-push-arm64.yaml
@@ -49,7 +49,7 @@ jobs:
       - name: store-artifact ${{ matrix.asset }}
         uses: actions/upload-artifact@v3
         with:
-          name: kata-artifacts
+          name: kata-artifacts-arm64
           path: kata-build/kata-static-${{ matrix.asset }}.tar.xz
           retention-days: 1
           if-no-files-found: error
@@ -66,7 +66,7 @@ jobs:
       - name: get-artifacts
         uses: actions/download-artifact@v3
         with:
-          name: kata-artifacts
+          name: kata-artifacts-arm64
           path: kata-artifacts
       - name: merge-artifacts
         run: |
@@ -74,7 +74,7 @@ jobs:
       - name: store-artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: kata-static-tarball
+          name: kata-static-tarball-arm64
           path: kata-static.tar.xz
           retention-days: 1
           if-no-files-found: error
@@ -98,7 +98,7 @@ jobs:
       - name: get-kata-tarball
         uses: actions/download-artifact@v3
         with:
-          name: kata-static-tarball
+          name: kata-static-tarball-arm64
 
       - name: build-and-push-kata-payload
         id: build-and-push-kata-payload