Skip to content

Commit a6fc0e3

Browse files
jpayne3506jpayne3506
authored
[backport] CI/CD changes to PR and CNI Release Test Pipelines (#2940)
* ci: Add node restart to cniv2 E2E (#2901) * ci: add node restart to cniv2 E2E * chore: change directory after scale * chore: fixup nodepool * chore: pipeline cleanup * ci: cleanup test resources * chore: address comments * [FIX] ci: Update AzCLI task to v2 (#2922) * ci: Update AzCLI task to v2 * ci: add scriptType: "bash" * ci: Shift E2E cluster creation (#2862) * ci: shift cluster creation * chore: change depends on for release test
1 parent 3d3634d commit a6fc0e3

40 files changed

+453
-189
lines changed

‎.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ stages:
2828
commitID: $[ stagedependencies.setup.env.outputs['SetEnvVars.commitID'] ]
2929
dependsOn:
3030
- setup
31+
- build_images
3132
displayName: "Create Cluster - ${{ parameters.clusterName }}"
3233
jobs:
3334
- job: create_aks_cluster_with_${{ parameters.name }}
@@ -68,7 +69,7 @@ stages:
6869
- job: deploy_cilium_components
6970
displayName: Deploy Cilium
7071
steps:
71-
- task: AzureCLI@1
72+
- task: AzureCLI@2
7273
displayName: "Install Cilium, CNS, and ip-masq-agent"
7374
inputs:
7475
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
@@ -105,7 +106,7 @@ stages:
105106
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
106107
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
107108
108-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
109+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
109110
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
110111
kubectl get po -owide -A
111112
@@ -116,7 +117,7 @@ stages:
116117
- job: deploy_cilium_components
117118
displayName: Deploy Cilium with Hubble
118119
steps:
119-
- task: AzureCLI@1
120+
- task: AzureCLI@2
120121
displayName: "Install Cilium, CNS, and ip-masq-agent"
121122
inputs:
122123
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
@@ -197,7 +198,7 @@ stages:
197198
dependsOn: restart_cns
198199
steps:
199200
- template: ../../templates/cilium-cli.yaml
200-
- task: AzureCLI@1
201+
- task: AzureCLI@2
201202
inputs:
202203
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
203204
scriptLocation: "inlineScript"

‎.pipelines/cni/cilium/cilium-scale-test.yaml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ stages:
99
pool:
1010
name: "$(BUILD_POOL_NAME_DEFAULT)"
1111
steps:
12-
- task: AzureCLI@1
12+
- task: AzureCLI@2
1313
inputs:
1414
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
1515
scriptLocation: "inlineScript"
@@ -27,12 +27,12 @@ stages:
2727
kubectl apply -f test/integration/manifests/cilium/cilium-operator
2828
echo "Keep CNS version up to date, grabbing pipeline parameter"
2929
CNS_IMAGE=${CNS_IMAGE}
30-
sed -i '/containers:/{n;n;s/\(image\).*/\1: '"${CNS_IMAGE//\//\\/}"'/}' test/integration/manifests/cns/daemonset.yaml
31-
kubectl apply -f test/integration/manifests/cns/daemonset.yaml
30+
sed -i '/containers:/{n;n;s/\(image\).*/\1: '"${CNS_IMAGE//\//\\/}"'/}' test/integration/manifests/cns/daemonset.yaml
31+
kubectl apply -f test/integration/manifests/cns/daemonset.yaml
3232
for val in $(az vmss list -g MC_${clusterName}_${clusterName}_$(REGION_AKS_CLUSTER_TEST) --query "[].name" -o tsv); do
3333
make -C ./hack/aks restart-vmss AZCLI=az CLUSTER=${clusterName} REGION=$(REGION_AKS_CLUSTER_TEST) VMSS_NAME=${val}
3434
done
35-
kubectl get node
35+
kubectl get node
3636
kubectl get pod -A
3737
name: "UpdateCiliumandCNSVersion"
3838
displayName: "Update Cilium and CNS Version"
@@ -43,7 +43,7 @@ stages:
4343
pool:
4444
name: "$(BUILD_POOL_NAME_DEFAULT)"
4545
steps:
46-
- task: AzureCLI@1
46+
- task: AzureCLI@2
4747
inputs:
4848
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
4949
scriptLocation: "inlineScript"
@@ -63,7 +63,7 @@ stages:
6363
pool:
6464
name: "$(BUILD_POOL_NAME_DEFAULT)"
6565
steps:
66-
- task: AzureCLI@1
66+
- task: AzureCLI@2
6767
inputs:
6868
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
6969
scriptLocation: "inlineScript"
@@ -72,7 +72,7 @@ stages:
7272
inlineScript: |
7373
echo "Set node label scale-test=true and connectivity-test=true for testing"
7474
az aks get-credentials --resource-group ${CLUSTER} --name ${CLUSTER}
75-
cd test/scale
75+
cd test/scale
7676
chmod +x label-nodes.sh
7777
./label-nodes.sh
7878
name: "LabelNodes"
@@ -84,7 +84,7 @@ stages:
8484
pool:
8585
name: "$(BUILD_POOL_NAME_DEFAULT)"
8686
steps:
87-
- task: AzureCLI@1
87+
- task: AzureCLI@2
8888
inputs:
8989
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
9090
scriptLocation: "inlineScript"
@@ -95,14 +95,14 @@ stages:
9595
echo "collect cpu and memory usage before scaling for network policies"
9696
mkdir test1_1_netpol_cpu_and_mem_before
9797
cd test1_1_netpol_cpu_and_mem_before
98-
echo "running k top node"
98+
echo "running k top node"
9999
kubectl top node >> "node_before_netpol_scale.log"
100100
echo "running k top pod"
101101
kubectl top pod -A | grep cilium >> "pod_before_netpol_scale.log"
102102
echo "Logs will be available as a build artifact"
103103
ARTIFACT_DIR=$(Build.ArtifactStagingDirectory)/test1_1_netpol_cpu_and_mem_before/
104104
echo $ARTIFACT_DIR
105-
sudo rm -rf $ARTIFACT_DIR
105+
sudo rm -rf $ARTIFACT_DIR
106106
sudo mkdir $ARTIFACT_DIR
107107
cd ..
108108
sudo cp ./test1_1_netpol_cpu_and_mem_before/* $ARTIFACT_DIR
@@ -113,7 +113,7 @@ stages:
113113
echo "collect cpu and mem results after scaling"
114114
mkdir test1_2_netpol_cpu_and_mem_scale
115115
cd test1_2_netpol_cpu_and_mem_scale
116-
echo "running k top node"
116+
echo "running k top node"
117117
kubectl top node >> "node_netpol_scale.log"
118118
echo "running k top pod"
119119
kubectl top pod -A | grep cilium >> "pod_netpol_scale.log"
@@ -148,7 +148,7 @@ stages:
148148
name: "$(BUILD_POOL_NAME_DEFAULT)"
149149
timeoutInMinutes: 120
150150
steps:
151-
- task: AzureCLI@1
151+
- task: AzureCLI@2
152152
inputs:
153153
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
154154
scriptLocation: "inlineScript"
@@ -163,14 +163,14 @@ stages:
163163
echo "collect cpu and mem results after connectivity tests"
164164
mkdir test1_3_netpol_cpu_and_mem_after
165165
cd test1_3_netpol_cpu_and_mem_after
166-
echo "running k top node"
166+
echo "running k top node"
167167
kubectl top node >> "node_after_netpol_tests.log"
168168
echo "running k top pod"
169169
kubectl top pod -A | grep cilium >> "pod_after_netpol_tests.log"
170170
echo "Logs will be available as a build artifact"
171171
ARTIFACT_DIR=$(Build.ArtifactStagingDirectory)/test1_3_netpol_cpu_and_mem_after/
172172
echo $ARTIFACT_DIR
173-
sudo rm -rf $ARTIFACT_DIR
173+
sudo rm -rf $ARTIFACT_DIR
174174
sudo mkdir $ARTIFACT_DIR
175175
cd ..
176176
sudo cp ./test1_3_netpol_cpu_and_mem_after/* $ARTIFACT_DIR
@@ -190,7 +190,7 @@ stages:
190190
pool:
191191
name: "$(BUILD_POOL_NAME_DEFAULT)"
192192
steps:
193-
- task: AzureCLI@1
193+
- task: AzureCLI@2
194194
inputs:
195195
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
196196
scriptLocation: "inlineScript"
@@ -201,14 +201,14 @@ stages:
201201
echo "collect cpu and mem results before scale for lb tests"
202202
mkdir test2_1_lb_cpu_and_mem_before
203203
cd test2_1_lb_cpu_and_mem_before
204-
echo "running k top node"
204+
echo "running k top node"
205205
kubectl top node >> "node_before_lb_scale.log"
206206
echo "running k top pod"
207207
kubectl top pod -A | grep cilium >> "pod_before_lb_scale.log"
208208
echo "Logs will be available as a build artifact"
209209
ARTIFACT_DIR=$(Build.ArtifactStagingDirectory)/test2_1_lb_cpu_and_mem_before/
210210
echo $ARTIFACT_DIR
211-
sudo rm -rf $ARTIFACT_DIR
211+
sudo rm -rf $ARTIFACT_DIR
212212
sudo mkdir $ARTIFACT_DIR
213213
cd ..
214214
sudo cp ./test2_1_lb_cpu_and_mem_before/* $ARTIFACT_DIR
@@ -218,7 +218,7 @@ stages:
218218
echo "collect cpu and mem results after scaling"
219219
mkdir test2_2_lb_cpu_and_mem_scale
220220
cd test2_2_lb_cpu_and_mem_scale
221-
echo "running k top node"
221+
echo "running k top node"
222222
kubectl top node >> "node_lb_scale.log"
223223
echo "running k top pod"
224224
kubectl top pod -A | grep cilium >> "pod_lb_scale.log"
@@ -252,7 +252,7 @@ stages:
252252
pool:
253253
name: "$(BUILD_POOL_NAME_DEFAULT)"
254254
steps:
255-
- task: AzureCLI@1
255+
- task: AzureCLI@2
256256
inputs:
257257
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
258258
scriptLocation: "inlineScript"
@@ -274,7 +274,7 @@ stages:
274274
cd ..
275275
mkdir test2_3_lb_cpu_and_mem_after
276276
cd test2_3_lb_cpu_and_mem_after
277-
echo "running k top node"
277+
echo "running k top node"
278278
kubectl top node >> "node_after_lb_tests.log"
279279
echo "running k top pod"
280280
kubectl top pod -A | grep cilium >> "pod_after_lb_tests.log"
@@ -312,7 +312,7 @@ stages:
312312
pool:
313313
name: "$(BUILD_POOL_NAME_DEFAULT)"
314314
steps:
315-
- task: AzureCLI@1
315+
- task: AzureCLI@2
316316
inputs:
317317
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
318318
scriptLocation: "inlineScript"
@@ -328,7 +328,7 @@ stages:
328328
echo "collect cpu and mem results after netperf tests"
329329
mkdir test3_netperf_cpu_and_mem
330330
cd test3_netperf_cpu_and_mem
331-
echo "running k top node"
331+
echo "running k top node"
332332
kubectl top node >> "node_netperf.log"
333333
echo "running k top pod"
334334
kubectl top pod -A | grep cilium >> "pod_netperf.log"
@@ -337,8 +337,8 @@ stages:
337337
ARTIFACT_DIR2=$(Build.ArtifactStagingDirectory)/test3_netperf/
338338
echo $ARTIFACT_DIR
339339
echo $ARTIFACT_DIR2
340-
sudo rm -rf $ARTIFACT_DIR
341-
sudo rm -rf $ARTIFACT_DIR2
340+
sudo rm -rf $ARTIFACT_DIR
341+
sudo rm -rf $ARTIFACT_DIR2
342342
sudo mkdir $ARTIFACT_DIR
343343
sudo mkdir $ARTIFACT_DIR2
344344
cd ..
@@ -367,7 +367,7 @@ stages:
367367
pool:
368368
name: "$(BUILD_POOL_NAME_DEFAULT)"
369369
steps:
370-
- task: AzureCLI@1
370+
- task: AzureCLI@2
371371
inputs:
372372
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
373373
scriptLocation: "inlineScript"
@@ -389,7 +389,7 @@ stages:
389389
pool:
390390
name: "$(BUILD_POOL_NAME_DEFAULT)"
391391
steps:
392-
- task: AzureCLI@1
392+
- task: AzureCLI@2
393393
inputs:
394394
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
395395
scriptLocation: "inlineScript"

‎.pipelines/cni/cilium/nightly-release-test.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,19 @@ stages:
3535
make docker-operator-generic-image
3636
name: BuildCiliumImage
3737
displayName: "Build Cilium Image"
38-
- task: AzureCLI@1
38+
- task: AzureCLI@2
3939
displayName: "Login"
4040
inputs:
4141
azureSubscription: $(ACR_ARM_SERVICE_CONNECTION)
4242
scriptLocation: "inlineScript"
43+
scriptType: "bash"
4344
inlineScript: |
4445
az acr login -n $(ACR)
45-
- task: AzureCLI@1
46+
- task: AzureCLI@2
4647
inputs:
4748
azureSubscription: $(TEST_SUB_SERVICE_CONNECTION)
4849
scriptLocation: "inlineScript"
50+
scriptType: "bash"
4951
inlineScript: |
5052
set -ex
5153
docker tag quay.io/cilium/cilium:$(DOCKER_IMAGE_TAG) $(ACR).azurecr.io/cilium/cilium:$(DOCKER_IMAGE_TAG)
@@ -54,11 +56,12 @@ stages:
5456
docker push $(ACR).azurecr.io/cilium/operator-generic:$(DOCKER_IMAGE_TAG)
5557
name: "PushCiliumImage"
5658
displayName: "Push Cilium Image"
57-
- task: AzureCLI@1
59+
- task: AzureCLI@2
5860
displayName: "Logout"
5961
inputs:
6062
azureSubscription: $(ACR_ARM_SERVICE_CONNECTION)
6163
scriptLocation: "inlineScript"
64+
scriptType: "bash"
6265
inlineScript: |
6366
docker logout
6467

‎.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
pool:
1515
name: $(BUILD_POOL_NAME_DEFAULT)
1616
steps:
17-
- task: AzureCLI@1
17+
- task: AzureCLI@2
1818
inputs:
1919
azureSubscription: ${{ parameters.sub }}
2020
scriptLocation: "inlineScript"

‎.pipelines/cni/load-test-templates/create-cluster-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ parameters:
1010
nodeCountWin: 2
1111

1212
steps:
13-
- task: AzureCLI@1
13+
- task: AzureCLI@2
1414
inputs:
1515
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
1616
scriptLocation: "inlineScript"

‎.pipelines/cni/load-test-templates/pod-deployment-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
jobName: "deploy_pods"
99

1010
steps:
11-
- task: AzureCLI@1
11+
- task: AzureCLI@2
1212
displayName: "Pod Deployment"
1313
inputs:
1414
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)

‎.pipelines/cni/load-test-templates/restart-cns-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
jobName: "restart_cns"
88

99
steps:
10-
- task: AzureCLI@1
10+
- task: AzureCLI@2
1111
inputs:
1212
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
1313
scriptLocation: "inlineScript"

‎.pipelines/cni/load-test-templates/restart-hns-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
cni: "cniv1"
44

55
steps:
6-
- task: AzureCLI@1
6+
- task: AzureCLI@2
77
inputs:
88
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
99
scriptLocation: "inlineScript"

‎.pipelines/cni/load-test-templates/restart-node-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parameters:
66
region: ""
77

88
steps:
9-
- task: AzureCLI@1
9+
- task: AzureCLI@2
1010
inputs:
1111
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
1212
scriptLocation: "inlineScript"

‎.pipelines/cni/load-test-templates/validate-state-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ parameters:
55
cni: "cilium"
66

77
steps:
8-
- task: AzureCLI@1
8+
- task: AzureCLI@2
99
inputs:
1010
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
1111
scriptLocation: "inlineScript"

0 commit comments

Comments
 (0)