From 507a89bb325ee75efa74582d370601c9dcf4dc6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Fri, 21 Jul 2023 00:14:34 +0200
Subject: [PATCH] gha: cc-payload: Adjust to using main componenets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Again, it'll make our lives easier in the near future.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 .../cc-payload-after-push-amd64.yaml          | 22 +++++++++---------
 .../cc-payload-after-push-s390x.yaml          |  6 ++---
 .github/workflows/cc-payload-amd64.yaml       | 23 ++++++++++---------
 .github/workflows/cc-payload-s390x.yaml       |  6 ++---
 4 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/cc-payload-after-push-amd64.yaml b/.github/workflows/cc-payload-after-push-amd64.yaml
index 0d1d025103..e26187e5c5 100644
--- a/.github/workflows/cc-payload-after-push-amd64.yaml
+++ b/.github/workflows/cc-payload-after-push-amd64.yaml
@@ -14,22 +14,22 @@ jobs:
         measured_rootfs:
           - no
         asset:
-          - cc-cloud-hypervisor
-          - cc-qemu
-          - cc-virtiofsd
-          - cc-sev-kernel
-          - cc-sev-ovmf
-          - cc-x86_64-ovmf
-          - cc-snp-qemu
+          - cloud-hypervisor
+          - qemu
+          - virtiofsd
+          - kernel-sev
+          - ovmf-sev
+          - ovmf
+          - qemu-snp-experimental
+          - qemu-tdx-exprimental
           - cc-sev-rootfs-initrd
-          - cc-tdx-qemu
           - cc-tdx-td-shim
-          - cc-tdx-tdvf
+          - tdvf
         include:
           - measured_rootfs: yes
-            asset: cc-kernel
+            asset: kernel
           - measured_rootfs: yes
-            asset: cc-tdx-kernel
+            asset: kernel-tdx-experimental
           - measured_rootfs: yes
             asset: cc-rootfs-image
           - measured_rootfs: yes
diff --git a/.github/workflows/cc-payload-after-push-s390x.yaml b/.github/workflows/cc-payload-after-push-s390x.yaml
index ccfdd82218..0f5801e2c8 100644
--- a/.github/workflows/cc-payload-after-push-s390x.yaml
+++ b/.github/workflows/cc-payload-after-push-s390x.yaml
@@ -14,13 +14,13 @@ jobs:
         measured_rootfs:
           - no
         asset:
-          - cc-qemu
+          - qemu
           - cc-rootfs-initrd
           - cc-se-image
-          - cc-virtiofsd
+          - virtiofsd
         include:
           - measured_rootfs: yes
-            asset: cc-kernel
+            asset: kernel
           - measured_rootfs: yes
             asset: cc-rootfs-image
     steps:
diff --git a/.github/workflows/cc-payload-amd64.yaml b/.github/workflows/cc-payload-amd64.yaml
index b1f2510ead..56649657b9 100644
--- a/.github/workflows/cc-payload-amd64.yaml
+++ b/.github/workflows/cc-payload-amd64.yaml
@@ -14,22 +14,23 @@ jobs:
         measured_rootfs:
           - no
         asset:
-          - cc-cloud-hypervisor
-          - cc-qemu
-          - cc-virtiofsd
-          - cc-sev-kernel
-          - cc-sev-ovmf
-          - cc-x86_64-ovmf
-          - cc-snp-qemu
+          - cloud-hypervisor
+          - qemu
+          - virtiofsd
+          - kernel-sev
+          - kernel-snp-experimental
+          - ovmf-sev
+          - ovmf
+          - qemu-snp-experimental
+          - qemu-tdx-experimental
           - cc-sev-rootfs-initrd
-          - cc-tdx-qemu
           - cc-tdx-td-shim
-          - cc-tdx-tdvf
+          - tdvf
         include:
           - measured_rootfs: yes
-            asset: cc-kernel
+            asset: kernel
           - measured_rootfs: yes
-            asset: cc-tdx-kernel
+            asset: kernel-tdx-experimental
           - measured_rootfs: yes
             asset: cc-rootfs-image
           - measured_rootfs: yes
diff --git a/.github/workflows/cc-payload-s390x.yaml b/.github/workflows/cc-payload-s390x.yaml
index 1796308a80..66e48738f3 100644
--- a/.github/workflows/cc-payload-s390x.yaml
+++ b/.github/workflows/cc-payload-s390x.yaml
@@ -14,11 +14,11 @@ jobs:
         measured_rootfs:
           - no
         asset:
-          - cc-qemu
-          - cc-virtiofsd
+          - qemu
+          - virtiofsd
         include:
           - measured_rootfs: yes
-            asset: cc-kernel
+            asset: kernel
           - measured_rootfs: yes
             asset: cc-rootfs-image
     steps: