From e8201f3e01e2f6e4349187d36f723ff93096a765 Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Wed, 24 Aug 2022 10:37:09 -0700 Subject: [PATCH 01/12] set up conformance tests --- .../cilium/cilium-e2e-step-template.yaml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index a01e9e8a0a..0624623262 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -55,6 +55,32 @@ 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 + name: "installKubetest" + displayName: "Set up Conformance Tests" + + - script: | + echo "Run Service Conformance E2E" + KUBECONFIG=~/.kube/config kubetest2 noop \ + --test ginkgo -- \ + --focus-regex "Services.*\[Conformance\].*" + name: "servicesConformance" + displayName: "Run Services 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 From d16a58af6f89dd9bfcd5f6029c5f3cf9ebd96dc2 Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Wed, 24 Aug 2022 12:43:51 -0700 Subject: [PATCH 02/12] set path --- .../cilium/cilium-e2e-step-template.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index 0624623262..023cd3c426 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -68,16 +68,9 @@ steps: go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest wget https://storage.googleapis.com/pub/gsutil.tar.gz tar xfz gsutil.tar.gz + export PATH=${PATH}:~/gsutil name: "installKubetest" displayName: "Set up Conformance Tests" - - - script: | - echo "Run Service Conformance E2E" - KUBECONFIG=~/.kube/config kubetest2 noop \ - --test ginkgo -- \ - --focus-regex "Services.*\[Conformance\].*" - name: "servicesConformance" - displayName: "Run Services Conformance Tests" - script: | echo "Start Azilium E2E Tests" @@ -104,6 +97,14 @@ steps: pathtoPublish: "$(Build.ArtifactStagingDirectory)/test-output" condition: always() + - script: | + echo "Run Service Conformance E2E" + 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 From 22f368fb8c9b3ffc802a89fe1a3ceb8d039d9c06 Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Wed, 24 Aug 2022 14:08:11 -0700 Subject: [PATCH 03/12] testing path --- .../singletenancy/cilium/cilium-e2e-step-template.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index 023cd3c426..86420975c1 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -68,7 +68,10 @@ steps: go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest wget https://storage.googleapis.com/pub/gsutil.tar.gz tar xfz gsutil.tar.gz - export PATH=${PATH}:~/gsutil + echo $PATH + export PATH=${PATH}:gsutil + echo "add gsutil to path" + echo $PATH name: "installKubetest" displayName: "Set up Conformance Tests" @@ -99,6 +102,9 @@ steps: - script: | echo "Run Service Conformance E2E" + echo $PATH + export PATH=${PATH}:gsutil + export $PATH KUBECONFIG=~/.kube/config kubetest2 noop \ --test ginkgo -- \ --focus-regex "Services.*\[Conformance\].*" From 50d812ce62c816e955c93ab92f503fcc0ce80cae Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Wed, 24 Aug 2022 15:42:18 -0700 Subject: [PATCH 04/12] test --- .../singletenancy/cilium/cilium-e2e-step-template.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index 86420975c1..46bf633441 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -68,10 +68,6 @@ steps: go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest wget https://storage.googleapis.com/pub/gsutil.tar.gz tar xfz gsutil.tar.gz - echo $PATH - export PATH=${PATH}:gsutil - echo "add gsutil to path" - echo $PATH name: "installKubetest" displayName: "Set up Conformance Tests" @@ -104,7 +100,7 @@ steps: echo "Run Service Conformance E2E" echo $PATH export PATH=${PATH}:gsutil - export $PATH + echo $PATH KUBECONFIG=~/.kube/config kubetest2 noop \ --test ginkgo -- \ --focus-regex "Services.*\[Conformance\].*" From 512bfff76086f3efb3996d869cda3d30721dd043 Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Thu, 25 Aug 2022 09:04:24 -0700 Subject: [PATCH 05/12] test --- .../singletenancy/cilium/cilium-e2e-step-template.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index 46bf633441..28e2f87f12 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -60,6 +60,7 @@ steps: - script: | echo "install kubetest2 and gsutils" + cd /usr/local/bin go get github.com/onsi/ginkgo/ginkgo go get github.com/onsi/gomega/... go install github.com/onsi/ginkgo/ginkgo@latest @@ -68,6 +69,8 @@ steps: go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest wget https://storage.googleapis.com/pub/gsutil.tar.gz tar xfz gsutil.tar.gz + ls + cd name: "installKubetest" displayName: "Set up Conformance Tests" @@ -99,7 +102,7 @@ steps: - script: | echo "Run Service Conformance E2E" echo $PATH - export PATH=${PATH}:gsutil + export PATH=${PATH}:/usr/local/bin/gsutil echo $PATH KUBECONFIG=~/.kube/config kubetest2 noop \ --test ginkgo -- \ From 7eef5286fc283a5253636a4593bf8b6bcd4fe200 Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Thu, 25 Aug 2022 10:43:35 -0700 Subject: [PATCH 06/12] test --- .pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index 28e2f87f12..32d6f24e04 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -60,7 +60,9 @@ steps: - script: | echo "install kubetest2 and gsutils" + pwd cd /usr/local/bin + pwd go get github.com/onsi/ginkgo/ginkgo go get github.com/onsi/gomega/... go install github.com/onsi/ginkgo/ginkgo@latest @@ -68,7 +70,7 @@ steps: 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 tar xfz gsutil.tar.gz ls cd name: "installKubetest" From ad8ef62875bccc62951e09ad2a4bd2d93f5451c2 Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Thu, 25 Aug 2022 11:59:47 -0700 Subject: [PATCH 07/12] test --- .../singletenancy/cilium/cilium-e2e-step-template.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index 32d6f24e04..d4bbe0ef63 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -61,8 +61,6 @@ steps: - script: | echo "install kubetest2 and gsutils" pwd - cd /usr/local/bin - pwd go get github.com/onsi/ginkgo/ginkgo go get github.com/onsi/gomega/... go install github.com/onsi/ginkgo/ginkgo@latest @@ -70,9 +68,8 @@ steps: 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 - sudo tar xfz gsutil.tar.gz - ls - cd + tar xfz gsutil.tar.gz + sudo mv gsutil ginko kubetest2-noop kubetest2-tester-ginkgo kubetest2 /usr/local/bin name: "installKubetest" displayName: "Set up Conformance Tests" From d9ceb8879c0d8ab4865e4d008d04545d7eb38af0 Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Thu, 25 Aug 2022 13:49:00 -0700 Subject: [PATCH 08/12] list installs --- .pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index d4bbe0ef63..6a0fa94c4d 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -69,7 +69,7 @@ steps: 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 ginko kubetest2-noop kubetest2-tester-ginkgo kubetest2 /usr/local/bin + sudo mv gsutil gingko kubetest2-noop kubetest2-tester-ginkgo kubetest2 /usr/local/bin name: "installKubetest" displayName: "Set up Conformance Tests" From f947d1e71c180698635d5f446b29d7b1222fb41a Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Thu, 25 Aug 2022 15:01:11 -0700 Subject: [PATCH 09/12] test --- .pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index 6a0fa94c4d..dcffeca8a0 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -69,7 +69,8 @@ steps: 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 gingko kubetest2-noop kubetest2-tester-ginkgo kubetest2 /usr/local/bin + ls + sudo mv gsutil /usr/local/bin name: "installKubetest" displayName: "Set up Conformance Tests" From c69ac5960c637880ac641054c01eaf53cfbdb6d1 Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Thu, 25 Aug 2022 18:40:30 -0700 Subject: [PATCH 10/12] check for cns pods --- .../singletenancy/cilium/cilium-e2e-step-template.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index dcffeca8a0..63fb2d0160 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -60,7 +60,6 @@ steps: - script: | echo "install kubetest2 and gsutils" - pwd go get github.com/onsi/ginkgo/ginkgo go get github.com/onsi/gomega/... go install github.com/onsi/ginkgo/ginkgo@latest @@ -69,7 +68,6 @@ steps: go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest wget https://storage.googleapis.com/pub/gsutil.tar.gz tar xfz gsutil.tar.gz - ls sudo mv gsutil /usr/local/bin name: "installKubetest" displayName: "Set up Conformance Tests" @@ -78,6 +76,7 @@ steps: 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 + kubectl get pod -owide -A retryCountOnTaskFailure: 3 name: "aziliumTest" displayName: "Run Azilium E2E" @@ -101,9 +100,8 @@ steps: - script: | echo "Run Service Conformance E2E" - echo $PATH export PATH=${PATH}:/usr/local/bin/gsutil - echo $PATH + kubectl get pod -owide -A KUBECONFIG=~/.kube/config kubetest2 noop \ --test ginkgo -- \ --focus-regex "Services.*\[Conformance\].*" From 4eb36766fb2b5744f69c9c8698f618577de3443d Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Fri, 26 Aug 2022 09:16:49 -0700 Subject: [PATCH 11/12] skip ds deletion --- test/integration/setup_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/integration/setup_test.go b/test/integration/setup_test.go index b283e00f29..e575609303 100644 --- a/test/integration/setup_test.go +++ b/test/integration/setup_test.go @@ -180,9 +180,10 @@ 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 - } + // skip Daemonset deletion for conformance tests + // if err := mustDeleteDaemonset(ctx, cnsDaemonsetClient, cns); err != nil { + // return err + // } return nil } From 6240070909351265b1a6ce1f8575b7d81a3c01fc Mon Sep 17 00:00:00 2001 From: Camryn Lee Date: Fri, 26 Aug 2022 12:19:11 -0700 Subject: [PATCH 12/12] remove CNS daemonset deletion --- .pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml | 2 -- test/integration/setup_test.go | 4 ---- 2 files changed, 6 deletions(-) diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index 63fb2d0160..723a339249 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -76,7 +76,6 @@ steps: 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 - kubectl get pod -owide -A retryCountOnTaskFailure: 3 name: "aziliumTest" displayName: "Run Azilium E2E" @@ -101,7 +100,6 @@ steps: - script: | echo "Run Service Conformance E2E" export PATH=${PATH}:/usr/local/bin/gsutil - kubectl get pod -owide -A KUBECONFIG=~/.kube/config kubetest2 noop \ --test ginkgo -- \ --focus-regex "Services.*\[Conformance\].*" diff --git a/test/integration/setup_test.go b/test/integration/setup_test.go index e575609303..5eb01d5e3a 100644 --- a/test/integration/setup_test.go +++ b/test/integration/setup_test.go @@ -180,10 +180,6 @@ func installCNSDaemonset(ctx context.Context, clientset *kubernetes.Clientset, i if err := exportLogsByLabelSelector(ctx, clientset, cns.Namespace, cnsLabelSelector, logDir); err != nil { return err } - // skip Daemonset deletion for conformance tests - // if err := mustDeleteDaemonset(ctx, cnsDaemonsetClient, cns); err != nil { - // return err - // } return nil }