From f20caac1c02719ebbc78657792da00901beb7025 Mon Sep 17 00:00:00 2001 From: Saul Paredes Date: Wed, 3 Apr 2024 15:42:28 -0700 Subject: [PATCH] gha: ensure unique resource group name There's an rg name duplication situation that got introduced by #9385 where 2 different test runs might have same rg name. Add back uniqueness by including the first letter of GENPOLICY_PULL_METHOD to cluster name. Fixes: #9412 Signed-off-by: Saul Paredes --- tests/gha-run-k8s-common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/gha-run-k8s-common.sh b/tests/gha-run-k8s-common.sh index 80ac2af023..b6862e30c2 100644 --- a/tests/gha-run-k8s-common.sh +++ b/tests/gha-run-k8s-common.sh @@ -13,6 +13,7 @@ source "${tests_dir}/common.bash" K8S_TEST_HOST_TYPE="${K8S_TEST_HOST_TYPE:-small}" GH_PR_NUMBER="${GH_PR_NUMBER:-}" +GENPOLICY_PULL_METHOD="${GENPOLICY_PULL_METHOD:-oci-distribution}" function _print_instance_type() { case ${K8S_TEST_HOST_TYPE} in @@ -39,7 +40,7 @@ function _print_cluster_name() { echo "$AKS_NAME" else short_sha="$(git rev-parse --short=12 HEAD)" - echo "${test_type}-${GH_PR_NUMBER}-${short_sha}-${KATA_HYPERVISOR}-${KATA_HOST_OS}-amd64-${K8S_TEST_HOST_TYPE:0:1}" + echo "${test_type}-${GH_PR_NUMBER}-${short_sha}-${KATA_HYPERVISOR}-${KATA_HOST_OS}-amd64-${K8S_TEST_HOST_TYPE:0:1}-${GENPOLICY_PULL_METHOD:0:1}" fi }