Skip to content

Commit 9108a7d

Browse files
pjohnst5pjohnst5
committed
windows arm64 is not supported yet
1 parent 1322b3a commit 9108a7d

File tree

6 files changed

+419
-417
lines changed

6 files changed

+419
-417
lines changed

‎.pipelines/pipeline.yaml‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -309,15 +309,16 @@ stages:
309309
dependsOn: "containerize"
310310

311311
# Azure Overlay E2E Stateless CNI tests
312-
- template: singletenancy/azure-cni-overlay-stateless/azure-cni-overlay-stateless-e2e-job-template.yaml
313-
parameters:
314-
name: "azure_overlay_stateless_e2e"
315-
displayName: Azure Stateless CNI Overlay
316-
os: windows
317-
clusterType: overlay-byocni-up
318-
clusterName: "statelesswin"
319-
vmSize: Standard_B2ms
320-
dependsOn: "containerize"
312+
# Windows is not supported for arm64 yet
313+
# - template: singletenancy/azure-cni-overlay-stateless/azure-cni-overlay-stateless-e2e-job-template.yaml
314+
# parameters:
315+
# name: "azure_overlay_stateless_e2e"
316+
# displayName: Azure Stateless CNI Overlay
317+
# os: windows
318+
# clusterType: overlay-byocni-up
319+
# clusterName: "statelesswin"
320+
# vmSize: Standard_B2ms
321+
# dependsOn: "containerize"
321322

322323
# AKS Swift E2E tests
323324
- template: singletenancy/aks-swift/e2e-job-template.yaml
@@ -356,19 +357,19 @@ stages:
356357
k8sVersion: 1.25
357358
scaleup: 100
358359
dependsOn: "containerize"
359-
360-
- template: singletenancy/aks/e2e-job-template.yaml
361-
parameters:
362-
name: "aks_windows_22_e2e"
363-
displayName: AKS Windows 2022
364-
arch: amd64
365-
os: windows
366-
clusterType: windows-cniv1-up
367-
clusterName: "win22e2e"
368-
vmSize: Standard_B2ms
369-
os_version: "ltsc2022"
370-
scaleup: 50
371-
dependsOn: "containerize"
360+
# Windows is not supported for arm64 yet
361+
# - template: singletenancy/aks/e2e-job-template.yaml
362+
# parameters:
363+
# name: "aks_windows_22_e2e"
364+
# displayName: AKS Windows 2022
365+
# arch: amd64
366+
# os: windows
367+
# clusterType: windows-cniv1-up
368+
# clusterName: "win22e2e"
369+
# vmSize: Standard_B2ms
370+
# os_version: "ltsc2022"
371+
# scaleup: 50
372+
# dependsOn: "containerize"
372373

373374
# CNI dual stack overlay E2E tests
374375
- template: singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
@@ -409,7 +410,7 @@ stages:
409410
- cilium_h_overlay_e2e
410411
- aks_ubuntu_22_linux_e2e
411412
- aks_swift_vnetscale_e2e
412-
- aks_windows_22_e2e
413+
# - aks_windows_22_e2e
413414
- dualstackoverlay_e2e
414415
- cilium_dualstackoverlay_e2e
415416
- swiftv2_e2e
@@ -454,10 +455,10 @@ stages:
454455
name: aks_ubuntu_22_linux_e2e
455456
clusterName: "ubuntu22e2e"
456457
region: $(REGION_AKS_CLUSTER_TEST)
457-
aks_windows_22_e2e:
458-
name: aks_windows_22_e2e
459-
clusterName: "win22e2e"
460-
region: $(REGION_AKS_CLUSTER_TEST)
458+
# aks_windows_22_e2e:
459+
# name: aks_windows_22_e2e
460+
# clusterName: "win22e2e"
461+
# region: $(REGION_AKS_CLUSTER_TEST)
461462
dualstackoverlay_e2e:
462463
name: dualstackoverlay_e2e
463464
clusterName: "dsovere2e"

‎.pipelines/singletenancy/azure-cni-overlay-stateless/azure-cni-overlay-stateless-e2e-job-template.yaml‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -28,84 +28,84 @@ stages:
2828
k8sVersion: ${{ parameters.k8sVersion }}
2929
dependsOn: ${{ parameters.dependsOn }}
3030
region: $(REGION_AKS_CLUSTER_TEST)
31-
- job: windows_nodepool
32-
displayName: Add Windows Nodepool
33-
dependsOn: ${{ parameters.name }}
34-
pool:
35-
name: $(BUILD_POOL_NAME_DEFAULT)
36-
demands:
37-
- agent.os -equals Linux
38-
- Role -equals $(CUSTOM_E2E_ROLE)
39-
steps:
40-
- task: AzureCLI@2
41-
inputs:
42-
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
43-
scriptLocation: "inlineScript"
44-
scriptType: "bash"
45-
addSpnToEnvironment: true
46-
inlineScript: |
47-
set -e
48-
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
49-
make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(commitID) VM_SIZE_WIN=${{ parameters.vmSize }}
50-
echo "Windows node are successfully added to v4 Overlay Cluster"
51-
kubectl cluster-info
52-
kubectl get node -owide
53-
kubectl get po -owide -A
54-
name: "Add_Windows_Node"
55-
displayName: "Add windows node on v4 overlay cluster"
31+
# - job: windows_nodepool
32+
# displayName: Add Windows Nodepool
33+
# dependsOn: ${{ parameters.name }}
34+
# pool:
35+
# name: $(BUILD_POOL_NAME_DEFAULT)
36+
# demands:
37+
# - agent.os -equals Linux
38+
# - Role -equals $(CUSTOM_E2E_ROLE)
39+
# steps:
40+
# - task: AzureCLI@2
41+
# inputs:
42+
# azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
43+
# scriptLocation: "inlineScript"
44+
# scriptType: "bash"
45+
# addSpnToEnvironment: true
46+
# inlineScript: |
47+
# set -e
48+
# make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
49+
# make -C ./hack/aks windows-nodepool-up AZCLI=az SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }}-$(commitID) VM_SIZE_WIN=${{ parameters.vmSize }}
50+
# echo "Windows node are successfully added to v4 Overlay Cluster"
51+
# kubectl cluster-info
52+
# kubectl get node -owide
53+
# kubectl get po -owide -A
54+
# name: "Add_Windows_Node"
55+
# displayName: "Add windows node on v4 overlay cluster"
5656

