fixup! Separate Build Changes

Author: Sheyla Trudo

.pipelines/cni/k8s-e2e/k8s-e2e.jobs.yaml

@@ -8,26 +8,17 @@ parameters:
 
 jobs:
   - job: CNI_${{ parameters.os }}
-    condition: and( not(canceled()), not(failed()) )
     displayName: CNI k8s E2E ${{ parameters.os }}
     dependsOn: ${{ parameters.dependsOn }}
     pool:
-      isCustom: true
-      type: linux
       name: $(BUILD_POOL_NAME_DEFAULT)
-    variables:
-      ob_outputDirectory: $(Build.ArtifactStagingDirectory)/output
-      ob_git_checkout: true
+      os: linux
     steps:
-      - checkout: ACNReviewChanges
-        clean: true
-
       - task: AzureCLI@2
         inputs:
           azureSubscription: ${{ parameters.sub }}
           scriptLocation: "inlineScript"
           scriptType: "bash"
-          workingDirectory: $(ACN_DIR)
           addSpnToEnvironment: true
           inlineScript: |
             set -e
@@ -42,9 +33,8 @@ jobs:
             # https://github.com/kubernetes/sig-release/blob/master/release-engineering/artifacts.md#content-of-kubernetes-test-system-archtargz-on-example-of-kubernetes-test-linux-amd64targz-directories-removed-from-list
             # explictly unzip and strip directories from ginkgo and e2e.test
             tar -xvzf kubernetes-test-linux-amd64.tar.gz --strip-components=3 kubernetes/test/bin/ginkgo kubernetes/test/bin/e2e.test
-        displayName: "Setup Environment"
-        retryCountOnTaskFailure: 5
 
+        displayName: "Setup Environment"
       - ${{ if contains(parameters.os, 'windows') }}:
         - script: |
             set -e
@@ -57,13 +47,11 @@ jobs:
               kubectl exec -i -n kube-system $pod -- powershell "Restart-Service kubeproxy"
               kubectl exec -i -n kube-system $pod -- powershell "Get-Service kubeproxy"
             done
-          workingDirectory: $(ACN_DIR)
           name: kubeproxy
           displayName: Restart Kubeproxy on Windows nodes
           retryCountOnTaskFailure: 3
