Skip to content

Commit b3b3897

Browse files
authored
Add services conformance tests to ciliume2e (#1548)
* set up conformance tests * set path * testing path * test * test * test * test * list installs * test * check for cns pods * skip ds deletion * remove CNS daemonset deletion Co-authored-by: Camryn Lee <[email protected]>
1 parent 3401f77 commit b3b3897

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,25 @@ steps:
5555
echo "install Cilium"
5656
helm repo add cilium https://helm.cilium.io/
5757
helm install cilium cilium/cilium --version 1.12.1.1 --namespace kube-system -f cilium/cilium_helm_values.yaml
58+
name: "installCilium"
59+
displayName: "Install Cilium"
60+
61+
- script: |
62+
echo "install kubetest2 and gsutils"
63+
go get github.com/onsi/ginkgo/ginkgo
64+
go get github.com/onsi/gomega/...
65+
go install github.com/onsi/ginkgo/ginkgo@latest
66+
go install sigs.k8s.io/kubetest2@latest
67+
go install sigs.k8s.io/kubetest2/kubetest2-noop@latest
68+
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest
69+
wget https://storage.googleapis.com/pub/gsutil.tar.gz
70+
tar xfz gsutil.tar.gz
71+
sudo mv gsutil /usr/local/bin
72+
name: "installKubetest"
73+
displayName: "Set up Conformance Tests"
74+
75+
- script: |
76+
echo "Start Azilium E2E Tests"
5877
kubectl get po -owide -A
5978
sudo -E env "PATH=$PATH" VERSION=$(Tag) INSTALL_CNS=true INSTALL_AZILIUM=true make test-integration
6079
retryCountOnTaskFailure: 3
@@ -78,6 +97,15 @@ steps:
7897
pathtoPublish: "$(Build.ArtifactStagingDirectory)/test-output"
7998
condition: always()
8099

100+
- script: |
101+
echo "Run Service Conformance E2E"
102+
export PATH=${PATH}:/usr/local/bin/gsutil
103+
KUBECONFIG=~/.kube/config kubetest2 noop \
104+
--test ginkgo -- \
105+
--focus-regex "Services.*\[Conformance\].*"
106+
name: "servicesConformance"
107+
displayName: "Run Services Conformance Tests"
108+
81109
- script: |
82110
ARTIFACT_DIR=$(Build.ArtifactStagingDirectory)/test-output/
83111
echo $ARTIFACT_DIR

test/integration/setup_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,6 @@ func installCNSDaemonset(ctx context.Context, clientset *kubernetes.Clientset, i
180180
if err := exportLogsByLabelSelector(ctx, clientset, cns.Namespace, cnsLabelSelector, logDir); err != nil {
181181
return err
182182
}
183-
if err := mustDeleteDaemonset(ctx, cnsDaemonsetClient, cns); err != nil {
184-
return err
185-
}
186183
return nil
187184
}
188185

0 commit comments

Comments
 (0)