57-
- stage: ${{ parameters.name }}
58-
displayName: E2E - ${{ parameters.displayName }}
59-
dependsOn:
60-
- setup
61-
- publish
62-
- ${{ parameters.clusterName }}
63-
variables:
64-
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
65-
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
66-
GOBIN: "$(GOPATH)/bin" # Go binaries path
67-
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
68-
pool:
69-
name: $(BUILD_POOL_NAME_DEFAULT)
70-
jobs:
71-
- job: ${{ parameters.name }}_windows
72-
displayName: Azure Stateless CNI Overlay Test Suite | Windows - (${{ parameters.name }})
73-
pool:
74-
name: $(BUILD_POOL_NAME_DEFAULT)
75-
demands:
76-
- agent.os -equals Linux
77-
- Role -equals $(CUSTOM_E2E_ROLE)
78-
steps:
79-
- template: azure-cni-overlay-stateless-e2e-step-template.yaml
80-
parameters:
81-
name: ${{ parameters.name }}
82-
clusterName: ${{ parameters.clusterName }}-$(commitID)
83-
os: windows
84-
vmSizeWin: ${{ parameters.vmSize }}
57+
# - stage: ${{ parameters.name }}
58+
# displayName: E2E - ${{ parameters.displayName }}
59+
# dependsOn:
60+
# - setup
61+
# - publish
62+
# - ${{ parameters.clusterName }}
63+
# variables:
64+
# commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
65+
# GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
66+
# GOBIN: "$(GOPATH)/bin" # Go binaries path
67+
# modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
68+
# pool:
69+
# name: $(BUILD_POOL_NAME_DEFAULT)
70+
# jobs:
71+
# - job: ${{ parameters.name }}_windows
72+
# displayName: Azure Stateless CNI Overlay Test Suite | Windows - (${{ parameters.name }})
73+
# pool:
74+
# name: $(BUILD_POOL_NAME_DEFAULT)
75+
# demands:
76+
# - agent.os -equals Linux
77+
# - Role -equals $(CUSTOM_E2E_ROLE)
78+
# steps:
79+
# - template: azure-cni-overlay-stateless-e2e-step-template.yaml
80+
# parameters:
81+
# name: ${{ parameters.name }}
82+
# clusterName: ${{ parameters.clusterName }}-$(commitID)
83+
# os: windows
84+
# vmSizeWin: ${{ parameters.vmSize }}
8585

86-
- template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
87-
parameters:
88-
sub: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
89-
clusterName: ${{ parameters.clusterName }}-$(commitID)
90-
os: windows
91-
dependsOn: ${{ parameters.name }}_windows
92-
datapath: true
93-
dns: true
94-
portforward: true
95-
hostport: true
96-
service: true
97-
hybridWin: true
86+
# - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
87+
# parameters:
88+
# sub: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
89+
# clusterName: ${{ parameters.clusterName }}-$(commitID)
90+
# os: windows
91+
# dependsOn: ${{ parameters.name }}_windows
92+
# datapath: true
93+
# dns: true
94+
# portforward: true
95+
# hostport: true
96+
# service: true
97+
# hybridWin: true
9898

99-
- job: failedE2ELogs_windows
100-
displayName: "Windows Failure Logs"
101-
dependsOn:
102-
- ${{ parameters.name }}_windows
103-
- cni_windows
104-
condition: in(dependencies.${{ parameters.name }}_windows.result, 'Failed')
105-
steps:
106-
- template: ../../templates/log-template.yaml
107-
parameters:
108-
clusterName: ${{ parameters.clusterName }}-$(commitID)
109-
os: windows
110-
cni: cniv2
99+
# - job: failedE2ELogs_windows
100+
# displayName: "Windows Failure Logs"
101+
# dependsOn:
102+
# - ${{ parameters.name }}_windows
103+
# - cni_windows
104+
# condition: in(dependencies.${{ parameters.name }}_windows.result, 'Failed')
105+
# steps:
106+
# - template: ../../templates/log-template.yaml
107+
# parameters:
108+
# clusterName: ${{ parameters.clusterName }}-$(commitID)
109+
# os: windows
110+
# cni: cniv2
111111

0 commit comments

Comments
 (0)