From 1a4fd1dc0d945fd93c67712c09b8944138b8747d Mon Sep 17 00:00:00 2001
From: Mathew Merrick <matmerr@microsoft.com>
Date: Thu, 18 Feb 2021 14:49:59 -0800
Subject: [PATCH 01/13] initial NPM conformance pipeline

---
 .pipelines/npm/npm-conformance-tests.yaml | 124 ++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 .pipelines/npm/npm-conformance-tests.yaml

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
new file mode 100644
index 0000000000..972ec4a910
--- /dev/null
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -0,0 +1,124 @@
+trigger:
+- main
+pool:
+  vmImage: 'ubuntu-20.04'
+variables:
+- name: AZURE_CLUSTER
+  value: azure-npm
+- name: VNET_NAME
+  value: npm-vnet
+- name: LOCATION
+  value: westus2
+- name: FQDN
+  value: empty
+jobs:
+
+- job: Build_test
+  steps:
+  - script: |
+      BUILD_NUMBER=$(Build.BuildNumber)
+      echo "##vso[task.setvariable variable=ResourceGroup;isOutput=true]$(echo "npm-conformance-`date "+%Y-%m-%d-%S"`")"
+      echo "##vso[task.setvariable variable=Tag;isOutput=true]$(git describe --tags --always --dirty)"
+    workingDirectory: "$(modulePath)"
+    name: "EnvironmentalVariables"
+    displayName: "Set environmental variables"
+    condition: always()
+
+  - task: GoTool@0
+    inputs:
+      version: '1.15.6'
+
+  - checkout: self
+  - script: |
+      make azure-npm-image
+      echo '$(DOCKER_PASSWORD)' | docker login $IMAGE_REGISTRY -u '$(DOCKER_USERNAME)' --password-stdin
+      docker tag $IMAGE_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag) $IMAGE_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-conformance-test
+      docker push $IMAGE_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-conformance-test
+    displayName: 'build and push azure-npm'
+
+
+  - script: git clone https://github.com/vakalapa/kubernetes.git
+    displayName: 'clone kubernetes repo'
+  - bash: |
+      cd kubernetes
+      git checkout vakr/sleepinnpmtests
+      make WHAT=test/e2e/e2e.test
+    displayName: 'build e2e.test'
+  - publish: $(System.DefaultWorkingDirectory)/kubernetes/_output/local/bin/linux/amd64
+    artifact: Test
+
+
+- job: Create_cluster
+  dependsOn: [Build_test]
+  steps:
+  - task: AzureCLI@2
+    inputs:
+      azureSubscription: 'Nills''s Cloud-scale Datacenter(d19dddf3-9520-4226-a313-ae8ee08675e5)'
+      scriptType: 'bash'
+      scriptLocation: 'inlineScript'
+      inlineScript: |
+        az group create -n $(EnvironmentalVariables.ResourceGroup) -l $(LOCATION) -o table
+        echo "created RG"
+        az network vnet create -g $(EnvironmentalVariables.ResourceGroup) -n $(VNET_NAME) \
+        --address-prefix 10.0.0.0/8 --subnet-name $(AZURE_CLUSTER) \
+        --subnet-prefix 10.240.0.0/16 -o table
+        echo "created vnet"
+        azure_subnet_id=$(az network vnet subnet show --resource-group $(EnvironmentalVariables.ResourceGroup) --vnet-name $(VNET_NAME) --name $(AZURE_CLUSTER) --query id -o tsv)
+        echo "got subnet"
+        az version
+        az extension add --name aks-preview
+        az aks create --no-ssh-key \
+        --resource-group $(EnvironmentalVariables.ResourceGroup) \
+        --name $(AZURE_CLUSTER) \
+        --network-plugin azure \
+        --vnet-subnet-id $azure_subnet_id \
+        --service-principal $(CLIENT-ID) \
+        --client-secret $(CLIENT-SECRET) \
+        -o table --no-wait
+
+- job: Run_test
+  dependsOn: [Create_cluster, Build_test]
+  steps:
+  - download: current
+    artifact: Test
+  - task: AzureCLI@2
+    inputs:
+      azureSubscription: $(ARTIFACT_SUBSCRIPTION)
+      scriptType: 'bash'
+      scriptLocation: 'inlineScript'
+      inlineScript: |
+        az aks get-credentials -n $(AZURE_CLUSTER) -g $(EnvironmentalVariables.ResourceGroup) --file ./kubeconfig
+
+        # get kubectl 
+        curl -LO https://dl.k8s.io/release/v1.20.0/bin/linux/amd64/kubectl
+        chmod +x kubectl
+
+        # deploy azure-npm
+        ./kubectl --kubeconfig=./kubeconfig https://raw.githubusercontent.com/Azure/azure-container-networking/master/npm/azure-npm.yaml
+
+        # swap azure-npm image with one built during run
+        ./kubectl --kubeconifg=./kubeconifg set image daemonset/azure-npm -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-conformance-test
+
+        FQDN=`az aks show -n $(AZURE_CLUSTER) -g $(EnvironmentalVariables.ResourceGroup) --query fqdn -o tsv`
+        echo "##vso[task.setvariable variable=FQDN]$FQDN"
+
+  - bash: |
+      ls -la
+      ls
+      ls -la $(Pipeline.Workspace)
+      ls -la $(Pipeline.Workspace)/Test
+      echo $FQDN
+      ls ~
+      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
+- job: Clean_up
+  condition: always()
+  dependsOn: Run_test
+  steps:
+    - task: AzureCLI@2
+      inputs:
+        azureSubscription: 'Nills''s Cloud-scale Datacenter(d19dddf3-9520-4226-a313-ae8ee08675e5)'
+        scriptType: 'bash'
+        scriptLocation: 'inlineScript'
+        inlineScript: |
+          az group delete -n $(EnvironmentalVariables.ResourceGroup) --yes
\ No newline at end of file

From 64ea2cf753528d97701c43f1d09a7b32bb8d1c7a Mon Sep 17 00:00:00 2001
From: Mathew Merrick <matmerr@microsoft.com>
Date: Thu, 18 Feb 2021 14:54:35 -0800
Subject: [PATCH 02/13] add sub env

