Merge pull request #5359 from k8s-infra-cherrypick-robot/cherry-pick-5358-to-release-1.16

jackfrancis · web-flow · commit 60f49669ce3e · 2025-01-07T15:32:26.000-08:00
[release-1.16] Remove `northeurope` from random region selection to be used for perf tests
diff --git a/hack/util.sh b/hack/util.sh
@@ -63,12 +63,12 @@ capz::util::should_build_ccm() {
 
 # all test regions must support AvailabilityZones
 capz::util::get_random_region() {
-    local REGIONS=("australiaeast" "canadacentral" "francecentral" "germanywestcentral" "northeurope" "switzerlandnorth" "uksouth" )
+    local REGIONS=("australiaeast" "canadacentral" "francecentral" "germanywestcentral" "switzerlandnorth" "uksouth" )
     echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}"
 }
 # all regions below must have GPU availability for the chosen GPU VM SKU
 capz::util::get_random_region_gpu() {
-    local REGIONS=("eastus" "eastus2" "northeurope" "uksouth" "westeurope" "westus2")
+    local REGIONS=("eastus" "eastus2" "uksouth" "westeurope" "westus2")
     echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}"
 }
 # all regions below must support ExtendedLocation

Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,12 @@ capz::util::should_build_ccm() {`
`63`	`63`
`64`	`64`	`# all test regions must support AvailabilityZones`
`65`	`65`	`capz::util::get_random_region() {`
`66`		`- local REGIONS=("australiaeast" "canadacentral" "francecentral" "germanywestcentral" "northeurope" "switzerlandnorth" "uksouth" )`
	`66`	`+ local REGIONS=("australiaeast" "canadacentral" "francecentral" "germanywestcentral" "switzerlandnorth" "uksouth" )`
`67`	`67`	`echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}"`
`68`	`68`	`}`
`69`	`69`	`# all regions below must have GPU availability for the chosen GPU VM SKU`
`70`	`70`	`capz::util::get_random_region_gpu() {`
`71`		`- local REGIONS=("eastus" "eastus2" "northeurope" "uksouth" "westeurope" "westus2")`
	`71`	`+ local REGIONS=("eastus" "eastus2" "uksouth" "westeurope" "westus2")`
`72`	`72`	`echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}"`
`73`	`73`	`}`
`74`	`74`	`# all regions below must support ExtendedLocation`