From ba1829284cc07c31096374c1662e81a57cdbf1a1 Mon Sep 17 00:00:00 2001
From: Camryn Lee <camrynlee@microsoft.com>
Date: Fri, 26 Aug 2022 16:06:46 -0700
Subject: [PATCH 1/2] conformance tests for swifte2e

---
 .../aks-swift/e2e-step-template.yaml          | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
index 497e26a10d..3eff217b36 100644
--- a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
+++ b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
@@ -38,6 +38,20 @@ steps:
         echo "Cluster successfully created"
     displayName: Create test cluster
     condition: succeeded()
+
+    - 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: |
       ls -lah
@@ -69,6 +83,15 @@ steps:
       pathtoPublish: "$(Build.ArtifactStagingDirectory)/aks-swift-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)/aks-swift-output/
       echo $ARTIFACT_DIR

From 0f7a503e2765512b08417691bbeee7af8f97672b Mon Sep 17 00:00:00 2001
From: Camryn Lee <camrynlee@microsoft.com>
Date: Fri, 26 Aug 2022 16:09:56 -0700
Subject: [PATCH 2/2] fix spacing

---
 .pipelines/singletenancy/aks-swift/e2e-step-template.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
index 3eff217b36..81cc75119d 100644
--- a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
+++ b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
@@ -39,7 +39,7 @@ steps:
     displayName: Create test cluster
     condition: succeeded()
 
-    - script: |
+  - script: |
       echo "install kubetest2 and gsutils"
       go get github.com/onsi/ginkgo/ginkgo
       go get github.com/onsi/gomega/...