Skip to content

Commit 98c4b79

Browse files
committed
capz: remove WINDOWS and TEST_WINDOWS env vars
1 parent b21a1d3 commit 98c4b79

File tree

6 files changed

+0
-54
lines changed

6 files changed

+0
-54
lines changed

config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-periodics-main.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,6 @@ periodics:
381381
env:
382382
- name: E2E_ARGS
383383
value: "-kubetest.use-ci-artifacts"
384-
- name: WINDOWS
385-
value: "true"
386384
- name: WINDOWS_FLAVOR
387385
value: "containerd"
388386
# Windows isn't really conformance, we typically run at 4 to keep the time reasonable (~45 mins)
@@ -438,8 +436,6 @@ periodics:
438436
env:
439437
- name: TEST_K8S
440438
value: "true"
441-
- name: WINDOWS
442-
value: "true"
443439
# Windows isn't really conformance, we typically run at 4 to keep the time reasonable (~45 mins)
444440
- name: CONFORMANCE_NODES
445441
value: "4"

config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits-main.yaml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,6 @@ presubmits:
532532
env:
533533
- name: E2E_ARGS
534534
value: "-kubetest.use-ci-artifacts"
535-
- name: WINDOWS
536-
value: "true"
537535
- name: WINDOWS_FLAVOR
538536
value: "containerd"
539537
# Windows isn't really conformance, we typically run at 4 to keep the time reasonable (~45 mins)
@@ -741,11 +739,6 @@ presubmits:
741739
# docker-in-docker needs privileged mode
742740
securityContext:
743741
privileged: true
744-
env:
745-
- name: TEST_WINDOWS
746-
value: "" # disabled
747-
- name: WINDOWS_SERVER_VERSION
748-
value: "windows-2022"
749742
resources:
750743
limits:
751744
cpu: 4
@@ -843,8 +836,6 @@ presubmits:
843836
env:
844837
- name: TEST_K8S
845838
value: "true"
846-
- name: WINDOWS
847-
value: "true"
848839
# Windows isn't really conformance, we typically run at 4 to keep the time reasonable (~45 mins)
849840
- name: CONFORMANCE_NODES
850841
value: "4"
@@ -920,8 +911,6 @@ presubmits:
920911
# CAPZ variables
921912
- name: TEST_K8S
922913
value: "true"
923-
- name: WINDOWS
924-
value: "false"
925914
- name: CLUSTER_TEMPLATE
926915
value: "templates/test/dev/cluster-template-custom-builds-load.yaml"
927916
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -932,8 +921,6 @@ presubmits:
932921
value: "Standard_D8s_v3"
933922
- name: NODE_MACHINE_TYPE
934923
value: "Standard_D8s_v3"
935-
- name: TEST_WINDOWS
936-
value: "false"
937924
- name: "CONTROL_PLANE_MACHINE_COUNT"
938925
value: "5"
939926
- name: WINDOWS_WORKER_MACHINE_COUNT
@@ -1026,8 +1013,6 @@ presubmits:
10261013
# CAPZ variables
10271014
- name: TEST_K8S
10281015
value: "true"
1029-
- name: WINDOWS
1030-
value: "false"
10311016
- name: CLUSTER_TEMPLATE
10321017
value: "templates/test/dev/cluster-template-custom-builds-load-dra.yaml"
10331018
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -1038,8 +1023,6 @@ presubmits:
10381023
value: "Standard_D8s_v3"
10391024
- name: NODE_MACHINE_TYPE
10401025
value: "Standard_D8s_v3"
1041-
- name: TEST_WINDOWS
1042-
value: "false"
10431026
# Don't install Azure disk CSI driver as it's installed using a HelmChartProxy
10441027
- name: DEPLOY_AZURE_CSI_DRIVER
10451028
value: "false"
@@ -1129,8 +1112,6 @@ presubmits:
11291112
# CAPZ variables
11301113
- name: TEST_K8S
11311114
value: "true"
1132-
- name: WINDOWS
1133-
value: "false"
11341115
- name: CLUSTER_TEMPLATE
11351116
value: "templates/test/dev/cluster-template-custom-builds-load.yaml"
11361117
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -1141,8 +1122,6 @@ presubmits:
11411122
value: "Standard_D8s_v3"
11421123
- name: NODE_MACHINE_TYPE
11431124
value: "Standard_D8s_v3"
1144-
- name: TEST_WINDOWS
1145-
value: "false"
11461125
- name: "CONTROL_PLANE_MACHINE_COUNT"
11471126
value: "5"
11481127
- name: WINDOWS_WORKER_MACHINE_COUNT

