From 09c4828ac3a912366c44d9a5c2246872044c77cd Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Fri, 17 Mar 2023 15:28:47 -0300 Subject: [PATCH 1/2] workflows: add missing artifacts on payload-after-push The kata-deploy-ci payloads for amd64 and arm64 were missing the shim-v2 and kernel-dragonball-experimental artifacts. Fixes #6493 Signed-off-by: Wainer dos Santos Moschetta --- .github/workflows/payload-after-push-amd64.yaml | 2 ++ .github/workflows/payload-after-push-arm64.yaml | 2 ++ .github/workflows/payload-after-push-s390x.yaml | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/payload-after-push-amd64.yaml b/.github/workflows/payload-after-push-amd64.yaml index 2b4814b84a..ef2f976eb7 100644 --- a/.github/workflows/payload-after-push-amd64.yaml +++ b/.github/workflows/payload-after-push-amd64.yaml @@ -15,10 +15,12 @@ jobs: - cloud-hypervisor - firecracker - kernel + - kernel-dragonball-experimental - nydus - qemu - rootfs-image - rootfs-initrd + - shim-v2 - virtiofsd steps: - name: Login to Kata Containers quay.io diff --git a/.github/workflows/payload-after-push-arm64.yaml b/.github/workflows/payload-after-push-arm64.yaml index c7315bab01..e25cd60f0c 100644 --- a/.github/workflows/payload-after-push-arm64.yaml +++ b/.github/workflows/payload-after-push-arm64.yaml @@ -15,10 +15,12 @@ jobs: - cloud-hypervisor - firecracker - kernel + - kernel-dragonball-experimental - nydus - qemu - rootfs-image - rootfs-initrd + - shim-v2 - virtiofsd steps: - name: Login to Kata Containers quay.io diff --git a/.github/workflows/payload-after-push-s390x.yaml b/.github/workflows/payload-after-push-s390x.yaml index 4fa1472051..df9afa9f9f 100644 --- a/.github/workflows/payload-after-push-s390x.yaml +++ b/.github/workflows/payload-after-push-s390x.yaml @@ -13,10 +13,10 @@ jobs: matrix: asset: - kernel - - shim-v2 - qemu - rootfs-image - rootfs-initrd + - shim-v2 - virtiofsd steps: - name: Login to Kata Containers quay.io From 4f0887ce42a5ef65d40d6d9ae4745007951a8481 Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Fri, 17 Mar 2023 16:09:21 -0300 Subject: [PATCH 2/2] kata-deploy: fix install failing to chmod runtime-rs/bin/* The kata-deploy install method tried to `chmod +x /opt/kata/runtime-rs/bin/*` but it isn't always true that /opt/kata/runtime-rs/bin/ exists. For example, the s390x payload does not build the kernel-dragonball-experimental artifacts. So let's ensure the dir exist before issuing the command. Fixes #6494 Signed-off-by: Wainer dos Santos Moschetta --- tools/packaging/kata-deploy/scripts/kata-deploy.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh index a4a4f9d5cd..e4e48732bc 100755 --- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh @@ -58,7 +58,8 @@ function install_artifacts() { echo "copying kata artifacts onto host" cp -au /opt/kata-artifacts/opt/kata/* /opt/kata/ chmod +x /opt/kata/bin/* - chmod +x /opt/kata/runtime-rs/bin/* + [ -d /opt/kata/runtime-rs/bin ] && \ + chmod +x /opt/kata/runtime-rs/bin/* } function configure_cri_runtime() {