@@ -166,32 +166,30 @@ stages:
166166
167167 az aks get-credentials -n $(AZURE_CLUSTER) -g $(RESOURCE_GROUP) --file ./kubeconfig
168168
169- else
170- echo "Creating Linux Cluster";
171- az aks create --no-ssh-key \
172- --resource-group $(RESOURCE_GROUP) \
173- --name $(AZURE_CLUSTER) \
174- --network-plugin azure \
175- --load-balancer-outbound-ips $PUBLIC_IP_ID
176-
177- if [ $? != 0 ]
178- then
179- echo "Failing fast since previous command failed"
180- exit 1
181- fi
169+ echo "Creating Linux Cluster";
170+ az aks create --no-ssh-key \
171+ --resource-group $(RESOURCE_GROUP) \
172+ --name $(AZURE_CLUSTER) \
173+ --network-plugin azure \
174+ --load-balancer-outbound-ips $PUBLIC_IP_ID
182175
183- az aks get-credentials -n $(AZURE_CLUSTER) -g $(RESOURCE_GROUP) --file ./kubeconfig
176+ if [ $? != 0 ]
177+ then
178+ echo "Failing fast since previous command failed"
179+ exit 1
180+ fi
184181
185- # deploy azure-npm
186- ./kubectl --kubeconfig=./kubeconfig apply -f $(Pipeline.Workspace)/s/npm/azure-npm.yaml
182+ az aks get-credentials -n $(AZURE_CLUSTER) -g $(RESOURCE_GROUP) --file ./kubeconfig
187183
188- # swap azure-npm image with one built during run
189- ./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm -n kube-system azure-npm=$IMAGE_REGISTRY/ azure-npm:linux-amd64-$(TAG)
184+ # deploy azure-npm
185+ ./kubectl --kubeconfig=./kubeconfig apply -f $(Pipeline.Workspace)/s/npm/ azure-npm.yaml
190186
191- # swap NPM profile with one specified as parameter
192- ./kubectl --kubeconfig=./kubeconfig apply -f $(Pipeline.Workspace)/s/npm/profiles/$(PROFILE).yaml
193- ./kubectl --kubeconfig=./kubeconfig rollout restart ds azure-npm -n kube-system
194- fi
187+ # swap azure-npm image with one built during run
188+ ./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:linux-amd64-$(TAG)
189+
190+ # swap NPM profile with one specified as parameter
191+ ./kubectl --kubeconfig=./kubeconfig apply -f $(Pipeline.Workspace)/s/npm/profiles/$(PROFILE).yaml
192+ ./kubectl --kubeconfig=./kubeconfig rollout restart ds azure-npm -n kube-system
195193
196194 ./kubectl --kubeconfig=./kubeconfig describe daemonset azure-npm -n kube-system
197195
@@ -268,7 +266,7 @@ stages:
268266 # for each iteration, run the conformance test and echos in the background, and write the output of the conformance test to a file
269267
270268 # run the conformance test in the foreground and write the output to stdout and a file
271- echo "starting windows conformance test #$round" && \
269+ echo "starting conformance test #$round" && \
272270 runConformance > $npmLogsFolder/conformance-results-$round && \
273271 echo "finished conformance test #$round" &
274272 pidOfConformanceTest=$!
0 commit comments