config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits-release-v1beta1.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -389,11 +389,6 @@ presubmits:
389389
# docker-in-docker needs privileged mode
390390
securityContext:
391391
privileged: true
392-
env:
393-
- name: TEST_WINDOWS
394-
value: "" # disabled
395-
- name: WINDOWS_SERVER_VERSION
396-
value: "windows-2022"
397392
resources:
398393
limits:
399394
cpu: 6

config/jobs/kubernetes/sig-scalability/DRA/sig-scalability-periodic-dra.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ periodics:
5858
# CAPZ variables
5959
- name: TEST_K8S
6060
value: "true"
61-
- name: WINDOWS
62-
value: "false"
6361
- name: CLUSTER_TEMPLATE
6462
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
6563
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -70,8 +68,6 @@ periodics:
7068
value: "Standard_D8s_v3"
7169
- name: NODE_MACHINE_TYPE
7270
value: "Standard_D8s_v3"
73-
- name: TEST_WINDOWS
74-
value: "false"
7571
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
7672
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
7773
- name: AZURE_LOCATION
@@ -180,8 +176,6 @@ periodics:
180176
# CAPZ variables
181177
- name: TEST_K8S
182178
value: "true"
183-
- name: WINDOWS
184-
value: "false"
185179
- name: CLUSTER_TEMPLATE
186180
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
187181
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -192,8 +186,6 @@ periodics:
192186
value: "Standard_D8s_v3"
193187
- name: NODE_MACHINE_TYPE
194188
value: "Standard_D8s_v3"
195-
- name: TEST_WINDOWS
196-
value: "false"
197189
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
198190
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
199191
- name: AZURE_LOCATION

config/jobs/kubernetes/sig-scalability/DRA/sig-scalability-presubmit-dra-capz.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ presubmits:
5858
# CAPZ variables
5959
- name: TEST_K8S
6060
value: "true"
61-
- name: WINDOWS
62-
value: "false"
6361
- name: CLUSTER_TEMPLATE
6462
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
6563
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -70,8 +68,6 @@ presubmits:
7068
value: "Standard_D8s_v3"
7169
- name: NODE_MACHINE_TYPE
7270
value: "Standard_D8s_v3"
73-
- name: TEST_WINDOWS
74-
value: "false"
7571
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
7672
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
7773
# Don't install Azure disk CSI driver as it's installed using a HelmChartProxy
@@ -169,8 +165,6 @@ presubmits:
169165
# CAPZ variables
170166
- name: TEST_K8S
171167
value: "true"
172-
- name: WINDOWS
173-
value: "false"
174168
- name: CLUSTER_TEMPLATE
175169
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
176170
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -181,8 +175,6 @@ presubmits:
181175
value: "Standard_D8s_v3"
182176
- name: NODE_MACHINE_TYPE
183177
value: "Standard_D8s_v3"
184-
- name: TEST_WINDOWS
185-
value: "false"
186178
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
187179
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
188180
# Don't install Azure disk CSI driver as it's installed using a HelmChartProxy
@@ -286,8 +278,6 @@ presubmits:
286278
# CAPZ variables
287279
- name: TEST_K8S
288280
value: "true"
289-
- name: WINDOWS
290-
value: "false"
291281
- name: CLUSTER_TEMPLATE
292282
value: "templates/test/dev/cluster-template-custom-builds-machine-pool-load-dra.yaml"
293283
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -298,8 +288,6 @@ presubmits:
298288
value: "Standard_D2s_v3"
299289
- name: NODE_MACHINE_TYPE
300290
value: "Standard_D2s_v3"
301-
- name: TEST_WINDOWS
302-
value: "false"
303291
- name: MONITORING_MACHINE_COUNT # This is the number of dedicated nodes for prometheus server
304292
value: "1" # We use the same VM size as control plane nodes, see CONTROL_PLANE_MACHINE_TYPE
305293
# Don't install Azure disk CSI driver as it's installed using a HelmChartProxy

config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-azure.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ periodics:
6161
# CAPZ variables
6262
- name: TEST_K8S
6363
value: "true"
64-
- name: WINDOWS
65-
value: "false"
6664
- name: CLUSTER_TEMPLATE
6765
value: "templates/test/dev/cluster-template-custom-builds-load.yaml"
6866
- name: AZURE_CONTROL_PLANE_MACHINE_TYPE
@@ -73,8 +71,6 @@ periodics:
7371
value: "Standard_D8s_v3"
7472
- name: NODE_MACHINE_TYPE
7573
value: "Standard_D8s_v3"
76-
- name: TEST_WINDOWS
77-
value: "false"
7874
- name: "CONTROL_PLANE_MACHINE_COUNT"
7975
value: "5"
8076
- name: WINDOWS_WORKER_MACHINE_COUNT

0 commit comments

Comments
 (0)