Skip to content

Commit bc7da50

Browse files
k8s-ci-robotvomba
authored andcommitted
Merge pull request kubernetes-sigs#1926 from mboersma/revert-update-azure-vm
Revert Azure VM update and sync test regions
2 parents 66cbaa5 + 9ddb060 commit bc7da50

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

images/capi/packer/azure/azure-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"containerd_wasm_shims_runtimes": "lunatic,slight,spin,wws",
66
"subscription_id": "{{env `AZURE_SUBSCRIPTION_ID`}}",
77
"use_azure_cli_auth": "{{env `USE_AZURE_CLI_AUTH`}}",
8-
"vm_size": "Standard_B2als_v2"
8+
"vm_size": "Standard_B2ms"
99
}

images/capi/scripts/ci-azure-e2e.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,20 @@ fi
6666
set -o nounset
6767

6868
get_random_region() {
69-
local REGIONS=("australiaeast" "canadacentral" "eastus" "eastus2" "northcentralus" "northeurope" "uksouth" "westeurope" "westus2")
69+
# Regions appear more than once to represent the approximate relative amount
70+
# of Standard BS v2 quota in each region.
71+
local REGIONS=(
72+
"australiaeast"
73+
"canadacentral" "canadacentral" "canadacentral"
74+
"francecentral"
75+
"germanywestcentral"
76+
"switzerlandnorth" "switzerlandnorth" "switzerlandnorth"
77+
"uksouth"
78+
)
7079
echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}"
7180
}
7281

73-
export VALID_CVM_LOCATIONS=("eastus" "northeurope" "westeurope" "westus")
82+
export VALID_CVM_LOCATIONS=("eastus" "germanywestcentral" "northeurope" "switzerlandnorth" "uksouth" "westeurope" "westus")
7483
get_random_cvm_region() {
7584
echo "${VALID_CVM_LOCATIONS[${RANDOM} % ${#VALID_CVM_LOCATIONS[@]}]}"
7685
}

0 commit comments

Comments
 (0)