-
       - ${{ if eq(parameters.datapath, true) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
+        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
           parameters:
             testName: Datapath
             name: datapath
@@ -72,9 +60,8 @@ jobs:
             os: ${{ parameters.os }}
             processes: 8
             attempts: 10
-
       - ${{ if eq(parameters.dns, true) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
+        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
           parameters:
             testName: DNS
             name: dns
@@ -83,9 +70,8 @@ jobs:
             os: ${{ parameters.os }}
             processes: 8
             attempts: 3
-
       - ${{ if eq(parameters.portforward, true) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
+        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
           parameters:
             testName: Kubectl Portforward
             name: portforward
@@ -94,9 +80,8 @@ jobs:
             os: ${{ parameters.os }}
             processes: 8
             attempts: 3
-
       - ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cni') ) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
+        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
           parameters:
             testName: Service Conformance
             name: service
@@ -105,9 +90,8 @@ jobs:
             os: ${{ parameters.os }}
             processes: 8
             attempts: 3
-
       - ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cilium') ) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
+        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
           parameters:
             testName: Service Conformance|Cilium
             name: service
@@ -116,9 +100,8 @@ jobs:
             os: ${{ parameters.os }}
             processes: 8
             attempts: 3
-
       - ${{ if eq(parameters.hostport, true) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
+        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
           parameters:
             testName: Host Port
             name: hostport
@@ -127,9 +110,8 @@ jobs:
             os: ${{ parameters.os }}
             processes: 1 # Has a short serial test
             attempts: 3
-
       - ${{ if and(eq(parameters.hybridWin, true), eq(parameters.os, 'windows')) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
+        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
           parameters:
             testName: Hybrid Network
             name: hybrid
@@ -138,9 +120,8 @@ jobs:
             os: ${{ parameters.os }}
             processes: 8
             attempts: 3
-
       - ${{ if and( eq(parameters.dualstack, true), eq(contains(parameters.cni, 'cilium'), false) ) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
+        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
           parameters:
             testName: DualStack Test
             name: DualStack
@@ -150,9 +131,8 @@ jobs:
             os: ${{ parameters.os }}
             processes: 8
             attempts: 3
-
       - ${{ if and( eq(parameters.dualstack, true), contains(parameters.cni, 'cilium') ) }}:
-        - template: k8s-e2e.steps.yaml@ACNTools
+        - template: ../k8s-e2e/k8s-e2e-step-template.yaml
           parameters:
             testName: DualStack Test|Cilium
             name: DualStack

.pipelines/multitenancy/swiftv2-e2e.jobs.yaml

@@ -48,8 +48,8 @@ stages:
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
           os: linux
+          image: acn-runner-vmss-image-1es-v3.0
           demands:
-          - agent.os -equals Linux
           - Role -equals $(CUSTOM_E2E_ROLE)
         steps:
           - template: swiftv2-e2e.steps.yaml

.pipelines/run-pipeline.yaml

@@ -4,9 +4,6 @@ stages:
     jobs:
       - job: env
         displayName: Setup
-        pool:
-          name: "$(BUILD_POOL_NAME_DEFAULT)"
-          os: linux
         steps:
           - script: |
               # To use the variables below, you must make the respective stage's dependsOn have - setup or it will not retain context of this stage
@@ -42,9 +39,6 @@ stages:
           displayName: Build Binaries
           variables:
             STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
-          pool:
-            name: "$(BUILD_POOL_NAME_DEFAULT)"
-            os: linux
           steps:
             - task: GoTool@0
               inputs:
@@ -83,9 +77,6 @@ stages:
       jobs:
         - job: containerize_amd64
           displayName: Build Images
-          pool:
-            name: "$(BUILD_POOL_NAME_LINUX_AMD64)"
-            os: linux
           strategy:
             maxParallel: 4
             matrix:
@@ -179,9 +170,6 @@ stages:
       jobs:
         - job: manifest
           displayName: Compile Manifests
-          pool:
-            name: "$(BUILD_POOL_NAME_DEFAULT)"
-            os: linux
           strategy:
             maxParallel: 4
             matrix:
@@ -389,9 +377,6 @@ stages:
       jobs:
         - job: delete_build
           displayName: Delete Cluster
-          pool:
-            name: "$(BUILD_POOL_NAME_DEFAULT)"
-            os: linux
           strategy:
             maxParallel: 4
             matrix:
@@ -454,9 +439,6 @@ stages:
 
         - job: delete_test
           displayName: Delete Cluster
-          pool:
-            name: "$(BUILD_POOL_NAME_DEFAULT)"
-            os: linux
           strategy:
             maxParallel: 4
             matrix:

.pipelines/singletenancy/aks-swift/aks-swift-e2e.jobs.yaml

@@ -48,8 +48,8 @@ stages:
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
           os: linux
+          image: acn-runner-vmss-image-1es-v3.0
           demands:
-          - agent.os -equals Linux
           - Role -equals $(CUSTOM_E2E_ROLE)
         steps:
           - checkout: self

.pipelines/singletenancy/aks/aks-e2e.jobs.yaml

@@ -50,8 +50,8 @@ stages:
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
           os: linux
+          image: acn-runner-vmss-image-1es-v3.0
           demands:
-          - agent.os -equals Linux
           - Role -equals $(CUSTOM_E2E_ROLE)
         steps:
           - checkout: self

.pipelines/singletenancy/azure-cni-overlay-stateless/azure-cni-overlay-stateless-e2e.jobs.yaml

@@ -51,8 +51,8 @@ stages:
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
           os: linux
+          image: acn-runner-vmss-image-1es-v3.0
           demands:
-          - agent.os -equals Linux
           - Role -equals $(CUSTOM_E2E_ROLE)
         steps:
           - checkout: self

.pipelines/singletenancy/azure-cni-overlay/add-windows-nodepool.jobs.yaml

@@ -10,8 +10,8 @@ jobs:
   pool:
     name: $(BUILD_POOL_NAME_DEFAULT)
     os: linux
+    image: acn-runner-vmss-image-1es-v3.0
     demands:
-    - agent.os -equals Linux
     - Role -equals $(CUSTOM_E2E_ROLE)
   timeoutInMinutes: 30
   steps:

.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e.jobs.yaml

@@ -45,8 +45,8 @@ stages:
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
           os: linux
+          image: acn-runner-vmss-image-1es-v3.0
           demands:
-          - agent.os -equals Linux
           - Role -equals $(CUSTOM_E2E_ROLE)
         steps:
           - checkout: self
@@ -72,8 +72,8 @@ stages:
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
           os: linux
+          image: acn-runner-vmss-image-1es-v3.0
           demands:
-          - agent.os -equals Linux
           - Role -equals $(CUSTOM_E2E_ROLE)
         steps:
           - checkout: self

.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e.jobs.yaml

@@ -45,8 +45,8 @@ stages:
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
           os: linux
+          image: acn-runner-vmss-image-1es-v3.0
           demands:
-          - agent.os -equals Linux
           - Role -equals $(CUSTOM_E2E_ROLE)
         steps:
           - checkout: self

.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e.jobs.yaml

@@ -17,9 +17,6 @@ stages:
     dependsOn:
       - ${{ parameters.dependsOn }}
       - setup
-    pool:
-      name: $(BUILD_POOL_NAME_DEFAULT)
-      os: linux
     variables:
       commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
     jobs:
@@ -46,16 +43,15 @@ stages:
     - setup
     - publish
     - ${{ parameters.clusterName }}
-    pool:
-      name: $(BUILD_POOL_NAME_DEFAULT)
     jobs:
       - job: ${{ parameters.name }}
         displayName: Nodesubnet with Cilium - (${{ parameters.name }})
         timeoutInMinutes: 120
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
+          os: linux
+          image: acn-runner-vmss-image-1es-v3.0
           demands:
-          - agent.os -equals Linux
           - Role -equals $(CUSTOM_E2E_ROLE)
         steps:
           - checkout: self