Skip to content

Commit a4afdb2

Browse files
jpayne3506jpayne3506
committed
ci: update Connectivity test usages to template call
1 parent 1efad23 commit a4afdb2

File tree

10 files changed

+28
-101
lines changed

10 files changed

+28
-101
lines changed

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ stages:
6565
- ${{ if eq(parameters.upgradeScenario, false) }}:
6666
- create_${{ parameters.name }}
6767
- ${{ else }}:
68-
- ${{ parameters.dependsOn }}
68+
- ${{ parameters.dependsOn }}
6969
- publish
7070
- setup
7171
displayName: "Cilium Test - ${{ parameters.name }}"
@@ -122,7 +122,7 @@ stages:
122122
123123
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
124124
kubectl get po -owide -A
125-
125+
126126
- ${{if eq(parameters.hubbleEnabled, true)}}:
127127
- job: deploy_cilium_components
128128
displayName: Deploy Cilium with Hubble
@@ -184,7 +184,7 @@ stages:
184184
IPAM=$(UPGRADE_AZURE_IPAM_VERSION)
185185
echo "UPGRADE_AZURE_IPAM_VERSION is set to $IPAM"
186186
fi
187-
187+
188188
if [ -z "$UPGRADE_CNS_VERSION" ]
189189
then
190190
echo "UPGRADE_CNS_VERSION is not set, using default value"
@@ -214,9 +214,9 @@ stages:
214214
echo "TEST_CNS_VERSION is set to $CNS"
215215
fi
216216
fi
217-
217+
218218
echo "Deploy Azure-CNS"
219-
sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=${IPAM} CNS_VERSION=${CNS} INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) IPAM_IMAGE_REPO=$(IPAM_IMAGE_REPO)
219+
sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=${IPAM} CNS_VERSION=${CNS} INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) IPAM_IMAGE_REPO=$(IPAM_IMAGE_REPO)
220220
kubectl get po -owide -A
221221
kubectl get crd -A
222222
@@ -287,12 +287,7 @@ stages:
287287
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
288288
name: "GetCluster"
289289
displayName: "Get AKS Cluster"
290-
- script: |
291-
kubectl delete ns load-test
292-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors,!no-unexpected-packet-drops'
293-
retryCountOnTaskFailure: 6
294-
name: "CiliumConnectivityTests"
295-
displayName: "Run Cilium Connectivity Tests"
290+
- template: ../../templates/cilium-connectivity-tests.yaml
296291
- script: |
297292
cd hack/scripts
298293
chmod +x async-delete-test.sh

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@ stages:
162162
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=ciliumnightly-$(commitID)
163163
164164
set -e
165-
echo "Run Cilium Connectivity Tests"
165+
echo "Check Cilium Connectivity Test Logs"
166166
cilium status
167167
cilium connectivity test --test check-log-errors --log-check-levels error
168-
name: "ciliumConnectivityTests"
169-
displayName: "Run Cilium Connectivity Tests"
168+
name: "ciliumConnectivityLogs"
169+
displayName: "Check Cilium Connectivity Test Logs"
170170
condition: always()
171171

172172
- template: ../../templates/log-check-template.yaml # Operator Check

‎.pipelines/networkobservability/pipeline.yaml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,9 @@ stages:
113113
displayName: "Wait for all pods to be running"
114114
retryCountOnTaskFailure: 3
115115
116-
- script: |
117-
echo "Run Cilium Connectivity Tests"
118-
cilium status
119-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors'
120-
retryCountOnTaskFailure: 3
121-
name: "ciliumConnectivityTests"
122-
displayName: "Run Cilium Connectivity Tests"
123-
enabled: true
116+
- template: ../templates/cilium-connectivity-tests.yaml
117+
parameters:
118+
skipTests: '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors,!to-fqdns'
124119

125120
- script: |
126121
export DIR=${CILIUM_VERSION_TAG%.*}

‎.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,7 @@ steps:
107107
displayName: "Validate Node Restart"
108108
retryCountOnTaskFailure: 3
109109

110-
- script: |
111-
set -e
112-
echo "Run Cilium Connectivity Tests"
113-
cilium status
114-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!no-unexpected-packet-drops,!check-log-errors' --force-deploy
115-
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
116-
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
117-
retryCountOnTaskFailure: 3
118-
name: "ciliumConnectivityTests"
119-
displayName: "Run Cilium Connectivity Tests"
110+
- template: ../../templates/cilium-connectivity-tests.yaml
120111

121112
- script: |
122113
set -e
@@ -158,5 +149,5 @@ steps:
158149
fi
159150
name: "testAsyncDelete"
160151
displayName: "Verify Async Delete when CNS is down"
161-
152+
162153
- template: ../../templates/cilium-mtu-check.yaml

‎.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e.steps.yaml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ steps:
6464
SCALE_UP=32 OS_TYPE=linux CNI_TYPE=cilium_dualstack VALIDATE_STATEFILE=true \
6565
INSTALL_CNS=true INSTALL_OVERLAY=true CLEANUP=true \
6666
AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION) CNS_VERSION=$(CNS_VERSION) \
67-
IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE)
67+
IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE)
6868
retryCountOnTaskFailure: 3
6969
name: "aziliumTest"
7070
displayName: "Run Azilium E2E on AKS Overlay"
@@ -116,16 +116,7 @@ steps:
116116
displayName: "Validate Node Restart"
117117
retryCountOnTaskFailure: 3
118118

