@@ -15,81 +15,81 @@ jobs:
1515 - job : npm_k8se2e
1616 displayName : " NPM k8s E2E"
1717 dependsOn : ${{ parameters.dependsOn }}
18- condition : and( and( not(canceled()), not(failed()) ), ${{ or(contains(parameters.os_version, '2022'), eq(parameters.os, 'linux') ) }} , or( contains(variables.CONTROL_SCENARIO, 'npm') , contains(variables.CONTROL_SCENARIO, 'all') ) )
18+ condition : and( and( not(canceled()), not(failed()) ), ${{ or(contains(parameters.os_version, '2022'), and( eq(parameters.os, 'linux'), not(contains(parameters.clusterName, 'linux-podsub')) ) ) }} , or( contains(variables.CONTROL_SCENARIO, 'npm') , contains(variables.CONTROL_SCENARIO, 'all') ) )
1919 timeoutInMinutes : 180 # This is for testing windows, due to the 3m between the 14 tests -> results in 42m of wasted time
2020 pool :
2121 name : $(BUILD_POOL_NAME_DEFAULT)
2222 demands :
23- - agent.os -equals Linux
24- - Role -equals Build
23+ - agent.os -equals Linux
24+ - Role -equals Build
2525 steps :
2626 - ${{ if eq(parameters.os, 'linux') }} :
27- - task : AzureCLI@2
28- displayName : " Deploy NPM to Test Cluster"
29- inputs :
30- azureSubscription : ${{ parameters.sub }}
31- scriptType : " bash"
32- scriptLocation : " inlineScript"
33- inlineScript : |
34- set -ex
27+ - task : AzureCLI@2
28+ displayName : " Deploy NPM to Test Cluster"
29+ inputs :
30+ azureSubscription : ${{ parameters.sub }}
31+ scriptType : " bash"
32+ scriptLocation : " inlineScript"
33+ inlineScript : |
34+ set -ex
3535
36- make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
36+ make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
3737
38- # deploy azure-npm
39- kubectl apply -f https://raw.githubusercontent.com/Azure/azure-container-networking/master/npm/azure-npm.yaml
40- kubectl set image daemonset/azure-npm -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:${{ parameters.tag }}
41- kubectl rollout status -n kube-system daemonset/azure-npm
38+ # deploy azure-npm
39+ kubectl apply -f https://raw.githubusercontent.com/Azure/azure-container-networking/master/npm/azure-npm.yaml
40+ kubectl set image daemonset/azure-npm -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:${{ parameters.tag }}
41+ kubectl rollout status -n kube-system daemonset/azure-npm
4242
43- kubectl get po -n kube-system -owide -A
43+ kubectl get po -n kube-system -owide -A
4444
45- # FQDN=`az aks show -n $CLUSTER_NAME -g $CLUSTER_NAME --query fqdn -o tsv`
46- FQDN=`az aks show -g ${{ parameters.clusterName }} -n ${{ parameters.clusterName }} --query fqdn -o tsv`
47- echo $FQDN
48- echo "##vso[task.setvariable variable=FQDN]$FQDN"
45+ # FQDN=`az aks show -n $CLUSTER_NAME -g $CLUSTER_NAME --query fqdn -o tsv`
46+ FQDN=`az aks show -g ${{ parameters.clusterName }} -n ${{ parameters.clusterName }} --query fqdn -o tsv`
47+ echo $FQDN
48+ echo "##vso[task.setvariable variable=FQDN]$FQDN"
4949
50- artifact=npm_k8s
51- echo $artifact/e2e.test
52- echo "##vso[task.setvariable variable=artifact]$artifact"
50+ artifact=npm_k8s
51+ echo $artifact/e2e.test
52+ echo "##vso[task.setvariable variable=artifact]$artifact"
5353
54- download : current
55- artifact : npm_k8s
54+ - download : current
55+ artifact : npm_k8s
5656
5757 - ${{ if eq(parameters.os, 'windows') }} :
58- - task : AzureCLI@2
59- displayName : " Deploy Windows NPM to Test Cluster"
60- inputs :
61- azureSubscription : ${{ parameters.sub }}
62- scriptType : " bash"
63- scriptLocation : " inlineScript"
64- inlineScript : |
65- set -ex
66-
67- make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
68-
69- # deploy azure-npm-win
70- # Windows
71- kubectl apply -f npm/examples/windows/azure-npm.yaml
72- kubectl set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-${{ parameters.tag }}
73- kubectl rollout status -n kube-system daemonset/azure-npm-win
74-
75- # konnectivity agent tends to fail after rollout. Give it time to recover
76- sleep 60
77- # Taint Linux (system) nodes so windows tests do not run on them
78- kubectl taint nodes -l kubernetes.azure.com/mode=system node-role.kubernetes.io/control-plane:NoSchedule
79-
80- kubectl get po -n kube-system -owide -A
81-
82- # FQDN=`az aks show -n $CLUSTER_NAME -g $CLUSTER_NAME --query fqdn -o tsv`
83- FQDN=`az aks show -g ${{ parameters.clusterName }} -n ${{ parameters.clusterName }} --query fqdn -o tsv`
84- echo $FQDN
85- echo "##vso[task.setvariable variable=FQDN]$FQDN"
86-
87- artifact=npm_k8s_windows
88- echo $artifact/e2e.test
89- echo "##vso[task.setvariable variable=artifact]$artifact"
90-
91- download : current
92- artifact : npm_k8s_windows
58+ - task : AzureCLI@2
59+ displayName : " Deploy Windows NPM to Test Cluster"
60+ inputs :
61+ azureSubscription : ${{ parameters.sub }}
62+ scriptType : " bash"
63+ scriptLocation : " inlineScript"
64+ inlineScript : |
65+ set -ex
66+
67+ make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
68+
69+ # deploy azure-npm-win
70+ # Windows
71+ kubectl apply -f npm/examples/windows/azure-npm.yaml
72+ kubectl set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-${{ parameters.tag }}
73+ kubectl rollout status -n kube-system daemonset/azure-npm-win
74+
75+ # konnectivity agent tends to fail after rollout. Give it time to recover
76+ sleep 60
77+ # Taint Linux (system) nodes so windows tests do not run on them
78+ kubectl taint nodes -l kubernetes.azure.com/mode=system node-role.kubernetes.io/control-plane:NoSchedule
79+
80+ kubectl get po -n kube-system -owide -A
81+
82+ # FQDN=`az aks show -n $CLUSTER_NAME -g $CLUSTER_NAME --query fqdn -o tsv`
83+ FQDN=`az aks show -g ${{ parameters.clusterName }} -n ${{ parameters.clusterName }} --query fqdn -o tsv`
84+ echo $FQDN
85+ echo "##vso[task.setvariable variable=FQDN]$FQDN"
86+
87+ artifact=npm_k8s_windows
88+ echo $artifact/e2e.test
89+ echo "##vso[task.setvariable variable=artifact]$artifact"
90+
91+ - download : current
92+ artifact : npm_k8s_windows
9393
9494 - bash : |
9595 set -e
@@ -126,12 +126,12 @@ jobs:
126126 continueOnError: ${{ parameters.continueOnError }}
127127
128128${{ if eq(parameters.os, 'windows') }} :
129- - bash : |
130- # Untaint Linux (system) nodes once testing is complete
131- kubectl taint nodes -l kubernetes.azure.com/mode=system node-role.kubernetes.io/control-plane:NoSchedule-
129+ - bash : |
130+ # Untaint Linux (system) nodes once testing is complete
131+ kubectl taint nodes -l kubernetes.azure.com/mode=system node-role.kubernetes.io/control-plane:NoSchedule-
132132
133- displayName: Untaint Linux Nodes
134- condition: always()
133+ displayName: Untaint Linux Nodes
134+ condition: always()
135135
136136bash : |
137137 npmLogs=$(System.DefaultWorkingDirectory)/${{ parameters.clusterName }}_npmLogs_Attempt_#$(System.StageAttempt)
0 commit comments