Skip to content

Commit cc71533

Browse files
committed
addressing comments
1 parent 1dae96b commit cc71533

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

.pipelines/pipeline.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -566,9 +566,6 @@ stages:
566566
cilium_dualstackoverlay_e2e:
567567
name: cilium_dualstackoverlay_e2e
568568
clusterName: "cildsovere2e"
569-
cilium_dualstackoverlay_cni_e2e:
570-
name: cilium_dualstackoverlay_cni_e2e
571-
clustername: "cildsovcnie2e"
572569
steps:
573570
- template: templates/delete-cluster.yaml
574571
parameters:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
parameters:
22
name: ""
33
displayName: ""
4-
testDropgz: ""
54
clusterType: ""
65
clusterName: ""
76
vmSize: ""
@@ -64,6 +63,7 @@ stages:
6463
sub: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
6564
clusterName: ${{ parameters.clusterName }}-$(commitID)
6665
os: ${{ parameters.os }}
66+
cni: cilium
6767
dependsOn: ${{ parameters.name }}
6868
dualstack: true
6969
dns: true

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

+1-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
parameters:
22
name: ""
3-
testDropgz: ""
43
clusterName: ""
54
testHubble: false
65

@@ -69,8 +68,7 @@ steps:
6968
7069
- script: |
7170
echo "Start Azilium E2E Tests on Overlay Cluster"
72-
CNS=$(make cns-version) DROPGZ=$(dropgzVersion)
73-
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=${CNS} CNI_DROPGZ_VERSION=${DROPGZ} INSTALL_CNS=true INSTALL_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }}
71+
sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=${IPAM} CNS_VERSION=${CNS} INSTALL_CNS=true INSTALL_DUALSTACK_OVERLAY=true
7472
retryCountOnTaskFailure: 3
7573
name: "aziliumTest"
7674
displayName: "Run Azilium E2E on AKS Overlay"
@@ -112,21 +110,6 @@ steps:
112110
name: "ciliumConnectivityTests"
113111
displayName: "Run Cilium Connectivity Tests"
114112
115-
- ${{ if eq( parameters['testHubble'], true) }}:
116-
- script: |
117-
echo "enable Hubble metrics server"
118-
kubectl apply -f test/integration/manifests/cilium/hubble/hubble-peer-svc.yaml
119-
kubectl apply -f test/integration/manifests/cilium/cilium-config-hubble.yaml
120-
kubectl rollout restart ds cilium -n kube-system
121-
echo "wait <3 minutes for pods to be ready after restart"
122-
kubectl rollout status ds cilium -n kube-system --timeout=3m
123-
kubectl get pods -Aowide
124-
echo "verify Hubble metrics endpoint is usable"
125-
go test ./test/integration/networkobservability -count=1 -v -tags=networkobservability
126-
retryCountOnTaskFailure: 3
127-
name: "HubbleConnectivityTests"
128-
displayName: "Run Hubble Connectivity Tests"
129-
130113
- script: |
131114
set -e
132115
cd test/integration/load

0 commit comments

Comments
 (0)