fixup! Separate Build Changes

Author: Sheyla Trudo

.pipelines/templates/unit-tests.stages.yaml

@@ -1,66 +1,50 @@
 stages:
-  - stage: test
-    displayName: Test ACN
-    dependsOn:
-      - setup
-    jobs:
-      - job: test
-        displayName: Run Tests
-        variables:
-          STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
-          ob_git_checkout: true
-        pool:
-          isCustom: true
-          type: linux
-          name: "$(BUILD_POOL_NAME_DEFAULT)"
-        steps:
-          # Test changes under review
-          - checkout: ACNReviewChanges
-            clean: true
+- stage: test
+  displayName: Test ACN
+  dependsOn:
+    - setup
+  jobs:
+  - job: test
+    displayName: Run Tests
+    variables:
+      STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
+    steps:
+    - script: |
+        cd azure-container-networking
+        make tools
+        # run test, echo exit status code to fd 3, pipe output from test to tee, which splits output to stdout and go-junit-report (which converts test output to report.xml), stdout from tee is redirected to fd 4. Take output written to fd 3 (which is the exit code of test), redirect to stdout, pipe to read from stdout then exit with that status code. Read all output from fd 4 (output from tee) and write to top stdout
+        { { { {
+              sudo -E env "PATH=$PATH" make test-all;
+              echo $? >&3;
+              } | tee >(build/tools/bin/go-junit-report > report.xml) >&4;
+            } 3>&1;
+          } | { read xs; exit $xs; }
+        } 4>&1
+      retryCountOnTaskFailure: 3
+      displayName: "Run Tests"
 
-          - script: |
-              cd azure-container-networking
-              make tools
-              # run test, echo exit status code to fd 3, pipe output from test to tee, which splits output to stdout and go-junit-report (which converts test output to report.xml), stdout from tee is redirected to fd 4. Take output written to fd 3 (which is the exit code of test), redirect to stdout, pipe to read from stdout then exit with that status code. Read all output from fd 4 (output from tee) and write to top stdout
-              { { { {
-                    sudo -E env "PATH=$PATH" make test-all;
-                    echo $? >&3;
-                    } | tee >(build/tools/bin/go-junit-report > report.xml) >&4;
-                  } 3>&1;
-                } | { read xs; exit $xs; }
-              } 4>&1
-            retryCountOnTaskFailure: 3
-            name: "Test"
-            displayName: "Run Tests"
-
-  - stage: test_windows
-    displayName: Test ACN Windows
-    dependsOn:
-      - setup
-    jobs:
-      - job: test
-        displayName: Run Tests
-        variables:
-          STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
-          ob_git_checkout: true
-        pool:
-          isCustom: true
-          type: windows
-          name: "$(BUILD_POOL_NAME_DEFAULT_WINDOWS_ALT)"
-        steps:
-          # Test changes under review
-          - checkout: ACNReviewChanges
-            clean: true
-
-          - script: |
-              cd azure-container-networking/
-              cd npm/
-              go test ./...
-              cd ../cni/
-              go test ./...
-              cd ../platform/
-              go test ./...
-            retryCountOnTaskFailure: 3
-            name: "TestWindows"
-            displayName: "Run Windows Tests"
+- stage: test_windows
+  displayName: Test ACN Windows
+  dependsOn:
+    - setup
+  jobs:
+  - job: test
+    displayName: Run Tests
+    variables:
+      STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
+    pool:
+      isCustom: true
+      type: windows
+      name: "$(BUILD_POOL_NAME_DEFAULT_WINDOWS_ALT)"
+    steps:
+    - script: |
+        cd azure-container-networking/
+        cd npm/
+        go test ./...
+        cd ../cni/
+        go test ./...
+        cd ../platform/
+        go test ./...
+      retryCountOnTaskFailure: 3
+      displayName: "Run Windows Tests"