From eb463b38ec027ca80e86ffdcd75d6fddf7403053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 9 Aug 2023 20:29:25 +0200 Subject: [PATCH 1/2] ci: unencrypted-image: Don't fail to build on s390x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's make sure that we don't fail in case we're building non x86_64. Signed-off-by: Fabiano Fidêncio --- .../runtimeclass_workloads/confidential/unencrypted/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/kubernetes/runtimeclass_workloads/confidential/unencrypted/Dockerfile b/tests/integration/kubernetes/runtimeclass_workloads/confidential/unencrypted/Dockerfile index e4db179394..d093c7fe86 100644 --- a/tests/integration/kubernetes/runtimeclass_workloads/confidential/unencrypted/Dockerfile +++ b/tests/integration/kubernetes/runtimeclass_workloads/confidential/unencrypted/Dockerfile @@ -19,7 +19,7 @@ RUN /bin/sh -c \ curl -LO https://github.com/klauspost/cpuid/releases/download/v2.2.5/cpuid-Linux_x86_64_2.2.5.tar.gz && \ tar -xvzf cpuid-Linux_x86_64_2.2.5.tar.gz -C /usr/bin && \ rm -rf cpuid-Linux_x86_64_2.2.5.tar.gz && \ - rm -f /usr/bin/LICENSE' + rm -f /usr/bin/LICENSE' || true # This is done just to avoid the following error starting sshd # `sshd: no hostkeys available -- exiting.` From 03d1fa67b1c63087279a2a3e90846cd327581eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 9 Aug 2023 20:31:26 +0200 Subject: [PATCH 2/2] ci: unencrypted-image: Fix build context MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build context should be the folder where the Dockerfile is present, otherwise the files copied into the image won't be found. Fixes: #7595 Signed-off-by: Fabiano Fidêncio --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f2088e2fd7..da8fae148a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -56,7 +56,7 @@ jobs: with: tags: ghcr.io/kata-containers/test-images:unencrypted-${{ inputs.pr-number }} push: true - context: . + context: tests/integration/kubernetes/runtimeclass_workloads/confidential/unencrypted/ platforms: linux/amd64, linux/s390x file: tests/integration/kubernetes/runtimeclass_workloads/confidential/unencrypted/Dockerfile