diff --git a/build/ci/vscode-python-ci-manual.yaml b/build/ci/vscode-python-ci-manual.yaml new file mode 100644 index 000000000000..dab4e97f07a4 --- /dev/null +++ b/build/ci/vscode-python-ci-manual.yaml @@ -0,0 +1,296 @@ +# manual CI build + +name: '$(Year:yyyy).$(Month).0.$(BuildID)-manual' + +trigger: none +pr: none + +# Variables that are available for the entire pipeline. +variables: +- template: templates/globals.yml + +stages: +- stage: Build + jobs: + - template: templates/jobs/build_compile.yml + +# Each item in each matrix has a number of possible values it may +# define. They are detailed in templates/test_phases.yml. The only +# required value is "TestsToRun". + +- stage: Linux + dependsOn: [] + jobs: + - job: 'Py3x' + dependsOn: [] + timeoutInMinutes: 120 + strategy: + matrix: + 'Unit': + # with mocks + # focused on small units (i.e. functions) + # and tightly controlled dependencies + TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + 'Functional': + # no mocks, no vscode + # focused on integration + TestsToRun: 'testfunctional' + NeedsPythonTestReqs: true + NeedsPythonFunctionalReqs: true + 'Single Workspace': + # no mocks, with vscode + # focused on integration + TestsToRun: 'testSingleWorkspace' + NeedsPythonTestReqs: true + 'Multi Workspace': + # no mocks, with vscode + # focused on integration + TestsToRun: 'testMultiWorkspace' + NeedsPythonTestReqs: true + 'Venv': + TestsToRun: 'venvTests' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + # This is for the venvTests to use, not needed if you don't run venv tests... + PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' + 'Debugger': + TestsToRun: 'testDebugger' + NeedsPythonTestReqs: true + 'Smoke': + TestsToRun: 'testSmoke' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + #maxParallel: 3 + pool: + vmImage: 'ubuntu-16.04' + steps: + - template: templates/test_phases.yml + + # This is the oldest Python 3 version we support. + - job: 'Py36' + dependsOn: [] + timeoutInMinutes: 120 + strategy: + matrix: + 'Unit': + PythonVersion: '3.6' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + 'Functional': + PythonVersion: '3.6' + TestsToRun: 'testfunctional' + NeedsPythonTestReqs: true + NeedsPythonFunctionalReqs: true + 'Single Workspace': + PythonVersion: '3.6' + TestsToRun: 'testSingleWorkspace' + NeedsPythonTestReqs: true + #maxParallel: 3 + pool: + vmImage: 'ubuntu-16.04' + steps: + - template: templates/test_phases.yml + + # This is the oldest Python 3 version we support. + - job: 'Py35' + dependsOn: [] + timeoutInMinutes: 120 + strategy: + matrix: + 'Unit': + PythonVersion: '3.5' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + 'Functional': + PythonVersion: '3.5' + TestsToRun: 'testfunctional' + NeedsPythonTestReqs: true + NeedsPythonFunctionalReqs: true + 'Single Workspace': + PythonVersion: '3.5' + TestsToRun: 'testSingleWorkspace' + NeedsPythonTestReqs: true + 'Venv': + PythonVersion: '3.5' + TestsToRun: 'venvTests' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' + 'Debugger': + PythonVersion: '3.5' + TestsToRun: 'testDebugger' + NeedsPythonTestReqs: true + #maxParallel: 3 + pool: + vmImage: 'ubuntu-16.04' + steps: + - template: templates/test_phases.yml + +- stage: Mac + dependsOn: [] + jobs: + - job: 'Py3x' + dependsOn: [] + timeoutInMinutes: 120 + strategy: + matrix: + 'Unit': + TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + 'Functional': + TestsToRun: 'testfunctional' + NeedsPythonTestReqs: true + NeedsPythonFunctionalReqs: true + 'Single Workspace': + TestsToRun: 'testSingleWorkspace' + NeedsPythonTestReqs: true + 'Multi Workspace': + TestsToRun: 'testMultiWorkspace' + NeedsPythonTestReqs: true + 'Venv': + TestsToRun: 'venvTests' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' + 'Debugger': + TestsToRun: 'testDebugger' + NeedsPythonTestReqs: true + 'Smoke': + TestsToRun: 'testSmoke' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + #maxParallel: 3 + pool: + vmImage: 'macos-10.13' + steps: + - template: templates/test_phases.yml + + # This is the oldest Python 3 version we support. + - job: 'Py35' + dependsOn: [] + timeoutInMinutes: 120 + strategy: + matrix: + 'Unit': + PythonVersion: '3.5' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + 'Functional': + PythonVersion: '3.5' + TestsToRun: 'testfunctional' + NeedsPythonTestReqs: true + NeedsPythonFunctionalReqs: true + 'Single Workspace': + PythonVersion: '3.5' + TestsToRun: 'testSingleWorkspace' + NeedsPythonTestReqs: true + 'Venv': + PythonVersion: '3.5' + TestsToRun: 'venvTests' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' + 'Debugger': + PythonVersion: '3.5' + TestsToRun: 'testDebugger' + NeedsPythonTestReqs: true + #maxParallel: 3 + pool: + vmImage: 'macos-10.13' + steps: + - template: templates/test_phases.yml + +- stage: Windows + dependsOn: [] + jobs: + - job: 'Py3x' + dependsOn: [] + timeoutInMinutes: 120 + strategy: + matrix: + 'Unit': + TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + 'Functional': + TestsToRun: 'testfunctional' + NeedsPythonTestReqs: true + NeedsPythonFunctionalReqs: true + 'Single Workspace': + TestsToRun: 'testSingleWorkspace' + NeedsPythonTestReqs: true + 'Multi Workspace': + TestsToRun: 'testMultiWorkspace' + NeedsPythonTestReqs: true + 'Venv': + TestsToRun: 'venvTests' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' + 'Debugger': + TestsToRun: 'testDebugger' + NeedsPythonTestReqs: true + 'Smoke': + TestsToRun: 'testSmoke' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + #maxParallel: 3 + pool: + vmImage: 'vs2017-win2016' + steps: + - template: templates/test_phases.yml + + # This is the oldest Python 3 version we support. + - job: 'Py35' + dependsOn: [] + timeoutInMinutes: 120 + strategy: + matrix: + 'Unit': + PythonVersion: '3.5' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + 'Functional': + PythonVersion: '3.5' + TestsToRun: 'testfunctional' + NeedsPythonTestReqs: true + NeedsPythonFunctionalReqs: true + 'Single Workspace': + PythonVersion: '3.5' + TestsToRun: 'testSingleWorkspace' + NeedsPythonTestReqs: true + 'Venv': + PythonVersion: '3.5' + TestsToRun: 'venvTests' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' + 'Debugger': + PythonVersion: '3.5' + TestsToRun: 'testDebugger' + NeedsPythonTestReqs: true + #maxParallel: 3 + pool: + vmImage: 'vs2017-win2016' + steps: + - template: templates/test_phases.yml + +- stage: Reports + dependsOn: + - Linux + - Mac + - Windows + condition: always() + jobs: + - template: templates/jobs/coverage.yml diff --git a/build/ci/vscode-python-ci.yaml b/build/ci/vscode-python-ci.yaml index 62bcd5c5f321..fc1cae3c0cb9 100644 --- a/build/ci/vscode-python-ci.yaml +++ b/build/ci/vscode-python-ci.yaml @@ -1,5 +1,7 @@ +# CI build (PR merge) + name: '$(Year:yyyy).$(Month).0.$(BuildID)-ci' -# CI build. + # Notes: Only trigger a commit for master and release, and skip build/rebuild # on changes in the news and .vscode folders. trigger: @@ -65,47 +67,38 @@ stages: TestsToRun: 'testDebugger' NeedsPythonTestReqs: true 'Smoke': - TestsToRun: 'testSmoke' - NeedsPythonTestReqs: true - NeedsIPythonReqs: true + TestsToRun: 'testSmoke' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + maxParallel: 2 pool: vmImage: 'ubuntu-16.04' steps: - template: templates/test_phases.yml - - job: 'Py36' + # This is the oldest Python 3 version we support. + - job: 'Py35' dependsOn: [] timeoutInMinutes: 120 strategy: matrix: 'Unit': - PythonVersion: '3.6' - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + PythonVersion: '3.5' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' NeedsPythonTestReqs: true NeedsIPythonReqs: true - 'Functional': - PythonVersion: '3.6' - TestsToRun: 'testfunctional' - NeedsPythonTestReqs: true - NeedsPythonFunctionalReqs: true - 'Single Workspace': - PythonVersion: '3.6' - TestsToRun: 'testSingleWorkspace' - NeedsPythonTestReqs: true - 'Multi Workspace': - PythonVersion: '3.6' - TestsToRun: 'testMultiWorkspace' - NeedsPythonTestReqs: true 'Venv': - PythonVersion: '3.6' + PythonVersion: '3.5' TestsToRun: 'venvTests' NeedsPythonTestReqs: true NeedsIPythonReqs: true PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' 'Debugger': - PythonVersion: '3.6' + PythonVersion: '3.5' TestsToRun: 'testDebugger' NeedsPythonTestReqs: true + maxParallel: 2 pool: vmImage: 'ubuntu-16.04' steps: @@ -142,47 +135,10 @@ stages: TestsToRun: 'testDebugger' NeedsPythonTestReqs: true 'Smoke': - TestsToRun: 'testSmoke' - NeedsPythonTestReqs: true - NeedsIPythonReqs: true - pool: - vmImage: 'macos-10.13' - steps: - - template: templates/test_phases.yml - - - job: 'Py36' - dependsOn: [] - timeoutInMinutes: 120 - strategy: - matrix: - 'Unit': - PythonVersion: '3.6' - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + TestsToRun: 'testSmoke' NeedsPythonTestReqs: true NeedsIPythonReqs: true - 'Functional': - PythonVersion: '3.6' - TestsToRun: 'testfunctional' - NeedsPythonTestReqs: true - NeedsPythonFunctionalReqs: true - 'Single Workspace': - PythonVersion: '3.6' - TestsToRun: 'testSingleWorkspace' - NeedsPythonTestReqs: true - 'Multi Workspace': - PythonVersion: '3.6' - TestsToRun: 'testMultiWorkspace' - NeedsPythonTestReqs: true - 'Venv': - PythonVersion: '3.6' - TestsToRun: 'venvTests' - NeedsPythonTestReqs: true - NeedsIPythonReqs: true - PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' - 'Debugger': - PythonVersion: '3.6' - TestsToRun: 'testDebugger' - NeedsPythonTestReqs: true + maxParallel: 2 pool: vmImage: 'macos-10.13' steps: @@ -219,47 +175,10 @@ stages: TestsToRun: 'testDebugger' NeedsPythonTestReqs: true 'Smoke': - TestsToRun: 'testSmoke' - NeedsPythonTestReqs: true - NeedsIPythonReqs: true - pool: - vmImage: 'vs2017-win2016' - steps: - - template: templates/test_phases.yml - - - job: 'Py36' - dependsOn: [] - timeoutInMinutes: 120 - strategy: - matrix: - 'Unit': - PythonVersion: '3.6' - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + TestsToRun: 'testSmoke' NeedsPythonTestReqs: true NeedsIPythonReqs: true - 'Functional': - PythonVersion: '3.6' - TestsToRun: 'testfunctional' - NeedsPythonTestReqs: true - NeedsPythonFunctionalReqs: true - 'Single Workspace': - PythonVersion: '3.6' - TestsToRun: 'testSingleWorkspace' - NeedsPythonTestReqs: true - 'Multi Workspace': - PythonVersion: '3.6' - TestsToRun: 'testMultiWorkspace' - NeedsPythonTestReqs: true - 'Venv': - PythonVersion: '3.6' - TestsToRun: 'venvTests' - NeedsPythonTestReqs: true - NeedsIPythonReqs: true - PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' - 'Debugger': - PythonVersion: '3.6' - TestsToRun: 'testDebugger' - NeedsPythonTestReqs: true + maxParallel: 2 pool: vmImage: 'vs2017-win2016' steps: diff --git a/build/ci/vscode-python-nightly-ci.yaml b/build/ci/vscode-python-nightly-ci.yaml index 447fba09f0c8..50395a6fc494 100644 --- a/build/ci/vscode-python-nightly-ci.yaml +++ b/build/ci/vscode-python-nightly-ci.yaml @@ -63,9 +63,10 @@ stages: # This is for the venvTests to use, not needed if you don't run venv tests... PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' 'Smoke': - TestsToRun: 'testSmoke' - NeedsPythonTestReqs: true - NeedsIPythonReqs: true + TestsToRun: 'testSmoke' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + maxParallel: 1 pool: vmImage: 'ubuntu-16.04' steps: @@ -78,7 +79,8 @@ stages: matrix: 'Unit': PythonVersion: '3.6' - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' NeedsPythonTestReqs: true NeedsIPythonReqs: true 'Functional': @@ -104,6 +106,7 @@ stages: NeedsPythonTestReqs: true PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' # Note: We only run the smoke tests with the latest Python release. + maxParallel: 1 pool: vmImage: 'ubuntu-16.04' steps: @@ -116,7 +119,8 @@ stages: matrix: 'Unit': PythonVersion: '3.5' - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' NeedsPythonTestReqs: true NeedsIPythonReqs: true 'Functional': @@ -142,6 +146,7 @@ stages: NeedsPythonTestReqs: true PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' # Note: We only run the smoke tests with the latest Python release. + maxParallel: 1 pool: vmImage: 'ubuntu-16.04' steps: @@ -154,7 +159,8 @@ stages: matrix: 'Unit': PythonVersion: '2.7' - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' NeedsPythonTestReqs: true NeedsIPythonReqs: true 'Functional': @@ -176,6 +182,7 @@ stages: NeedsPythonTestReqs: true # Note: Virtual env tests use `venv` and won't currently work with Python 2.7 # Note: We only run the smoke tests with the latest Python release. + maxParallel: 1 pool: vmImage: 'ubuntu-16.04' steps: @@ -212,9 +219,10 @@ stages: NeedsPythonTestReqs: true PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' 'Smoke': - TestsToRun: 'testSmoke' - NeedsPythonTestReqs: true - NeedsIPythonReqs: true + TestsToRun: 'testSmoke' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + maxParallel: 1 pool: vmImage: 'macos-10.13' steps: @@ -227,7 +235,8 @@ stages: matrix: 'Unit': PythonVersion: '3.6' - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' NeedsPythonTestReqs: true NeedsIPythonReqs: true 'Functional': @@ -253,6 +262,7 @@ stages: NeedsPythonTestReqs: true PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' # Note: We only run the smoke tests with the latest Python release. + maxParallel: 1 pool: vmImage: 'macos-10.13' steps: @@ -265,7 +275,8 @@ stages: matrix: 'Unit': PythonVersion: '3.5' - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' NeedsPythonTestReqs: true NeedsIPythonReqs: true 'Functional': @@ -291,6 +302,7 @@ stages: NeedsPythonTestReqs: true PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' # Note: We only run the smoke tests with the latest Python release. + maxParallel: 1 pool: vmImage: 'macos-10.13' steps: @@ -303,7 +315,8 @@ stages: matrix: 'Unit': PythonVersion: '2.7' - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' NeedsPythonTestReqs: true NeedsIPythonReqs: true 'Functional': @@ -325,6 +338,7 @@ stages: NeedsPythonTestReqs: true # Note: Virtual env tests use `venv` and won't currently work with Python 2.7 # Note: We only run the smoke tests with the latest Python release. + maxParallel: 1 pool: vmImage: 'macos-10.13' steps: @@ -361,9 +375,10 @@ stages: NeedsPythonTestReqs: true PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' 'Smoke': - TestsToRun: 'testSmoke' - NeedsPythonTestReqs: true - NeedsIPythonReqs: true + TestsToRun: 'testSmoke' + NeedsPythonTestReqs: true + NeedsIPythonReqs: true + maxParallel: 1 pool: vmImage: 'vs2017-win2016' steps: @@ -376,7 +391,8 @@ stages: matrix: 'Unit': PythonVersion: '3.6' - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' NeedsPythonTestReqs: true NeedsIPythonReqs: true 'Functional': @@ -402,6 +418,7 @@ stages: NeedsPythonTestReqs: true PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' # Note: We only run the smoke tests with the latest Python release. + maxParallel: 1 pool: vmImage: 'vs2017-win2016' steps: @@ -414,7 +431,8 @@ stages: matrix: 'Unit': PythonVersion: '3.5' - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' NeedsPythonTestReqs: true NeedsIPythonReqs: true 'Functional': @@ -440,6 +458,7 @@ stages: NeedsPythonTestReqs: true PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json' # Note: We only run the smoke tests with the latest Python release. + maxParallel: 1 pool: vmImage: 'vs2017-win2016' steps: @@ -452,7 +471,8 @@ stages: matrix: 'Unit': PythonVersion: '2.7' - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests' NeedsPythonTestReqs: true NeedsIPythonReqs: true 'Functional': @@ -474,6 +494,7 @@ stages: NeedsPythonTestReqs: true # Note: Virtual env tests use `venv` and won't currently work with Python 2.7 # Note: We only run the smoke tests with the latest Python release. + maxParallel: 1 pool: vmImage: 'vs2017-win2016' steps: diff --git a/build/ci/vscode-python-pr-validation.yaml b/build/ci/vscode-python-pr-validation.yaml index c198c2140eeb..fd143602a23b 100644 --- a/build/ci/vscode-python-pr-validation.yaml +++ b/build/ci/vscode-python-pr-validation.yaml @@ -1,6 +1,7 @@ +# PR Validation build. + name: '$(Year:yyyy).$(Month).0.$(BuildID)-pr' -# PR Validation build. # Notes: Only trigger a PR build for master and release, and skip build/rebuild # on changes in the news and .vscode folders. pr: @@ -57,10 +58,16 @@ stages: dependsOn: [] strategy: matrix: - 'Unit+Single': + 'Unit': PythonVersion: '2.7' - TestsToRun: 'pythonUnitTests, testSingleWorkspace' + # Note: "pythonInternalTools" tests are 3.7+. + TestsToRun: 'testUnitTests, pythonUnitTests' + NeedsPythonTestReqs: true + 'Functional': + PythonVersion: '2.7' + TestsToRun: 'testfunctional' NeedsPythonTestReqs: true + NeedsPythonFunctionalReqs: true pool: vmImage: 'ubuntu-16.04' steps: @@ -73,30 +80,11 @@ stages: dependsOn: [] strategy: matrix: - 'Unit': - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' - NeedsPythonTestReqs: true - NeedsIPythonReqs: true - 'Single Workspace': - TestsToRun: 'testSingleWorkspace' - NeedsPythonTestReqs: true - 'Smoke': - TestsToRun: 'testSmoke' - NeedsPythonTestReqs: true - NeedsIPythonReqs: true - pool: - vmImage: 'macos-10.13' - steps: - - template: templates/test_phases.yml - - - job: 'Py27' - dependsOn: [] - strategy: - matrix: - 'Unit+Single': - PythonVersion: '2.7' - TestsToRun: 'pythonUnitTests, testSingleWorkspace' + # This gives us our best functional coverage for the OS. + 'Functional+Single': + TestsToRun: 'testfunctional, testSingleWorkspace' NeedsPythonTestReqs: true + NeedsPythonFunctionalReqs: true pool: vmImage: 'macos-10.13' steps: @@ -109,27 +97,11 @@ stages: dependsOn: [] strategy: matrix: - 'Unit': - TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests' - NeedsPythonTestReqs: true - NeedsIPythonReqs: true - 'Smoke': - TestsToRun: 'testSmoke' - NeedsPythonTestReqs: true - NeedsIPythonReqs: true - pool: - vmImage: 'vs2017-win2016' - steps: - - template: templates/test_phases.yml - - - job: 'Py27' - dependsOn: [] - strategy: - matrix: - 'Unit': - PythonVersion: '2.7' - TestsToRun: 'pythonUnitTests' + # This gives us our best functional coverage for the OS. + 'Functional+Single': + TestsToRun: 'testfunctional, testSingleWorkspace' NeedsPythonTestReqs: true + NeedsPythonFunctionalReqs: true pool: vmImage: 'vs2017-win2016' steps: @@ -143,25 +115,3 @@ stages: condition: always() jobs: - template: templates/jobs/coverage.yml - -# The following is a temporary workaround for transitioning the -# job names for 2 jobs set as required checks in GitHub. It will -# be removed once we adjust the GitHub configuration. - -- stage: Tests - dependsOn: [] - jobs: - - job: 'Test' - dependsOn: [] - strategy: - matrix: - 'Linux-Py3.7 Functional': - noop: true - 'Linux-Py3.7 Unit': - noop: true - # Essentially, this is a noop. - steps: - - task: Delay@1 - inputs: - delayForMinutes: '0' - pool: server