From 445993407b541ced12b0f158cf4c33cf68c356a3 Mon Sep 17 00:00:00 2001
From: Vamsi Kalapala <vakr@microsoft.com>
Date: Fri, 10 Dec 2021 14:23:35 -0800
Subject: [PATCH 1/3] fix: [NPM] fix conformance pipeline NPM Logs name

---
 .pipelines/npm/npm-conformance-tests.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index 30b42131e8..dd2edd02ea 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -125,10 +125,10 @@ jobs:
     matrix:
       v1-default:
         AZURE_CLUSTER: 'v1-default-cluster'
-        PROFILE: 'v1-default.yaml'
+        PROFILE: 'v1-default'
       v2-default:
         AZURE_CLUSTER: 'v2-default-cluster'
-        PROFILE: 'v2-default.yaml'
+        PROFILE: 'v2-default'
   pool:
     name: $(BUILD_POOL_NAME_DEFAULT)
     demands: 
@@ -170,7 +170,7 @@ jobs:
         ./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:$(TAG)
 
         # swap NPM profile with one specified as parameter
-        ./kubectl --kubeconfig=./kubeconfig apply -f https://raw.githubusercontent.com/Azure/azure-container-networking/master/npm/profiles/$(PROFILE)
+        ./kubectl --kubeconfig=./kubeconfig apply -f https://raw.githubusercontent.com/Azure/azure-container-networking/master/npm/profiles/$(PROFILE).yaml
         ./kubectl --kubeconfig=./kubeconfig rollout restart ds azure-npm -n kube-system
 
         ./kubectl --kubeconfig=./kubeconfig describe daemonset azure-npm -n kube-system
@@ -187,13 +187,13 @@ jobs:
       curl -LO https://dl.k8s.io/release/v1.20.0/bin/linux/amd64/kubectl
       chmod +x kubectl
       npmPodList=`kubectl get pods -n kube-system | grep npm | awk '{print $1}'`
-      mkdir -p $(System.DefaultWorkingDirectory)/npmLogs
+      mkdir -p $(System.DefaultWorkingDirectory)/npmLogs_$(PROFILE)
       for npm in $npmPodList; do ./kubectl logs -n kube-system $npm --kubeconfig=./kubeconfig > $(System.DefaultWorkingDirectory)/npmLogs/$npm ;done
-      mv ./kubeconfig $(System.DefaultWorkingDirectory)/npmLogs/kubeconfig
+      mv ./kubeconfig $(System.DefaultWorkingDirectory)/npmLogs_$(PROFILE)/kubeconfig
     displayName: "Gather NPM Logs"
     condition: always()
 
-  - publish: $(System.DefaultWorkingDirectory)/npmLogs
+  - publish: $(System.DefaultWorkingDirectory)/npmLogs_$(PROFILE)
     condition: always()
     artifact: NpmLogs
 

From ded6d8f97fdd181df57ece0abefd8f0029fcc10d Mon Sep 17 00:00:00 2001
From: Vamsi Kalapala <vakr@microsoft.com>
Date: Mon, 13 Dec 2021 10:04:10 -0800
Subject: [PATCH 2/3] dummy testing logs folder name

---
 .pipelines/npm/npm-conformance-tests.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index dd2edd02ea..5af58e1e62 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -181,7 +181,7 @@ jobs:
   - bash: |
       echo $FQDN
       chmod +x $(Pipeline.Workspace)/Test/e2e.test
-      KUBERNETES_SERVICE_HOST="$FQDN" KUBERNETES_SERVICE_PORT=443 $(Pipeline.Workspace)/Test/e2e.test --provider=local --ginkgo.focus="NetworkPolicy" --ginkgo.skip="SCTP" --kubeconfig=./kubeconfig
+      sleep 15
     displayName: "Run Test Suite"
   - bash: |
       curl -LO https://dl.k8s.io/release/v1.20.0/bin/linux/amd64/kubectl
@@ -195,7 +195,7 @@ jobs:
 
   - publish: $(System.DefaultWorkingDirectory)/npmLogs_$(PROFILE)
     condition: always()
-    artifact: NpmLogs
+    artifact: NpmLogs_$(PROFILE)
 
 - job: Clean_up
   displayName: "Cleanup"

From 38a45a25f544e97db2d5329141f695e46e03b9f8 Mon Sep 17 00:00:00 2001
From: Vamsi Kalapala <vakr@microsoft.com>
Date: Mon, 13 Dec 2021 10:38:24 -0800
Subject: [PATCH 3/3] fixing folder name

---
 .pipelines/npm/npm-conformance-tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index 5af58e1e62..580d7b0ad4 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -181,7 +181,7 @@ jobs:
   - bash: |
       echo $FQDN
       chmod +x $(Pipeline.Workspace)/Test/e2e.test
-      sleep 15
+      KUBERNETES_SERVICE_HOST="$FQDN" KUBERNETES_SERVICE_PORT=443 $(Pipeline.Workspace)/Test/e2e.test --provider=local --ginkgo.focus="NetworkPolicy" --ginkgo.skip="SCTP" --kubeconfig=./kubeconfig
     displayName: "Run Test Suite"
   - bash: |
       curl -LO https://dl.k8s.io/release/v1.20.0/bin/linux/amd64/kubectl