Remove conditional branching based on vmImage

4 files changed, 70 insertions, 36 deletions

diff --git a/.azure-pipelines/jobs/test-windows.yml b/.azure-pipelines/jobs/test-windows.yml
new file mode 100644
index 000000000..861c4da1a
--- /dev/null
+++ b/.azure-pipelines/jobs/test-windows.yml
@@ -0,0 +1,65 @@
+parameters:
+  vmImage:
+
+jobs:
+- job: Test
+  displayName: Test Primary
+
+  pool:
+    vmImage: ${{ parameters.vmImage }}
+  strategy:
+    matrix:
+      Python27-x64:
+        python.version: '2.7'
+        python.architecture: x64
+      Python36-x64:
+        python.version: '3.6'
+        python.architecture: x64
+    maxParallel: 2
+
+  steps:
+  - template: ../steps/run-tests-windows.yml
+    parameters:
+      runIntegrationTests: true
+
+- job: Test_Secondary
+  displayName: Test Secondary
+  # Don't run integration tests for these runs
+  # Run after Test_Primary so we don't devour time and jobs if tests are going to fail
+  dependsOn: Test
+
+  pool:
+    vmImage: ${{ parameters.vmImage }}
+  strategy:
+    matrix:
+      Python34-x64:
+        python.version: '3.4'
+        python.architecture: x64
+      Python35-x64:
+        python.version: '3.5'
+        python.architecture: x64
+      Python37-x64:
+        python.version: '3.7'
+        python.architecture: x64
+      # This is for Windows, so test x86 builds
+      Python27-x86:
+        python.version: '2.7'
+        python.architecture: x86
+      Python34-x86:
+        python.version: '3.4'
+        python.architecture: x86
+      Python35-x86:
+        python.version: '3.5'
+        python.architecture: x86
+      Python36-x86:
+        python.version: '3.6'
+        python.architecture: x86
+      Python37-x86:
+        python.version: '3.7'
+        python.architecture: x86
+    maxParallel: 5
+
+  steps:
+  - template: ../steps/run-tests-windows.yml
+    parameters:
+      runIntegrationTests: false
diff --git a/.azure-pipelines/jobs/test.yml b/.azure-pipelines/jobs/test.yml
index 47a286c0e..7c51a26fc 100644
--- a/.azure-pipelines/jobs/test.yml
+++ b/.azure-pipelines/jobs/test.yml
@@ -18,13 +18,7 @@ jobs:
     maxParallel: 2
 
   steps:
-  - ${{ if eq(parameters.vmImage, 'vs2017-win2017') }}:
-    - template: ../steps/run-tests-windows.yml
-      parameters:
-        runIntegrationTests: true
-
-  - ${{ if ne(parameters.vmImage, 'vs2017-win2017') }}:
-    - template: ../steps/run-tests.yml
+  - template: ../steps/run-tests.yml
 
 - job: Test_Secondary
   displayName: Test Secondary
@@ -44,30 +38,7 @@ jobs:
       Python37:
         python.version: '3.7'
         python.architecture: x64
-      # On Windows, test x86 builds
-      ${{ if eq(parameters.vmImage, 'vs2017-win2017') }}:
-        Python27-x86:
-          python.version: '2.7'
-          python.architecture: x86
-        Python34-x86:
-          python.version: '3.4'
-          python.architecture: x86
-        Python35-x86:
-          python.version: '3.5'
-          python.architecture: x86
-        Python36-x86:
-          python.version: '3.6'
-          python.architecture: x86
-        Python37-x86:
-          python.version: '3.7'
-          python.architecture: x86
-    maxParallel: 5
+    maxParallel: 3
 
   steps:
-  - ${{ if eq(parameters.vmImage, 'vs2017-win2017') }}:
-    - template: ../steps/run-tests-windows.yml
-      parameters:
-        runIntegrationTests: false
-
-  - ${{ if ne(parameters.vmImage, 'vs2017-win2017') }}:
-    - template: ../steps/run-tests.yml
+  - template: ../steps/run-tests.yml
diff --git a/.azure-pipelines/steps/install-dependencies.yml b/.azure-pipelines/steps/install-dependencies.yml
deleted file mode 100644
index 8946a5568..000000000
--- a/.azure-pipelines/steps/install-dependencies.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-steps:
-- bash: pip install --upgrade setuptools tox
-  displayName: Install dependencies
\ No newline at end of file
diff --git a/.azure-pipelines/steps/run-tests-windows.yml b/.azure-pipelines/steps/run-tests-windows.yml
index f01edbe34..6ce5d1cc0 100644
--- a/.azure-pipelines/steps/run-tests-windows.yml
+++ b/.azure-pipelines/steps/run-tests-windows.yml
@@ -8,7 +8,8 @@ steps:
     versionSpec: '$(python.version)'
     architecture: '$(python.architecture)'
 
-- template: install-dependencies.yml
+- bash: pip install --upgrade setuptools tox
+  displayName: Install Tox
 
 - script: tox -e py -- -m unit -n 3 --junit-xml=junit/unit-test.xml
   displayName: Tox run unit tests