Fix bash syntax for make cleanup-workload-identity

Author: nojnhuh

Makefile

@@ -778,7 +778,7 @@ create-bootstrap: $(KUBECTL) ## Create bootstrap cluster (AKS or KIND) for CAPZ
 .PHONY: cleanup-workload-identity
 cleanup-workload-identity: ## Cleanup CI workload-identity infra
 	@if ! [ "$(AZWI_SKIP_CLEANUP)" == "true" ]; then \
-		./scripts/cleanup-workload-identity.sh \
+		./scripts/cleanup-workload-identity.sh; \
 	fi
 
 ## --------------------------------------

hack/util.sh

@@ -114,3 +114,7 @@ capz::util::ensure_azure_envs() {
     : "${AZURE_SUBSCRIPTION_ID:?Environment variable empty or not defined.}"
     : "${AZURE_TENANT_ID:?Environment variable empty or not defined.}"
 }
+
+capz::util::random_suffix() {
+    od -An -N8 -tx8 /dev/urandom | tr -d ' ' | head -c 16
+}

scripts/ci-conformance.sh

@@ -82,6 +82,8 @@ export AZURE_LOCATION_EDGEZONE="${AZURE_LOCATION_EDGEZONE:-$(capz::util::get_ran
 export AZURE_CONTROL_PLANE_MACHINE_TYPE="${AZURE_CONTROL_PLANE_MACHINE_TYPE:-"Standard_B2s"}"
 export AZURE_NODE_MACHINE_TYPE="${AZURE_NODE_MACHINE_TYPE:-"Standard_B2s"}"
 export WINDOWS="${WINDOWS:-false}"
+AZWI_RESOURCE_GROUP=capz-wi-$(capz::util::random_suffix)
+export AZWI_RESOURCE_GROUP
 
 # Generate SSH key.
 capz::util::generate_ssh_key

scripts/ci-e2e.sh

@@ -70,6 +70,8 @@ export AZURE_CONTROL_PLANE_MACHINE_TYPE="${AZURE_CONTROL_PLANE_MACHINE_TYPE:-"St
 export AZURE_NODE_MACHINE_TYPE="${AZURE_NODE_MACHINE_TYPE:-"Standard_B2s"}"
 CALICO_VERSION=$(make get-calico-version)
 export CALICO_VERSION
+AZWI_RESOURCE_GROUP=capz-wi-$(capz::util::random_suffix)
+export AZWI_RESOURCE_GROUP
 
 
 capz::util::generate_ssh_key