Merge pull request #2292 from monianshouhou/modify_location_1.1

[release-1.1] fix: switch all ado tests location to eastus

.pipelines/scripts/run-e2e.sh

@@ -27,7 +27,7 @@ az extension add -n aks-preview
 az login --service-principal -u "${AZURE_CLIENT_ID}" -p "${AZURE_CLIENT_SECRET}" --tenant "${AZURE_TENANT_ID}"
 
 get_random_location() {
-  local LOCATIONS=("eastus" "eastus2" "southcentralus" "westus3")
+  local LOCATIONS=("eastus")
   echo "${LOCATIONS[${RANDOM} % ${#LOCATIONS[@]}]}"
 }
 
@@ -43,9 +43,6 @@ cleanup() {
 trap cleanup EXIT
 
 export AZURE_LOCATION="$(get_random_location)"
-if [[ "${CLUSTER_TYPE}" =~ "autoscaling" ]]; then
-  export AZURE_LOCATION="australiaeast"
-fi
 
 IMAGE_TAG="$(git rev-parse --short=7 HEAD)"
 CLUSTER_CONFIG_PATH="${REPO_ROOT}/.pipelines/templates/basic-lb.json"
@@ -90,7 +87,7 @@ echo "Running e2e"
 
 # TODO: We should do it in autoscaling-multipool.json
 if [[ "${CLUSTER_TYPE}" == "autoscaling-multipool" ]]; then
-  az aks update --resource-group "${RESOURCE_GROUP}" --name "${CLUSTER_NAME}" --cluster-autoscaler-profile balance-similar-node-groups=true
+  az aks update --subscription ${AZURE_SUBSCRIPTION_ID} --resource-group "${RESOURCE_GROUP}" --name "${CLUSTER_NAME}" --cluster-autoscaler-profile balance-similar-node-groups=true
 fi
 
 export E2E_ON_AKS_CLUSTER=true

tests/e2e/autoscaling/autoscaler.go

@@ -272,9 +272,6 @@ var _ = Describe("Cluster size autoscaler", Label(utils.TestSuiteLabelFeatureAut
 
 		targetNodeCount := initNodeCount
 		expectedNode := 50
-		if os.Getenv(utils.AKSTestCCM) != "" {
-			expectedNode = 40
-		}
 		for {
 			*scaleUpDeployment.Spec.Replicas += 5
 			targetNodeCount += 5
@@ -314,9 +311,6 @@ var _ = Describe("Cluster size autoscaler", Label(utils.TestSuiteLabelFeatureAut
 
 		targetNodeCount := initNodeCount
 		expectedNode := 50
-		if os.Getenv(utils.AKSTestCCM) != "" {
-			expectedNode = 38
-		}
 		for {
 			*scaleUpDeployment.Spec.Replicas += int32(expectedNode / 2)
 			targetNodeCount += expectedNode / 2