diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index a01e9e8a0a..723a339249 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -55,6 +55,25 @@ steps: echo "install Cilium" helm repo add cilium https://helm.cilium.io/ helm install cilium cilium/cilium --version 1.12.1.1 --namespace kube-system -f cilium/cilium_helm_values.yaml + name: "installCilium" + displayName: "Install Cilium" + + - script: | + echo "install kubetest2 and gsutils" + go get github.com/onsi/ginkgo/ginkgo + go get github.com/onsi/gomega/... + go install github.com/onsi/ginkgo/ginkgo@latest + go install sigs.k8s.io/kubetest2@latest + go install sigs.k8s.io/kubetest2/kubetest2-noop@latest + go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest + wget https://storage.googleapis.com/pub/gsutil.tar.gz + tar xfz gsutil.tar.gz + sudo mv gsutil /usr/local/bin + name: "installKubetest" + displayName: "Set up Conformance Tests" + + - script: | + echo "Start Azilium E2E Tests" kubectl get po -owide -A sudo -E env "PATH=$PATH" VERSION=$(Tag) INSTALL_CNS=true INSTALL_AZILIUM=true make test-integration retryCountOnTaskFailure: 3 @@ -78,6 +97,15 @@ steps: pathtoPublish: "$(Build.ArtifactStagingDirectory)/test-output" condition: always() + - script: | + echo "Run Service Conformance E2E" + export PATH=${PATH}:/usr/local/bin/gsutil + KUBECONFIG=~/.kube/config kubetest2 noop \ + --test ginkgo -- \ + --focus-regex "Services.*\[Conformance\].*" + name: "servicesConformance" + displayName: "Run Services Conformance Tests" + - script: | ARTIFACT_DIR=$(Build.ArtifactStagingDirectory)/test-output/ echo $ARTIFACT_DIR diff --git a/test/integration/setup_test.go b/test/integration/setup_test.go index b283e00f29..5eb01d5e3a 100644 --- a/test/integration/setup_test.go +++ b/test/integration/setup_test.go @@ -180,9 +180,6 @@ func installCNSDaemonset(ctx context.Context, clientset *kubernetes.Clientset, i if err := exportLogsByLabelSelector(ctx, clientset, cns.Namespace, cnsLabelSelector, logDir); err != nil { return err } - if err := mustDeleteDaemonset(ctx, cnsDaemonsetClient, cns); err != nil { - return err - } return nil }