From aa9f21bd19de78d87992460e2b5ea8e1562bf5a1 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Thu, 12 Sep 2024 13:48:38 +0100 Subject: [PATCH] test: Add support for s390x in cosign testing We've added s390x test container image, so add support to use them based on the arch the test is running on Fixes: #10302 Signed-off-by: stevenhorsman fixuop --- .../kubernetes/k8s-guest-pull-image-signature.bats | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/integration/kubernetes/k8s-guest-pull-image-signature.bats b/tests/integration/kubernetes/k8s-guest-pull-image-signature.bats index d214e8b670..4866ae84a0 100644 --- a/tests/integration/kubernetes/k8s-guest-pull-image-signature.bats +++ b/tests/integration/kubernetes/k8s-guest-pull-image-signature.bats @@ -17,11 +17,16 @@ setup() { [ "${SNAPSHOTTER:-}" = "nydus" ] || skip "None snapshotter was found but this test requires one" + tag_suffix="" + if [ "$(uname -m)" != "x86_64" ]; then + tag_suffix="-$(uname -m)" + fi + setup_common UNSIGNED_UNPROTECTED_REGISTRY_IMAGE="quay.io/prometheus/busybox:latest" - UNSIGNED_PROTECTED_REGISTRY_IMAGE="ghcr.io/confidential-containers/test-container-image-rs:unsigned" - COSIGN_SIGNED_PROTECTED_REGISTRY_IMAGE="ghcr.io/confidential-containers/test-container-image-rs:cosign-signed" - COSIGNED_SIGNED_PROTECTED_REGISTRY_WRONG_KEY_IMAGE="ghcr.io/confidential-containers/test-container-image-rs:cosign-signed-key2" + UNSIGNED_PROTECTED_REGISTRY_IMAGE="ghcr.io/confidential-containers/test-container-image-rs:unsigned${tag_suffix}" + COSIGN_SIGNED_PROTECTED_REGISTRY_IMAGE="ghcr.io/confidential-containers/test-container-image-rs:cosign-signed${tag_suffix}" + COSIGNED_SIGNED_PROTECTED_REGISTRY_WRONG_KEY_IMAGE="ghcr.io/confidential-containers/test-container-image-rs:cosign-signed-key2${tag_suffix}" SECURITY_POLICY_KBS_URI="kbs:///default/security-policy/test" }