From 2456eec69ed35d44d1c166e7d752880cae1930e4 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Fri, 5 Feb 2021 16:13:58 -0800 Subject: [PATCH 1/3] test: don't test availability sets + 1.21 --- test/e2e/test_cluster_configs/availabilityset.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/e2e/test_cluster_configs/availabilityset.json b/test/e2e/test_cluster_configs/availabilityset.json index 110c2a7d06..a6121a1a46 100644 --- a/test/e2e/test_cluster_configs/availabilityset.json +++ b/test/e2e/test_cluster_configs/availabilityset.json @@ -5,6 +5,13 @@ "STABILITY_ITERATIONS": "0", "GINKGO_SKIP_AFTER_UPGRADE": "dns-liveness pod" }, + "options": { + "allowedOrchestratorVersions": [ + "1.18", + "1.19", + "1.20" + ] + }, "apiModel": { "apiVersion": "vlabs", "properties": { From 77b9ee328620c6c788d6e5944339f218a059bf8d Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Fri, 5 Feb 2021 16:15:25 -0800 Subject: [PATCH 2/3] json format --- test/e2e/test_cluster_configs/availabilityset.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/e2e/test_cluster_configs/availabilityset.json b/test/e2e/test_cluster_configs/availabilityset.json index a6121a1a46..e0052dbf76 100644 --- a/test/e2e/test_cluster_configs/availabilityset.json +++ b/test/e2e/test_cluster_configs/availabilityset.json @@ -6,11 +6,7 @@ "GINKGO_SKIP_AFTER_UPGRADE": "dns-liveness pod" }, "options": { - "allowedOrchestratorVersions": [ - "1.18", - "1.19", - "1.20" - ] + "allowedOrchestratorVersions": ["1.18", "1.19", "1.20"] }, "apiModel": { "apiVersion": "vlabs", From b46f68ef9650a1ba75246da5b6627e4e445ec08a Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Fri, 5 Feb 2021 16:15:57 -0800 Subject: [PATCH 3/3] again --- test/e2e/test_cluster_configs/availabilityset.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/e2e/test_cluster_configs/availabilityset.json b/test/e2e/test_cluster_configs/availabilityset.json index e0052dbf76..131947e5bc 100644 --- a/test/e2e/test_cluster_configs/availabilityset.json +++ b/test/e2e/test_cluster_configs/availabilityset.json @@ -6,8 +6,12 @@ "GINKGO_SKIP_AFTER_UPGRADE": "dns-liveness pod" }, "options": { - "allowedOrchestratorVersions": ["1.18", "1.19", "1.20"] - }, + "allowedOrchestratorVersions": [ + "1.18", + "1.19", + "1.20" + ] + }, "apiModel": { "apiVersion": "vlabs", "properties": {