Skip to content

Commit f5b9d9c

Browse files
committed
shortcircuit changes for testing
1 parent dbf8184 commit f5b9d9c

File tree

2 files changed

+1
-90
lines changed

2 files changed

+1
-90
lines changed

.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ stages:
5858
name: ${{ parameters.name }}
5959
clusterName: ${{ parameters.clusterName }}-$(commitID)
6060
scaleup: 100
61+
testLRP: true
6162

6263
- template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
6364
parameters:

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

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -70,96 +70,6 @@ steps:
7070
kubectl get po -owide -A
7171
name: "installCilium"
7272
displayName: "Install Cilium on AKS Overlay"
73-
74-
- template: ../../templates/cilium-cli.yaml
75-
76-
- script: |
77-
echo "Start Azilium E2E Tests on Overlay Cluster"
78-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]
79-
then
80-
CNS=$(CNS_VERSION) IPAM=$(AZURE_IPAM_VERSION) && echo "Running nightly"
81-
else
82-
CNS=$(make cns-version) IPAM=$(make azure-ipam-version)
83-
fi
84-
kubectl get po -owide -A
85-
sudo -E env "PATH=$PATH" make test-load SCALE_UP=32 OS_TYPE=linux VALIDATE_STATEFILE=true INSTALL_CNS=true INSTALL_OVERLAY=true AZURE_IPAM_VERSION=${IPAM} CNS_VERSION=${CNS} CLEANUP=true
86-
retryCountOnTaskFailure: 3
87-
name: "aziliumTest"
88-
displayName: "Run Azilium E2E on AKS Overlay"
89-
90-
- script: |
91-
kubectl get po -owide -A
92-
echo "Waiting < 2 minutes for cilium to be ready"
93-
# Ensure Cilium is ready Xm\Xs
94-
cilium status --wait --wait-duration 2m
95-
kubectl get crd -A
96-
retryCountOnTaskFailure: 3
97-
name: "CiliumStatus"
98-
displayName: "Cilium Status"
99-
100-
- task: AzureCLI@1
101-
inputs:
102-
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
103-
scriptLocation: "inlineScript"
104-
scriptType: "bash"
105-
addSpnToEnvironment: true
106-
inlineScript: |
107-
set -e
108-
kubectl get po -owide -A
109-
clusterName=${{ parameters.clusterName }}
110-
echo "Restarting nodes"
111-
for val in $(az vmss list -g MC_${clusterName}_${clusterName}_$(REGION_AKS_CLUSTER_TEST) --query "[].name" -o tsv); do
112-
make -C ./hack/aks restart-vmss AZCLI=az CLUSTER=${clusterName} REGION=$(REGION_AKS_CLUSTER_TEST) VMSS_NAME=${val}
113-
done
114-
displayName: "Restart Nodes"
115-
116-
- task: AzureCLI@1
117-
inputs:
118-
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
119-
scriptLocation: "inlineScript"
120-
scriptType: "bash"
121-
addSpnToEnvironment: true
122-
inlineScript: |
123-
set -e
124-
cd test/integration/load
125-
126-
# Scale Cluster Up/Down to confirm functioning CNS
127-
ITERATIONS=2 SCALE_UP=${{ parameters.scaleup }} OS_TYPE=linux go test -count 1 -timeout 30m -tags load -run ^TestLoad$
128-
kubectl get pods -owide -A
129-
130-
cd ../../..
131-
echo "Validating Node Restart"
132-
make test-validate-state OS_TYPE=linux RESTART_CASE=true
133-
kubectl delete ns load-test
134-
displayName: "Validate Node Restart"
135-
retryCountOnTaskFailure: 3
136-
137-
- script: |
138-
set -e
139-
echo "Run Cilium Connectivity Tests"
140-
cilium status
141-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors' --force-deploy
142-
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
143-
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
144-
retryCountOnTaskFailure: 3
145-
name: "ciliumConnectivityTests"
146-
displayName: "Run Cilium Connectivity Tests"
147-
148-
- ${{ if eq( parameters['testHubble'], true) }}:
149-
- script: |
150-
echo "enable Hubble metrics server"
151-
kubectl apply -f test/integration/manifests/cilium/hubble/hubble-peer-svc.yaml
152-
kubectl apply -f test/integration/manifests/cilium/cilium-config-hubble.yaml
153-
kubectl rollout restart ds cilium -n kube-system
154-
echo "wait <3 minutes for pods to be ready after restart"
155-
kubectl rollout status ds cilium -n kube-system --timeout=3m
156-
kubectl get pods -Aowide
157-
echo "verify Hubble metrics endpoint is usable"
158-
go test ./test/integration/networkobservability -count=1 -v -tags=networkobservability
159-
retryCountOnTaskFailure: 3
160-
name: "HubbleConnectivityTests"
161-
displayName: "Run Hubble Connectivity Tests"
162-
16373
- ${{ if eq( parameters['testLRP'], true) }}:
16474
- script: |
16575
set -e

0 commit comments

Comments
 (0)