Skip to content

Commit bb9e6a6

Browse files
committed
reuse existing template
the only difference between the two is overlay has check that deletes the cilium test namespace and validates the state-- otherwise the cilium tests template is identical previous commit passed
1 parent 8211742 commit bb9e6a6

File tree

2 files changed

+4
-125
lines changed

2 files changed

+4
-125
lines changed

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

Lines changed: 4 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -41,74 +41,8 @@ steps:
4141
retryCountOnTaskFailure: 3
4242
name: "aziliumTest"
4343
displayName: "Deploy CNS and Run Azilium E2E on AKS Overlay"
44-
45-
- script: |
46-
kubectl get pods -Aowide
47-
echo "Waiting < 2 minutes for cilium to be ready"
48-
cilium status --wait --wait-duration 2m
49-
kubectl get crd -A
50-
retryCountOnTaskFailure: 3
51-
name: "CiliumStatus"
52-
displayName: "Cilium Status"
53-
54-
- task: AzureCLI@1
55-
inputs:
56-
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
57-
scriptLocation: "inlineScript"
58-
scriptType: "bash"
59-
addSpnToEnvironment: true
60-
inlineScript: |
61-
set -e
62-
kubectl get po -owide -A
63-
clusterName=${{ parameters.clusterName }}
64-
echo "Restarting nodes"
65-
for val in $(az vmss list -g MC_${clusterName}_${clusterName}_$(REGION_AKS_CLUSTER_TEST) --query "[].name" -o tsv); do
66-
make -C ./hack/aks restart-vmss AZCLI=az CLUSTER=${clusterName} REGION=$(REGION_AKS_CLUSTER_TEST) VMSS_NAME=${val}
67-
done
68-
displayName: "Restart Nodes"
69-
70-
- task: AzureCLI@1
71-
inputs:
72-
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
73-
scriptLocation: "inlineScript"
74-
scriptType: "bash"
75-
addSpnToEnvironment: true
76-
inlineScript: |
77-
set -e
78-
cd test/integration/load
79-
80-
# Scale Cluster Up/Down to confirm functioning CNS
81-
ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=linux go test -count 1 -timeout 30m -tags load -run ^TestLoad$
82-
kubectl get pods -owide -A
83-
84-
cd ../../..
85-
echo "Validating Node Restart"
86-
make test-validate-state OS_TYPE=linux RESTART_CASE=true
87-
kubectl delete ns load-test
88-
displayName: "Validate Node Restart"
89-
retryCountOnTaskFailure: 3
90-
91-
- template: ../../templates/cilium-connectivity-tests.yaml
92-
93-
- template: ../../templates/cilium-identities-check.yaml
44+
45+
- template: ../../templates/cilium-tests.yaml
9446
parameters:
95-
ciliumVersionTag: $(CILIUM_VERSION_TAG)
96-
97-
- script: |
98-
echo "Run wireserver and metadata connectivity Tests"
99-
bash test/network/wireserver_metadata_test.sh
100-
retryCountOnTaskFailure: 3
101-
name: "WireserverMetadataConnectivityTests"
102-
displayName: "Run Wireserver and Metadata Connectivity Tests"
103-
104-
- script: |
105-
cd hack/scripts
106-
chmod +x async-delete-test.sh
107-
./async-delete-test.sh
108-
if ! [ -z $(kubectl -n kube-system get ds azure-cns | grep non-existing) ]; then
109-
kubectl -n kube-system patch daemonset azure-cns --type json -p='[{"op": "remove", "path": "/spec/template/spec/nodeSelector/non-existing"}]'
110-
fi
111-
name: "testAsyncDelete"
112-
displayName: "Verify Async Delete when CNS is down"
113-
114-
- template: ../../templates/cilium-mtu-check.yaml
47+
clusterName: ${{ parameters.clusterName }}
48+
scaleup: ${{ parameters.scaleup }}

.pipelines/templates/cilium-identities-check.yaml

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)