Update azure templates

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>

.azure-pipelines/steps/run-tests-windows.yml

@@ -1,7 +1,6 @@
 parameters:
   python_version: ''
   python_architecture: ''
-  pytest_markers: ''
 
 steps:
   - task: UsePythonVersion@0
@@ -35,18 +34,11 @@ steps:
   - powershell: |
       git submodule sync
       git submodule update --init --recursive
-      Write-Host "Running Command: pipenv run pytest -n auto -m '${{ parameters.pytest_markers }}' --junitxml=test-results-${{ parameters.test_number }}.xml --timeout 300 tests/"
-      pipenv run pytest -n 4 -vvv -m '${{ parameters.pytest_markers }}' --junitxml=test-results.xml --timeout 300 tests/
+      Write-Host "Running Command: pipenv run pytest -n 4 --junitxml=test-results.xml --timeout 300 tests/"
+      pipenv run pytest -n 4 -vvv --junitxml=test-results.xml --timeout 300 tests/
     failOnStderr: false
     displayName: Run integration tests
     env:
       PYTHONWARNINGS: 'ignore:DEPRECATION'
       PIPENV_NOSPIN: '1'
       GIT_SSH_COMMAND: ssh -o StrictHostKeyChecking=accept-new -o CheckHostIP=no
-
-  - task: PublishTestResults@2
-    displayName: Publish Test Results
-    inputs:
-      testResultsFiles: '**/test-results-${{ parameters.test_number }}.xml'
-      testRunTitle: 'Python ${{ parameters.python_version }}'
-    condition: succeededOrFailed()

.azure-pipelines/steps/run-tests.yml

@@ -26,9 +26,9 @@ steps:
     parameters:
       python_version: $(python.version)
 
-  - task: PublishTestResults@2
-    displayName: Publish Test Results
-    inputs:
-      testResultsFiles: '**/test-results.xml'
-      testRunTitle: 'Python $(python.version)'
-    condition: succeededOrFailed()
+- task: PublishTestResults@2
+  displayName: Publish Test Results
+  inputs:
+    testResultsFiles: '**/test-results.xml'
+    testRunTitle: 'Python $(python.version)'
+  condition: succeededOrFailed()

azure-pipelines.yml

@@ -94,36 +94,34 @@ jobs:
         vmImage: windows-latest
         python_version: $(python.version)
         python_architecture: $(python.architecture)
-        test_number: "1"
-        pytest_markers: "lock or dotvenv or markers or project or utils or patched or core or cli"
+        # pytest_markers: "lock or dotvenv or markers or project or utils or patched or core or cli"
 
-- job: TestWindows2
-  timeoutInMinutes: 0
-  pool:
-    vmImage: windows-latest
-  strategy:
-    matrix:
-      Python27:
-        python.version: '2.7'
-        python.architecture: x64
-      Python36:
-        python.version: '3.6'
-        python.architecture: x64
-      Python37:
-        python.version: '3.7'
-        python.architecture: x64
-      Python38:
-        python.version: '3.8'
-        python.architecture: x64
-    maxParallel: 8
-  steps:
-    - template: .azure-pipelines/steps/run-tests-windows.yml
-      parameters:
-        vmImage: windows-latest
-        python_version: $(python.version)
-        python_architecture: $(python.architecture)
-        test_number: "2"
-        pytest_markers: "urls or multiprocessing or local or sequential or run or outdated or basic or code or uninstall"
+# - job: TestWindows2
+#   timeoutInMinutes: 0
+#   pool:
+#     vmImage: windows-latest
+#   strategy:
+#     matrix:
+#       Python27:
+#         python.version: '2.7'
+#         python.architecture: x64
+#       Python36:
+#         python.version: '3.6'
+#         python.architecture: x64
+#       Python37:
+#         python.version: '3.7'
+#         python.architecture: x64
+#       Python38:
+#         python.version: '3.8'
+#         python.architecture: x64
+#     maxParallel: 8
+#   steps:
+#     - template: .azure-pipelines/steps/run-tests-windows.yml
+#       parameters:
+#         vmImage: windows-latest
+#         python_version: $(python.version)
+#         python_architecture: $(python.architecture)
+#         pytest_markers: "urls or multiprocessing or local or sequential or run or outdated or basic or code or uninstall"
 
 - job: TestMacOS
   pool: