From a5143ff198408f75d3b548b87481b1face5f1a0d Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Sat, 30 Apr 2022 18:08:25 -0400 Subject: [PATCH 1/2] fix awk for azure resource group --- tests/e2e/scripts/azure_settings.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/scripts/azure_settings.sh b/tests/e2e/scripts/azure_settings.sh index 3bcb31bc09..a19a8a98c8 100644 --- a/tests/e2e/scripts/azure_settings.sh +++ b/tests/e2e/scripts/azure_settings.sh @@ -4,7 +4,7 @@ CI_AZURE_SUBSCRIPTION_ID=$(cat $CI_JSON_CRED_FILE | awk '/subscriptionId/ { gsub CI_AZURE_CLIENT_ID=$(cat $CI_JSON_CRED_FILE | awk '/clientId/ { gsub(/["]|,.*/,""); print $2}') CI_AZURE_CLIENT_SECRET=$(cat $CI_JSON_CRED_FILE | awk '/clientSecret/ { gsub(/["]|,.*/,""); print $2}') CI_AZURE_TENANT_ID=$(cat $CI_JSON_CRED_FILE | awk '/tenantId/ { gsub(/["]|,.*/,""); print $2}') -CI_AZURE_RESOURCE_GROUP=$(cat $AZURE_RESOURCE_FILE | awk '/infraID/ { gsub(/["]|,.*/,""); print $2}') +CI_AZURE_RESOURCE_GROUP=$(cat $AZURE_RESOURCE_FILE | awk '{ gsub(/["\{\}:]|.*infraID/,"");gsub(/,/," "); print $1}') if [ "$OPENSHIFT_CI" == "true" ]; then\ CI_AZURE_RESOURCE_GROUP="${CI_AZURE_RESOURCE_GROUP}-rg"; \ From fd4b4fae0a37f93d0cd75bb6b6417a72e0fb6c9a Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Sat, 30 Apr 2022 18:33:05 -0400 Subject: [PATCH 2/2] newline proof awk for resourcegroup --- tests/e2e/scripts/azure_settings.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/scripts/azure_settings.sh b/tests/e2e/scripts/azure_settings.sh index a19a8a98c8..ee4d7d1d4c 100644 --- a/tests/e2e/scripts/azure_settings.sh +++ b/tests/e2e/scripts/azure_settings.sh @@ -4,7 +4,7 @@ CI_AZURE_SUBSCRIPTION_ID=$(cat $CI_JSON_CRED_FILE | awk '/subscriptionId/ { gsub CI_AZURE_CLIENT_ID=$(cat $CI_JSON_CRED_FILE | awk '/clientId/ { gsub(/["]|,.*/,""); print $2}') CI_AZURE_CLIENT_SECRET=$(cat $CI_JSON_CRED_FILE | awk '/clientSecret/ { gsub(/["]|,.*/,""); print $2}') CI_AZURE_TENANT_ID=$(cat $CI_JSON_CRED_FILE | awk '/tenantId/ { gsub(/["]|,.*/,""); print $2}') -CI_AZURE_RESOURCE_GROUP=$(cat $AZURE_RESOURCE_FILE | awk '{ gsub(/["\{\}:]|.*infraID/,"");gsub(/,/," "); print $1}') +CI_AZURE_RESOURCE_GROUP=$(cat $AZURE_RESOURCE_FILE | awk '{ gsub(/["\n \{\}:]|.*infraID/,"");gsub(/,/," "); print $1}') if [ "$OPENSHIFT_CI" == "true" ]; then\ CI_AZURE_RESOURCE_GROUP="${CI_AZURE_RESOURCE_GROUP}-rg"; \