---
 .pipelines/Dockerfile                     |  2 +-
 .pipelines/npm/npm-conformance-tests.yaml | 65 ++++++++++++++++++-----
 2 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/.pipelines/Dockerfile b/.pipelines/Dockerfile
index bf208f1e8c..26f9c8c3c8 100644
--- a/.pipelines/Dockerfile
+++ b/.pipelines/Dockerfile
@@ -11,7 +11,7 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic multiverse" | sudo tee -a
 RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic universe" | sudo tee -a /etc/apt/sources.list
 RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic main" | sudo tee -a /etc/apt/sources.list
 RUN apt-get update && apt-get install -y iptables ipset iproute2 ebtables 
-RUN wget -qO- https://golang.org/dl/go1.14.6.linux-amd64.tar.gz | tar zxf - -C /usr/lib/
+RUN wget -qO- https://golang.org/dl/go1.15.linux-amd64.tar.gz | tar zxf - -C /usr/lib/
 ENV PATH="/usr/lib/go/bin/:${PATH}"
 ENV GOROOT="/usr/lib/go"
 ENV GOPATH="/root/go"
diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index 972ec4a910..8d9b2accf9 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -14,30 +14,46 @@ variables:
 jobs:
 
 - job: Build_test
+
+  variables:
+    GOBIN: "$(GOPATH)/bin" # Go binaries path
+    GOPATH: "$(System.DefaultWorkingDirectory)/gopath" # Go workspace path
+
+  pool:
+    name: Networking-ContainerNetworking
+    demands: 
+    - agent.os -equals Linux
+    - Role -equals Build
+
+  container:
+    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   steps:
+
+  - checkout: self
+
   - script: |
+      go env
+      mkdir -p '$(GOBIN)'
+      mkdir -p '$(GOPATH)/pkg'
       BUILD_NUMBER=$(Build.BuildNumber)
       echo "##vso[task.setvariable variable=ResourceGroup;isOutput=true]$(echo "npm-conformance-`date "+%Y-%m-%d-%S"`")"
-      echo "##vso[task.setvariable variable=Tag;isOutput=true]$(git describe --tags --always --dirty)"
-    workingDirectory: "$(modulePath)"
+      echo "##vso[task.setvariable variable=Tag;isOutput=true]$(Build.BuildNumber)$(git describe --tags --always --dirty)"
     name: "EnvironmentalVariables"
     displayName: "Set environmental variables"
     condition: always()
 
-  - task: GoTool@0
-    inputs:
-      version: '1.15.6'
 
   - checkout: self
+
   - script: |
-      make azure-npm-image
+      go env
+      ls
+      VERSION=$(EnvironmentalVariables.Tag)-conformance-test make azure-npm-image
       echo '$(DOCKER_PASSWORD)' | docker login $IMAGE_REGISTRY -u '$(DOCKER_USERNAME)' --password-stdin
-      docker tag $IMAGE_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag) $IMAGE_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-conformance-test
       docker push $IMAGE_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-conformance-test
     displayName: 'build and push azure-npm'
 
-
-  - script: git clone https://github.com/vakalapa/kubernetes.git
+  - script: git clone --depth=1 https://github.com/vakalapa/kubernetes.git
     displayName: 'clone kubernetes repo'
   - bash: |
       cd kubernetes
@@ -49,11 +65,20 @@ jobs:
 
 
 - job: Create_cluster
+  pool:
+    name: Networking-ContainerNetworking
+    demands: 
+    - agent.os -equals Linux
+    - Role -equals Build
+
+  container:
+    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
+
   dependsOn: [Build_test]
   steps:
   - task: AzureCLI@2
     inputs:
-      azureSubscription: 'Nills''s Cloud-scale Datacenter(d19dddf3-9520-4226-a313-ae8ee08675e5)'
+      azureSubscription: $(BUILD_VALIDATIONS_SUBSCRIPTION)
       scriptType: 'bash'
       scriptLocation: 'inlineScript'
       inlineScript: |
@@ -77,13 +102,20 @@ jobs:
         -o table --no-wait
 
 - job: Run_test
+  pool:
+    name: Networking-ContainerNetworking
+    demands: 
+    - agent.os -equals Linux
+    - Role -equals Build
+  container:
+    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   dependsOn: [Create_cluster, Build_test]
   steps:
   - download: current
     artifact: Test
   - task: AzureCLI@2
     inputs:
-      azureSubscription: $(ARTIFACT_SUBSCRIPTION)
+      azureSubscription: $(BUILD_VALIDATIONS_SUBSCRIPTION)
       scriptType: 'bash'
       scriptLocation: 'inlineScript'
       inlineScript: |
@@ -111,13 +143,22 @@ jobs:
       ls ~
       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
+
 - job: Clean_up
+  pool:
+    name: Networking-ContainerNetworking
+    demands: 
+    - agent.os -equals Linux
+    - Role -equals Build
+
+  container:
+    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   condition: always()
   dependsOn: Run_test
   steps:
     - task: AzureCLI@2
       inputs:
-        azureSubscription: 'Nills''s Cloud-scale Datacenter(d19dddf3-9520-4226-a313-ae8ee08675e5)'
+        azureSubscription: $(BUILD_VALIDATIONS_SUBSCRIPTION)
         scriptType: 'bash'
         scriptLocation: 'inlineScript'
         inlineScript: |

From 8d72f11b442b7cf5a8ef72de4d5722c31e8b0a67 Mon Sep 17 00:00:00 2001
From: Mathew Merrick <matmerr@microsoft.com>
Date: Thu, 18 Feb 2021 16:19:11 -0800
Subject: [PATCH 03/13] update pipeline

---
 .pipelines/npm/npm-conformance-tests.yaml | 41 ++++++++++++++---------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index 8d9b2accf9..601ea530dd 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -11,6 +11,10 @@ variables:
   value: westus2
 - name: FQDN
   value: empty
