From 86c02d9e6d30cd2872d0c82e583a58547c3480bc Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Mon, 21 Sep 2020 11:00:07 -0700 Subject: [PATCH 1/2] fix: E2E scale scenario broken if update is false --- test/e2e/cluster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/cluster.sh b/test/e2e/cluster.sh index d644e51d8a..e242a7e714 100755 --- a/test/e2e/cluster.sh +++ b/test/e2e/cluster.sh @@ -302,8 +302,8 @@ fi if [ "${SCALE_CLUSTER}" = "true" ]; then nodepools=$(jq -r '.properties.agentPoolProfiles[].name' < _output/$RESOURCE_GROUP/apimodel.json) for ((i = 0; i <= ${#nodepools[@]}; ++i)); do + nodepool=$(jq -r --arg i $i '. | .properties.agentPoolProfiles[$i | tonumber].name' < _output/$RESOURCE_GROUP/apimodel.json) if [ -n "$UPDATE_NODE_POOLS" ]; then - nodepool=$(jq -r --arg i $i '. | .properties.agentPoolProfiles[$i | tonumber].name' < _output/$RESOURCE_GROUP/apimodel.json) # modify the master VM SKU to simulate vertical vm scaling via upgrade docker run --rm \ -v $(pwd):${WORK_DIR} \ From e926a95b582260f52e97fdbfb4ccbb9bf8b4360c Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Mon, 21 Sep 2020 14:06:03 -0700 Subject: [PATCH 2/2] wrong comparison --- test/e2e/cluster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/cluster.sh b/test/e2e/cluster.sh index e242a7e714..07fdaaec10 100755 --- a/test/e2e/cluster.sh +++ b/test/e2e/cluster.sh @@ -303,7 +303,7 @@ if [ "${SCALE_CLUSTER}" = "true" ]; then nodepools=$(jq -r '.properties.agentPoolProfiles[].name' < _output/$RESOURCE_GROUP/apimodel.json) for ((i = 0; i <= ${#nodepools[@]}; ++i)); do nodepool=$(jq -r --arg i $i '. | .properties.agentPoolProfiles[$i | tonumber].name' < _output/$RESOURCE_GROUP/apimodel.json) - if [ -n "$UPDATE_NODE_POOLS" ]; then + if [ "${UPDATE_NODE_POOLS}" = "true" ]; then # modify the master VM SKU to simulate vertical vm scaling via upgrade docker run --rm \ -v $(pwd):${WORK_DIR} \