119-
- script: |
120-
set -e
121-
echo "Run Cilium Connectivity Tests"
122-
cilium status
123-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!no-unexpected-packet-drops,!check-log-errors' --force-deploy
124-
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
125-
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
126-
retryCountOnTaskFailure: 3
127-
name: "ciliumConnectivityTests"
128-
displayName: "Run Cilium Connectivity Tests"
119+
- template: ../../templates/cilium-connectivity-tests.yaml
129120

130121
- script: |
131122
set -e
@@ -170,5 +161,5 @@ steps:
170161
fi
171162
name: "testAsyncDelete"
172163
displayName: "Verify Async Delete when CNS is down"
173-
164+
174165
- template: ../../templates/cilium-mtu-check.yaml

‎.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,7 @@ steps:
111111
displayName: "Validate Node Restart"
112112
retryCountOnTaskFailure: 3
113113

114-
- script: |
115-
set -e
116-
echo "Run Cilium Connectivity Tests"
117-
cilium status
118-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
119-
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
120-
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
121-
retryCountOnTaskFailure: 3
122-
name: "ciliumConnectivityTests"
123-
displayName: "Run Cilium Connectivity Tests"
114+
- template: ../../templates/cilium-connectivity-tests.yaml
124115

125116
- ${{ if eq( parameters['testHubble'], true) }}:
126117
- script: |

‎.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e.steps.yaml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,7 @@ steps:
109109
displayName: "Validate Node Restart"
110110
retryCountOnTaskFailure: 3
111111

112-
- script: |
113-
set -e
114-
echo "Run Cilium Connectivity Tests"
115-
cilium status
116-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
117-
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
118-
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
119-
retryCountOnTaskFailure: 3
120-
name: "ciliumConnectivityTests"
121-
displayName: "Run Cilium Connectivity Tests"
112+
- template: ../../templates/cilium-connectivity-tests.yaml
122113

123114
- ${{ if eq( parameters['testHubble'], true) }}:
124115
- script: |
@@ -198,7 +189,7 @@ steps:
198189
fi
199190
name: "testAsyncDelete"
200191
displayName: "Verify Async Delete when CNS is down"
201-
192+
202193
- template: ../../templates/cilium-mtu-check.yaml
203194

204195
- script: |

‎.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,7 @@ steps:
144144
displayName: "Validate Node Restart"
145145
retryCountOnTaskFailure: 3
146146

147-
- script: |
148-
set -e
149-
echo "Run Cilium Connectivity Tests"
150-
cilium status
151-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
152-
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
153-
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
154-
retryCountOnTaskFailure: 3
155-
name: "ciliumConnectivityTests"
156-
displayName: "Run Cilium Connectivity Tests"
147+
- template: ../../templates/cilium-connectivity-tests.yaml
157148

158149
- ${{ if eq( parameters['testHubble'], true) }}:
159150
- script: |
@@ -238,4 +229,4 @@ steps:
238229
name: "testAsyncDelete"
239230
displayName: "Verify Async Delete when CNS is down"
240231
241-
- template: ../../templates/cilium-mtu-check.yaml
232+
- template: ../../templates/cilium-mtu-check.yaml

‎.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e.steps.yaml‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ steps:
8080
SCALE_UP=32 OS_TYPE=linux VALIDATE_STATEFILE=true \
8181
INSTALL_CNS=true INSTALL_OVERLAY=true CLEANUP=true \
8282
AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION) CNS_VERSION=$(CNS_VERSION) \
83-
IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE)
83+
IPAM_IMAGE_NAME_OVERRIDE=$(IPAM_IMAGE_NAME_OVERRIDE) CNS_IMAGE_NAME_OVERRIDE=$(CNS_IMAGE_NAME_OVERRIDE)
8484
retryCountOnTaskFailure: 3
8585
name: "aziliumTest"
8686
displayName: "Run Azilium E2E on AKS Overlay"
@@ -142,16 +142,7 @@ steps:
142142
displayName: "Validate Node Restart"
143143
retryCountOnTaskFailure: 3
144144

145-
- script: |
146-
set -e
147-
echo "Run Cilium Connectivity Tests"
148-
cilium status
149-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
150-
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
151-
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
152-
retryCountOnTaskFailure: 3
153-
name: "ciliumConnectivityTests"
154-
displayName: "Run Cilium Connectivity Tests"
145+
- template: ../../templates/cilium-connectivity-tests.yaml
155146

156147
- ${{ if eq( parameters['testHubble'], true) }}:
157148
- script: |
@@ -248,7 +239,7 @@ steps:
248239
fi
249240
name: "testAsyncDelete"
250241
displayName: "Verify Async Delete when CNS is down"
251-
242+
252243
- template: ../../templates/cilium-mtu-check.yaml
253-
244+
254245

‎.pipelines/templates/cilium-tests.yaml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,7 @@ steps:
4646
displayName: "Validate Node Restart"
4747
retryCountOnTaskFailure: 3
4848

49-
- script: |
50-
set -e
51-
echo "Run Cilium Connectivity Tests"
52-
cilium status
53-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
54-
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
55-
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
56-
retryCountOnTaskFailure: 3
57-
name: "ciliumConnectivityTests"
58-
displayName: "Run Cilium Connectivity Tests"
49+
- template: ./cilium-connectivity-tests.yaml
5950

6051
- script: |
6152
set -e
@@ -81,5 +72,5 @@ steps:
8172
fi
8273
name: "testAsyncDelete"
8374
displayName: "Verify Async Delete when CNS is down"
84-
75+
8576
- template: ./cilium-mtu-check.yaml

0 commit comments

Comments
 (0)