+- name: TAG
+  value: empty
+- name: RESOURCE_GROUP
+  value: empty
 jobs:
 
 - job: Build_test
@@ -29,6 +33,11 @@ jobs:
     image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   steps:
 
+  - script: |
+      rm -rf ./*
+    displayName: "Set up OS environment"
+
+
   - checkout: self
 
   - script: |
@@ -36,21 +45,22 @@ jobs:
       mkdir -p '$(GOBIN)'
       mkdir -p '$(GOPATH)/pkg'
       BUILD_NUMBER=$(Build.BuildNumber)
-      echo "##vso[task.setvariable variable=ResourceGroup;isOutput=true]$(echo "npm-conformance-`date "+%Y-%m-%d-%S"`")"
-      echo "##vso[task.setvariable variable=Tag;isOutput=true]$(Build.BuildNumber)$(git describe --tags --always --dirty)"
+      echo "##vso[task.setvariable variable=RESOURCE_GROUP;isOutput=true]$(echo "npm-conformance-`date "+%Y-%m-%d-%S"`")"
+      echo "##vso[task.setvariable variable=TAG;isOutput=true]$(git describe --tags --always --dirty)-conformance-test"
     name: "EnvironmentalVariables"
     displayName: "Set environmental variables"
     condition: always()
 
 
-  - checkout: self
-
   - script: |
       go env
+      echo -----
       ls
-      VERSION=$(EnvironmentalVariables.Tag)-conformance-test make azure-npm-image
+      echo -----
+      pwd
+      VERSION=$(TAG) make azure-npm-image
       echo '$(DOCKER_PASSWORD)' | docker login $IMAGE_REGISTRY -u '$(DOCKER_USERNAME)' --password-stdin
-      docker push $IMAGE_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-conformance-test
+      docker push $IMAGE_REGISTRY/azure-npm:$(TAG)
     displayName: 'build and push azure-npm'
 
   - script: git clone --depth=1 https://github.com/vakalapa/kubernetes.git
@@ -82,23 +92,21 @@ jobs:
       scriptType: 'bash'
       scriptLocation: 'inlineScript'
       inlineScript: |
-        az group create -n $(EnvironmentalVariables.ResourceGroup) -l $(LOCATION) -o table
+        az group create -n $(RESOURCE_GROUP) -l $(LOCATION) -o table
         echo "created RG"
-        az network vnet create -g $(EnvironmentalVariables.ResourceGroup) -n $(VNET_NAME) \
+        az network vnet create -g $(Tag) -n $(VNET_NAME) \
         --address-prefix 10.0.0.0/8 --subnet-name $(AZURE_CLUSTER) \
         --subnet-prefix 10.240.0.0/16 -o table
         echo "created vnet"
-        azure_subnet_id=$(az network vnet subnet show --resource-group $(EnvironmentalVariables.ResourceGroup) --vnet-name $(VNET_NAME) --name $(AZURE_CLUSTER) --query id -o tsv)
+        azure_subnet_id=$(az network vnet subnet show --resource-group $(RESOURCE_GROUP) --vnet-name $(VNET_NAME) --name $(AZURE_CLUSTER) --query id -o tsv)
         echo "got subnet"
         az version
         az extension add --name aks-preview
         az aks create --no-ssh-key \
-        --resource-group $(EnvironmentalVariables.ResourceGroup) \
+        --resource-group $((RESOURCE_GROUP) \
         --name $(AZURE_CLUSTER) \
         --network-plugin azure \
         --vnet-subnet-id $azure_subnet_id \
-        --service-principal $(CLIENT-ID) \
-        --client-secret $(CLIENT-SECRET) \
         -o table --no-wait
 
 - job: Run_test
@@ -119,7 +127,7 @@ jobs:
       scriptType: 'bash'
       scriptLocation: 'inlineScript'
       inlineScript: |
-        az aks get-credentials -n $(AZURE_CLUSTER) -g $(EnvironmentalVariables.ResourceGroup) --file ./kubeconfig
+        az aks get-credentials -n $(AZURE_CLUSTER) -g $(RESOURCE_GROUP) --file ./kubeconfig
 
         # get kubectl 
         curl -LO https://dl.k8s.io/release/v1.20.0/bin/linux/amd64/kubectl
@@ -129,9 +137,9 @@ jobs:
         ./kubectl --kubeconfig=./kubeconfig https://raw.githubusercontent.com/Azure/azure-container-networking/master/npm/azure-npm.yaml
 
         # swap azure-npm image with one built during run
-        ./kubectl --kubeconifg=./kubeconifg set image daemonset/azure-npm -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-conformance-test
+        ./kubectl --kubeconifg=./kubeconifg set image daemonset/azure-npm -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:$(TAG)
 
-        FQDN=`az aks show -n $(AZURE_CLUSTER) -g $(EnvironmentalVariables.ResourceGroup) --query fqdn -o tsv`
+        FQDN=`az aks show -n $(AZURE_CLUSTER) -g $(RESOURCE_GROUP) --query fqdn -o tsv`
         echo "##vso[task.setvariable variable=FQDN]$FQDN"
 
   - bash: |
@@ -162,4 +170,5 @@ jobs:
         scriptType: 'bash'
         scriptLocation: 'inlineScript'
         inlineScript: |
-          az group delete -n $(EnvironmentalVariables.ResourceGroup) --yes
\ No newline at end of file
+          az group delete -n $(RESOURCE_GROUP) --yes
+          az acr repository delete --name $IMAGE_REGISTRY --image azure-npm:$(TAG) --yes
\ No newline at end of file

From b90beea05fc56501d90c8e777b253c307b8b392a Mon Sep 17 00:00:00 2001
From: Mathew Merrick <matmerr@microsoft.com>
Date: Thu, 18 Feb 2021 16:54:56 -0800
Subject: [PATCH 04/13] move aks cluster create up

---
 .pipelines/npm/npm-conformance-tests.yaml | 66 +++++++++++------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index 601ea530dd..849b67010b 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -17,6 +17,37 @@ variables:
   value: empty
 jobs:
 
+- job: Create_cluster
+  pool:
+    name: Networking-ContainerNetworking
+    demands: 
+    - agent.os -equals Linux
+    - Role -equals Build
+
+  container:
+    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
+
+  #dependsOn: [Build_test]
+  steps:
+  - script: |
+      rm -rf ./*
+    displayName: "Set up OS environment"
+
+  - checkout: self
+
+  - task: AzureCLI@2
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SUBSCRIPTION)
+      scriptType: 'bash'
+      scriptLocation: 'inlineScript'
+      inlineScript: |
+        az group create -n $(RESOURCE_GROUP) -l $(LOCATION) -o table
+        echo "created RG"
+        az version
+        az aks create --no-ssh-key \
+        --resource-group $(RESOURCE_GROUP) \
+        --name $(AZURE_CLUSTER) 
+
 - job: Build_test
 
   variables:
@@ -63,7 +94,7 @@ jobs:
       docker push $IMAGE_REGISTRY/azure-npm:$(TAG)
     displayName: 'build and push azure-npm'
 
-  - script: git clone --depth=1 https://github.com/vakalapa/kubernetes.git
+  - script: git clone https://github.com/vakalapa/kubernetes.git
     displayName: 'clone kubernetes repo'
   - bash: |
       cd kubernetes
@@ -74,40 +105,7 @@ jobs:
     artifact: Test
 
 
-- job: Create_cluster
-  pool:
-    name: Networking-ContainerNetworking
-    demands: 
-    - agent.os -equals Linux
-    - Role -equals Build
-
-  container:
-    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
 
-  dependsOn: [Build_test]
-  steps:
-  - task: AzureCLI@2
-    inputs:
-      azureSubscription: $(BUILD_VALIDATIONS_SUBSCRIPTION)
-      scriptType: 'bash'
-      scriptLocation: 'inlineScript'
-      inlineScript: |
-        az group create -n $(RESOURCE_GROUP) -l $(LOCATION) -o table
-        echo "created RG"
-        az network vnet create -g $(Tag) -n $(VNET_NAME) \
-        --address-prefix 10.0.0.0/8 --subnet-name $(AZURE_CLUSTER) \
-        --subnet-prefix 10.240.0.0/16 -o table
-        echo "created vnet"
-        azure_subnet_id=$(az network vnet subnet show --resource-group $(RESOURCE_GROUP) --vnet-name $(VNET_NAME) --name $(AZURE_CLUSTER) --query id -o tsv)
-        echo "got subnet"
-        az version
-        az extension add --name aks-preview
-        az aks create --no-ssh-key \
-        --resource-group $((RESOURCE_GROUP) \
-        --name $(AZURE_CLUSTER) \
-        --network-plugin azure \
-        --vnet-subnet-id $azure_subnet_id \
-        -o table --no-wait
 
 - job: Run_test
   pool:

From 4ecbc502886d1b9af373d50233dcd4b57f67488c Mon Sep 17 00:00:00 2001
From: Mathew Merrick <matmerr@microsoft.com>
Date: Thu, 18 Feb 2021 17:38:43 -0800
Subject: [PATCH 05/13] add netplugin

---
 .pipelines/npm/npm-conformance-tests.yaml | 64 ++++++++++-------------
 1 file changed, 27 insertions(+), 37 deletions(-)

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index 849b67010b..138d0a8497 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -17,58 +17,22 @@ variables:
   value: empty
 jobs:
 
-- job: Create_cluster
-  pool:
-    name: Networking-ContainerNetworking
-    demands: 
-    - agent.os -equals Linux
-    - Role -equals Build
-
-  container:
-    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
-
-  #dependsOn: [Build_test]
-  steps:
-  - script: |
-      rm -rf ./*
-    displayName: "Set up OS environment"
-
-  - checkout: self
-
-  - task: AzureCLI@2
-    inputs:
-      azureSubscription: $(BUILD_VALIDATIONS_SUBSCRIPTION)
-      scriptType: 'bash'
-      scriptLocation: 'inlineScript'
-      inlineScript: |
-        az group create -n $(RESOURCE_GROUP) -l $(LOCATION) -o table
-        echo "created RG"
-        az version
-        az aks create --no-ssh-key \
-        --resource-group $(RESOURCE_GROUP) \
-        --name $(AZURE_CLUSTER) 
-
 - job: Build_test
-
   variables:
     GOBIN: "$(GOPATH)/bin" # Go binaries path
     GOPATH: "$(System.DefaultWorkingDirectory)/gopath" # Go workspace path
-
   pool:
     name: Networking-ContainerNetworking
     demands: 
     - agent.os -equals Linux
     - Role -equals Build
-
   container:
     image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   steps:
-
   - script: |
       rm -rf ./*
     displayName: "Set up OS environment"
 
-
   - checkout: self
 
   - script: |
@@ -82,7 +46,6 @@ jobs:
     displayName: "Set environmental variables"
     condition: always()
 
-
   - script: |
       go env
       echo -----
@@ -105,7 +68,34 @@ jobs:
     artifact: Test
 
 
+- job: Create_cluster
+  pool:
+    name: Networking-ContainerNetworking
+    demands: 
+    - agent.os -equals Linux
+    - Role -equals Build
+  container:
+    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
+  steps:
+  - script: |
+      rm -rf ./*
+    displayName: "Set up OS environment"
+
+  - checkout: self
 
+  - task: AzureCLI@2
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SUBSCRIPTION)
+      scriptType: 'bash'
+      scriptLocation: 'inlineScript'
+      inlineScript: |
+        az group create -n $(RESOURCE_GROUP) -l $(LOCATION) -o table
+        echo "created RG"
+        az version
+        az aks create --no-ssh-key \
+        --resource-group $(RESOURCE_GROUP) \
+        --name $(AZURE_CLUSTER) \
+        --network-plugin azure
 
 - job: Run_test
   pool:

From a3cec0fa226e84fbb4bc8ff11dca39e22a89e848 Mon Sep 17 00:00:00 2001
From: Mathew Merrick <matmerr@microsoft.com>
Date: Thu, 18 Feb 2021 17:41:02 -0800
Subject: [PATCH 06/13] setup

---
 .pipelines/npm/npm-conformance-tests.yaml | 71 ++++++++++-------------
 1 file changed, 30 insertions(+), 41 deletions(-)

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index 138d0a8497..798026df8e 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -1,7 +1,14 @@
 trigger:
 - main
+
 pool:
-  vmImage: 'ubuntu-20.04'
+  name: Networking-ContainerNetworking
+  demands: 
+  - agent.os -equals Linux
+  - Role -equals Build
+  container:
+    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
+
 variables:
 - name: AZURE_CLUSTER
   value: azure-npm
@@ -15,19 +22,29 @@ variables:
   value: empty
 - name: RESOURCE_GROUP
   value: empty
+
+
 jobs:
+- job: setup
+  steps:
+  - script: |
+      go env
+      go version
+      mkdir -p '$(GOBIN)'
+      mkdir -p '$(GOPATH)/pkg'
+      BUILD_NUMBER=$(Build.BuildNumber)
+      echo "##vso[task.setvariable variable=RESOURCE_GROUP]$(echo "npm-conformance-`date "+%Y-%m-%d-%S"`")"
+      echo "##vso[task.setvariable variable=TAG]$(git describe --tags --always --dirty)-conformance-test"
+    name: "EnvironmentalVariables"
+    displayName: "Set environmental variables"
+    condition: always()
 
 - job: Build_test
+  dependsOn: [setup]
   variables:
     GOBIN: "$(GOPATH)/bin" # Go binaries path
     GOPATH: "$(System.DefaultWorkingDirectory)/gopath" # Go workspace path
-  pool:
-    name: Networking-ContainerNetworking
-    demands: 
-    - agent.os -equals Linux
-    - Role -equals Build
-  container:
-    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
+
   steps:
   - script: |
       rm -rf ./*
@@ -35,23 +52,16 @@ jobs:
 
   - checkout: self
 
-  - script: |
-      go env
-      mkdir -p '$(GOBIN)'
-      mkdir -p '$(GOPATH)/pkg'
-      BUILD_NUMBER=$(Build.BuildNumber)
-      echo "##vso[task.setvariable variable=RESOURCE_GROUP;isOutput=true]$(echo "npm-conformance-`date "+%Y-%m-%d-%S"`")"
-      echo "##vso[task.setvariable variable=TAG;isOutput=true]$(git describe --tags --always --dirty)-conformance-test"
-    name: "EnvironmentalVariables"
-    displayName: "Set environmental variables"
-    condition: always()
-
   - script: |
       go env
       echo -----
       ls
       echo -----
       pwd
+      echo ------
+      echo $(TAG)
+      echo $(RESOURCE_GROUP)
+      echo ------
       VERSION=$(TAG) make azure-npm-image
       echo '$(DOCKER_PASSWORD)' | docker login $IMAGE_REGISTRY -u '$(DOCKER_USERNAME)' --password-stdin
       docker push $IMAGE_REGISTRY/azure-npm:$(TAG)
@@ -69,13 +79,7 @@ jobs:
 
 
 - job: Create_cluster
-  pool:
-    name: Networking-ContainerNetworking
-    demands: 
-    - agent.os -equals Linux
-    - Role -equals Build
-  container:
-    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
+  dependsOn: [setup]
   steps:
   - script: |
       rm -rf ./*
@@ -98,13 +102,6 @@ jobs:
         --network-plugin azure
 
 - job: Run_test
-  pool:
-    name: Networking-ContainerNetworking
-    demands: 
-    - agent.os -equals Linux
-    - Role -equals Build
-  container:
-    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   dependsOn: [Create_cluster, Build_test]
   steps:
   - download: current
@@ -141,14 +138,6 @@ jobs:
       KUBERNETES_SERVICE_HOST="$FQDN" KUBERNETES_SERVICE_PORT=443 $(Pipeline.Workspace)/Test/e2e.test --provider=local --ginkgo.focus="NetworkPolicy" --ginkgo.skip="SCTP" --kubeconfig=./kubeconfig
 
 - job: Clean_up
-  pool:
-    name: Networking-ContainerNetworking
-    demands: 
-    - agent.os -equals Linux
-    - Role -equals Build
-
-  container:
-    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   condition: always()
   dependsOn: Run_test
   steps:

From e57b427a0548019ae3405fff1aba6c3f5f31e057 Mon Sep 17 00:00:00 2001
From: Mathew Merrick <matmerr@microsoft.com>
Date: Thu, 18 Feb 2021 18:07:26 -0800
Subject: [PATCH 07/13] pool info

---
 .pipelines/npm/npm-conformance-tests.yaml | 38 +++++++++++++++++------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index 798026df8e..420d9977b4 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -1,14 +1,6 @@
 trigger:
 - main
 
-pool:
-  name: Networking-ContainerNetworking
-  demands: 
-  - agent.os -equals Linux
-  - Role -equals Build
-  container:
-    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
-
 variables:
 - name: AZURE_CLUSTER
   value: azure-npm
@@ -26,6 +18,13 @@ variables:
 
 jobs:
 - job: setup
+  pool:
+    name: Networking-ContainerNetworking
+    demands: 
+    - agent.os -equals Linux
+    - Role -equals Build
+  container:
+    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   steps:
   - script: |
       go env
@@ -40,6 +39,13 @@ jobs:
     condition: always()
 
 - job: Build_test
+  pool:
+    name: Networking-ContainerNetworking
+    demands: 
+    - agent.os -equals Linux
+    - Role -equals Build
+  container:
+    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   dependsOn: [setup]
   variables:
     GOBIN: "$(GOPATH)/bin" # Go binaries path
@@ -50,7 +56,7 @@ jobs:
       rm -rf ./*
     displayName: "Set up OS environment"
 
-  - checkout: self
+
 
   - script: |
       go env
@@ -79,6 +85,13 @@ jobs:
 
 
 - job: Create_cluster
+  pool:
+    name: Networking-ContainerNetworking
+    demands: 
+    - agent.os -equals Linux
+    - Role -equals Build
+  container:
+    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   dependsOn: [setup]
   steps:
   - script: |
@@ -102,6 +115,13 @@ jobs:
         --network-plugin azure
 
 - job: Run_test
+  pool:
+    name: Networking-ContainerNetworking
+    demands: 
+    - agent.os -equals Linux
+    - Role -equals Build
+  container:
+    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   dependsOn: [Create_cluster, Build_test]
   steps:
   - download: current

From d2f955afcbbfaed8a8289858beaaadf471e40852 Mon Sep 17 00:00:00 2001
From: Mathew Merrick <matmerr@microsoft.com>
Date: Thu, 18 Feb 2021 18:21:29 -0800
Subject: [PATCH 08/13] local vars

---
 .pipelines/npm/npm-conformance-tests.yaml | 27 +++++++++++++++++------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index 420d9977b4..e0a0a6825b 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -10,10 +10,7 @@ variables:
   value: westus2
 - name: FQDN
   value: empty
-- name: TAG
-  value: empty
-- name: RESOURCE_GROUP
-  value: empty
+
 
 
 jobs:
@@ -26,14 +23,19 @@ jobs:
   container:
     image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   steps:
+
+  - checkout: self
+
   - script: |
       go env
       go version
       mkdir -p '$(GOBIN)'
       mkdir -p '$(GOPATH)/pkg'
       BUILD_NUMBER=$(Build.BuildNumber)
-      echo "##vso[task.setvariable variable=RESOURCE_GROUP]$(echo "npm-conformance-`date "+%Y-%m-%d-%S"`")"
-      echo "##vso[task.setvariable variable=TAG]$(git describe --tags --always --dirty)-conformance-test"
+      RG=$(echo "npm-conformance-`date "+%Y-%m-%d-%S"`")
+      TAG=$(git describe --tags --always --dirty)-conformance-test
+      echo "##vso[task.setvariable variable=RESOURCE_GROUP;isOutput=true;]$RG"
+      echo "##vso[task.setvariable variable=TAG;isOutput=true;]$TAG"
     name: "EnvironmentalVariables"
     displayName: "Set environmental variables"
     condition: always()
@@ -50,13 +52,15 @@ jobs:
   variables:
     GOBIN: "$(GOPATH)/bin" # Go binaries path
     GOPATH: "$(System.DefaultWorkingDirectory)/gopath" # Go workspace path
+    RESOURCE_GROUP: $[ dependencies.setup.outputs['RESOURCE_GROUP'] ]
+    TAG: $[ dependencies.setup.outputs['TAG'] ]
 
   steps:
   - script: |
       rm -rf ./*
     displayName: "Set up OS environment"
 
-
+  - checkout: self
 
   - script: |
       go env
@@ -93,6 +97,9 @@ jobs:
   container:
     image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   dependsOn: [setup]
+  variables:
+    RESOURCE_GROUP: $[ dependencies.setup.outputs['RESOURCE_GROUP'] ]
+    TAG: $[ dependencies.setup.outputs['TAG'] ]
   steps:
   - script: |
       rm -rf ./*
@@ -123,6 +130,9 @@ jobs:
   container:
     image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   dependsOn: [Create_cluster, Build_test]
+  variables:
+    RESOURCE_GROUP: $[ dependencies.setup.outputs['RESOURCE_GROUP'] ]
+    TAG: $[ dependencies.setup.outputs['TAG'] ]
   steps:
   - download: current
     artifact: Test
@@ -160,6 +170,9 @@ jobs:
 - job: Clean_up
   condition: always()
   dependsOn: Run_test
+  variables:
+    RESOURCE_GROUP: $[ dependencies.setup.outputs['RESOURCE_GROUP'] ]
+    TAG: $[ dependencies.setup.outputs['TAG'] ]
   steps:
     - task: AzureCLI@2
       inputs:

From 41ecdd346c26e5fc169e5b605c553c8bd40e5a30 Mon Sep 17 00:00:00 2001
From: Mathew Merrick <matmerr@microsoft.com>
Date: Thu, 18 Feb 2021 18:48:59 -0800
Subject: [PATCH 09/13] specify pool

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

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index e0a0a6825b..71c6851f3d 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -34,8 +34,12 @@ jobs:
       BUILD_NUMBER=$(Build.BuildNumber)
       RG=$(echo "npm-conformance-`date "+%Y-%m-%d-%S"`")
       TAG=$(git describe --tags --always --dirty)-conformance-test
+      echo "Resource group: $RG"
+      echo "Image tag: $TAG"
+
       echo "##vso[task.setvariable variable=RESOURCE_GROUP;isOutput=true;]$RG"
       echo "##vso[task.setvariable variable=TAG;isOutput=true;]$TAG"
+
     name: "EnvironmentalVariables"
     displayName: "Set environmental variables"
     condition: always()
@@ -52,8 +56,8 @@ jobs:
   variables:
     GOBIN: "$(GOPATH)/bin" # Go binaries path
     GOPATH: "$(System.DefaultWorkingDirectory)/gopath" # Go workspace path
-    RESOURCE_GROUP: $[ dependencies.setup.outputs['RESOURCE_GROUP'] ]
-    TAG: $[ dependencies.setup.outputs['TAG'] ]
+    RESOURCE_GROUP: $[ dependencies.setup.outputs['EnvironmentalVariables.RESOURCE_GROUP'] ]
+    TAG: $[ dependencies.setup.outputs['EnvironmentalVariables.TAG'] ]
 
   steps:
   - script: |
@@ -98,11 +102,11 @@ jobs:
     image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   dependsOn: [setup]
   variables:
-    RESOURCE_GROUP: $[ dependencies.setup.outputs['RESOURCE_GROUP'] ]
-    TAG: $[ dependencies.setup.outputs['TAG'] ]
+    RESOURCE_GROUP: $[ dependencies.setup.outputs['EnvironmentalVariables.RESOURCE_GROUP'] ]
+    TAG: $[ dependencies.setup.outputs['EnvironmentalVariables.TAG'] ]
   steps:
   - script: |
-      rm -rf ./*
+      sudo rm -rf ./*
     displayName: "Set up OS environment"
 
   - checkout: self
@@ -131,8 +135,8 @@ jobs:
     image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   dependsOn: [Create_cluster, Build_test]
   variables:
-    RESOURCE_GROUP: $[ dependencies.setup.outputs['RESOURCE_GROUP'] ]
-    TAG: $[ dependencies.setup.outputs['TAG'] ]
+    RESOURCE_GROUP: $[ dependencies.setup.outputs['EnvironmentalVariables.RESOURCE_GROUP'] ]
+    TAG: $[ dependencies.setup.outputs['EnvironmentalVariables.TAG'] ]
   steps:
   - download: current
     artifact: Test
@@ -142,8 +146,12 @@ jobs:
       scriptType: 'bash'
       scriptLocation: 'inlineScript'
       inlineScript: |
+        echo Cluster $(AZURE_CLUSTER)
+        echo Resource $(RESOURCE_GROUP)
+        ls -lah
         az aks get-credentials -n $(AZURE_CLUSTER) -g $(RESOURCE_GROUP) --file ./kubeconfig
-
+        echo ------
+        ls -lah
         # get kubectl 
         curl -LO https://dl.k8s.io/release/v1.20.0/bin/linux/amd64/kubectl
         chmod +x kubectl
@@ -152,7 +160,7 @@ jobs:
         ./kubectl --kubeconfig=./kubeconfig https://raw.githubusercontent.com/Azure/azure-container-networking/master/npm/azure-npm.yaml
 
         # swap azure-npm image with one built during run
-        ./kubectl --kubeconifg=./kubeconifg set image daemonset/azure-npm -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:$(TAG)
+        ./kubectl --kubeconfig=./kubeconifg set image daemonset/azure-npm -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:$(TAG)
 
         FQDN=`az aks show -n $(AZURE_CLUSTER) -g $(RESOURCE_GROUP) --query fqdn -o tsv`
         echo "##vso[task.setvariable variable=FQDN]$FQDN"
@@ -168,17 +176,25 @@ jobs:
       KUBERNETES_SERVICE_HOST="$FQDN" KUBERNETES_SERVICE_PORT=443 $(Pipeline.Workspace)/Test/e2e.test --provider=local --ginkgo.focus="NetworkPolicy" --ginkgo.skip="SCTP" --kubeconfig=./kubeconfig
 
 - job: Clean_up
+  pool:
+    name: Networking-ContainerNetworking
+    demands: 
+    - agent.os -equals Linux
+    - Role -equals Build
+  container:
+    image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   condition: always()
   dependsOn: Run_test
   variables:
-    RESOURCE_GROUP: $[ dependencies.setup.outputs['RESOURCE_GROUP'] ]
-    TAG: $[ dependencies.setup.outputs['TAG'] ]
+    RESOURCE_GROUP: $[ dependencies.setup.outputs['EnvironmentalVariables.RESOURCE_GROUP'] ]
+    TAG: $[ dependencies.setup.outputs['EnvironmentalVariables.TAG'] ]
   steps:
+    - checkout: none
     - task: AzureCLI@2
       inputs:
         azureSubscription: $(BUILD_VALIDATIONS_SUBSCRIPTION)
         scriptType: 'bash'
         scriptLocation: 'inlineScript'
         inlineScript: |
+          echo Deleting $(RESOURCE_GROUP)
           az group delete -n $(RESOURCE_GROUP) --yes
-          az acr repository delete --name $IMAGE_REGISTRY --image azure-npm:$(TAG) --yes
\ No newline at end of file

From 155b05eb2b0ac6b5f601f8ac14f972d6823ebf82 Mon Sep 17 00:00:00 2001
From: Mathew Merrick <matmerr@microsoft.com>
Date: Fri, 19 Feb 2021 09:55:22 -0800
Subject: [PATCH 10/13] dependencies

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

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index 71c6851f3d..ef2c4f8cd9 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -118,7 +118,7 @@ jobs:
       scriptLocation: 'inlineScript'
       inlineScript: |
         az group create -n $(RESOURCE_GROUP) -l $(LOCATION) -o table
-        echo "created RG"
+        echo created RG $(RESOURCE_GROUP) in $(LOCATION)
         az version
         az aks create --no-ssh-key \
         --resource-group $(RESOURCE_GROUP) \
@@ -133,7 +133,7 @@ jobs:
     - Role -equals Build
   container:
     image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
-  dependsOn: [Create_cluster, Build_test]
+  dependsOn: [Create_cluster, Build_test, setup]
   variables:
     RESOURCE_GROUP: $[ dependencies.setup.outputs['EnvironmentalVariables.RESOURCE_GROUP'] ]
     TAG: $[ dependencies.setup.outputs['EnvironmentalVariables.TAG'] ]
@@ -184,7 +184,7 @@ jobs:
   container:
     image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
   condition: always()
-  dependsOn: Run_test
+  dependsOn: [Run_test, setup]
   variables:
     RESOURCE_GROUP: $[ dependencies.setup.outputs['EnvironmentalVariables.RESOURCE_GROUP'] ]
     TAG: $[ dependencies.setup.outputs['EnvironmentalVariables.TAG'] ]

From 78ea4ef8b0d21563e09a7ba73baa3b816bf40604 Mon Sep 17 00:00:00 2001
From: Mathew Merrick <matmerr@microsoft.com>
Date: Fri, 19 Feb 2021 10:13:59 -0800
Subject: [PATCH 11/13] typo

---
 .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 ef2c4f8cd9..3a95cb7579 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -157,10 +157,10 @@ jobs:
         chmod +x kubectl
 
         # deploy azure-npm
-        ./kubectl --kubeconfig=./kubeconfig https://raw.githubusercontent.com/Azure/azure-container-networking/master/npm/azure-npm.yaml
+        ./kubectl --kubeconfig=./kubeconfig apply -f https://raw.githubusercontent.com/Azure/azure-container-networking/master/npm/azure-npm.yaml
 
         # swap azure-npm image with one built during run
-        ./kubectl --kubeconfig=./kubeconifg set image daemonset/azure-npm -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:$(TAG)
+        ./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:$(TAG)
 
         FQDN=`az aks show -n $(AZURE_CLUSTER) -g $(RESOURCE_GROUP) --query fqdn -o tsv`
         echo "##vso[task.setvariable variable=FQDN]$FQDN"

From c120c71c93abe47ca4d7e69605b93aa677222e98 Mon Sep 17 00:00:00 2001
From: Mathew Merrick <matmerr@microsoft.com>
Date: Fri, 19 Feb 2021 10:41:05 -0800
Subject: [PATCH 12/13] add display names

---
 .pipelines/npm/npm-conformance-tests.yaml | 33 ++++++++++++-----------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml
index 3a95cb7579..58ca0c6825 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -11,10 +11,9 @@ variables:
 - name: FQDN
   value: empty
 
-
-
 jobs:
 - job: setup
+  displayName: "Configure Test Environment"
   pool:
     name: Networking-ContainerNetworking
     demands: 
@@ -45,6 +44,7 @@ jobs:
     condition: always()
 
 - job: Build_test
+  displayName: "Build NPM and Kubernetes Test Suite"
   pool:
     name: Networking-ContainerNetworking
     demands: 
@@ -68,31 +68,26 @@ jobs:
 
   - script: |
       go env
-      echo -----
-      ls
-      echo -----
-      pwd
-      echo ------
-      echo $(TAG)
-      echo $(RESOURCE_GROUP)
-      echo ------
+      echo Tag: $(TAG)
+      echo ResourceGroup: $(RESOURCE_GROUP)
       VERSION=$(TAG) make azure-npm-image
       echo '$(DOCKER_PASSWORD)' | docker login $IMAGE_REGISTRY -u '$(DOCKER_USERNAME)' --password-stdin
       docker push $IMAGE_REGISTRY/azure-npm:$(TAG)
-    displayName: 'build and push azure-npm'
+    displayName: 'Build and Push NPM Image'
 
   - script: git clone https://github.com/vakalapa/kubernetes.git
-    displayName: 'clone kubernetes repo'
+    displayName: 'Clone Kubernetes Repo'
   - bash: |
       cd kubernetes
       git checkout vakr/sleepinnpmtests
       make WHAT=test/e2e/e2e.test
-    displayName: 'build e2e.test'
+    displayName: 'Build Kubernetes e2e.test'
   - publish: $(System.DefaultWorkingDirectory)/kubernetes/_output/local/bin/linux/amd64
     artifact: Test
 
 
 - job: Create_cluster
+  displayName: "Deploy AKS Cluster"
   pool:
     name: Networking-ContainerNetworking
     demands: 
@@ -112,6 +107,7 @@ jobs:
   - checkout: self
 
   - task: AzureCLI@2
+    displayName: "Deploy"
     inputs:
       azureSubscription: $(BUILD_VALIDATIONS_SUBSCRIPTION)
       scriptType: 'bash'
@@ -126,6 +122,7 @@ jobs:
         --network-plugin azure
 
 - job: Run_test
+  displayName: "Run Kubernetes Network Policy Test Suite"
   pool:
     name: Networking-ContainerNetworking
     demands: 
@@ -141,6 +138,7 @@ jobs:
   - download: current
     artifact: Test
   - task: AzureCLI@2
+    displayName: "Deploy NPM to Test Cluster"
     inputs:
       azureSubscription: $(BUILD_VALIDATIONS_SUBSCRIPTION)
       scriptType: 'bash'
@@ -148,10 +146,8 @@ jobs:
       inlineScript: |
         echo Cluster $(AZURE_CLUSTER)
         echo Resource $(RESOURCE_GROUP)
-        ls -lah
+
         az aks get-credentials -n $(AZURE_CLUSTER) -g $(RESOURCE_GROUP) --file ./kubeconfig
-        echo ------
-        ls -lah
         # get kubectl 
         curl -LO https://dl.k8s.io/release/v1.20.0/bin/linux/amd64/kubectl
         chmod +x kubectl
@@ -162,6 +158,8 @@ jobs:
         # swap azure-npm image with one built during run
         ./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:$(TAG)
 
+        ./kubectl --kubeconfig=./kubeconfig describe daemonset azure-npm -n kube-system
+
         FQDN=`az aks show -n $(AZURE_CLUSTER) -g $(RESOURCE_GROUP) --query fqdn -o tsv`
         echo "##vso[task.setvariable variable=FQDN]$FQDN"
 
@@ -174,8 +172,10 @@ jobs:
       ls ~
       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
+    displayName: "Run Test Suite"
 
 - job: Clean_up
+  displayName: "Cleanup"
   pool:
     name: Networking-ContainerNetworking
     demands: 
@@ -191,6 +191,7 @@ jobs:
   steps:
     - checkout: none
     - task: AzureCLI@2
+      displayName: "Delete Test Cluster Resource Group"
       inputs:
         azureSubscription: $(BUILD_VALIDATIONS_SUBSCRIPTION)
         scriptType: 'bash'

From 16895997204c277613e4d1ed84201b3b87c5fbc7 Mon Sep 17 00:00:00 2001
From: Mathew Merrick <matmerr@microsoft.com>
Date: Fri, 19 Feb 2021 10:44:41 -0800
Subject: [PATCH 13/13] add kubernetes prefix

---
 .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 58ca0c6825..e406d40452 100644
--- a/.pipelines/npm/npm-conformance-tests.yaml
+++ b/.pipelines/npm/npm-conformance-tests.yaml
@@ -31,7 +31,7 @@ jobs:
       mkdir -p '$(GOBIN)'
       mkdir -p '$(GOPATH)/pkg'
       BUILD_NUMBER=$(Build.BuildNumber)
-      RG=$(echo "npm-conformance-`date "+%Y-%m-%d-%S"`")
+      RG=kubernetes-$(echo "npm-conformance-`date "+%Y-%m-%d-%S"`")
       TAG=$(git describe --tags --always --dirty)-conformance-test
       echo "Resource group: $RG"
       echo "Image tag: $TAG"