Bug 1637286 [wpt PR 23536] - [Azure Pipelines] run wpt_integration_{macOS,win}_{py36,py38} entirely using py3, a=testonly
authorPhilip Jägenstedt <philip@foolip.org>
Wed, 20 May 2020 16:59:15 +0000
changeset 531922 8d307579483baee32bd858bee5bbc99256c182d0
parent 531921 ab14bf3936eff36ad4ec78a282c17b9af3ef70d0
child 531923 c6a39a9f2b6f05309d86342db3093b49bc20acc1
push id37449
push userncsoregi@mozilla.com
push dateTue, 26 May 2020 02:38:57 +0000
treeherdermozilla-central@da2c7b0ac9a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1637286, 23536, 23441
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1637286 [wpt PR 23536] - [Azure Pipelines] run wpt_integration_{macOS,win}_{py36,py38} entirely using py3, a=testonly Automatic update from web-platform-tests [Azure Pipelines] run wpt_integration_{macOS,win}_{py36,py38} entirely using py3 (#23536) py2 was needed to update the manifest only, but that now works with py3. Incidentally fixes https://github.com/web-platform-tests/wpt/issues/23441, where the problem appears to have been some mixing of py2 and py3. This also renames job names from _py3 to _py36. -- wpt-commits: 01e8699486be3c1e3111476310cba4ae70271d86 wpt-pr: 23536
testing/web-platform/tests/.azure-pipelines.yml
--- a/testing/web-platform/tests/.azure-pipelines.yml
+++ b/testing/web-platform/tests/.azure-pipelines.yml
@@ -127,17 +127,17 @@ jobs:
     inputs:
       versionSpec: '2.7.x'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/
       toxenv: py27
 
-- job: tools_unittest_macOS_py3
+- job: tools_unittest_macOS_py36
   displayName: 'tools/ unittests: macOS (Python 3.6)'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.tools_unittest']
   pool:
     vmImage: 'macOS-10.14'
   steps:
   - task: UsePythonVersion@0
     inputs:
@@ -177,17 +177,17 @@ jobs:
     inputs:
       versionSpec: '2.7.x'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/wptrunner/
       toxenv: py27
 
-- job: wptrunner_unittest_macOS_py3
+- job: wptrunner_unittest_macOS_py36
   displayName: 'tools/wptrunner/ unittests: macOS (Python 3.6)'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wptrunner_unittest']
   pool:
     vmImage: 'macOS-10.14'
   steps:
   - task: UsePythonVersion@0
     inputs:
@@ -231,31 +231,27 @@ jobs:
   - template: tools/ci/azure/install_firefox.yml
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/wpt/
       toxenv: py27
 
-- job: wpt_integration_macOS_py3
+- job: wpt_integration_macOS_py36
   displayName: 'tools/wpt/ tests: macOS (Python 3.6)'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wpt_integration']
   pool:
     vmImage: 'macOS-10.14'
   steps:
   # full checkout required
   - task: UsePythonVersion@0
     inputs:
       versionSpec: '3.6.x'
-  # Python 2.7 still needed to update manifest.
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '2.7.x'
   - template: tools/ci/azure/install_chrome.yml
   - template: tools/ci/azure/install_firefox.yml
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/wpt/
       toxenv: py36
@@ -266,20 +262,16 @@ jobs:
   condition: dependencies.decision.outputs['test_jobs.wpt_integration']
   pool:
     vmImage: 'macOS-10.14'
   steps:
   # full checkout required
   - task: UsePythonVersion@0
     inputs:
       versionSpec: '3.8.x'
-  # Python 2.7 still needed to update manifest.
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '2.7.x'
   - template: tools/ci/azure/install_chrome.yml
   - template: tools/ci/azure/install_firefox.yml
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/wpt/
       toxenv: py38
@@ -297,17 +289,17 @@ jobs:
     inputs:
       versionSpec: '2.7.x'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/
       toxenv: py27
 
-- job: tools_unittest_win_py3
+- job: tools_unittest_win_py36
   displayName: 'tools/ unittests: Windows (Python 3.6)'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.tools_unittest']
   pool:
     vmImage: 'windows-2019'
   variables:
     HYPOTHESIS_PROFILE: ci
   steps:
@@ -351,17 +343,17 @@ jobs:
     inputs:
       versionSpec: '2.7.x'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/wptrunner/
       toxenv: py27
 
-- job: wptrunner_unittest_win_py3
+- job: wptrunner_unittest_win_py36
   displayName: 'tools/wptrunner/ unittests: Windows (Python 3.6)'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wptrunner_unittest']
   pool:
     vmImage: 'windows-2019'
   steps:
   - task: UsePythonVersion@0
     inputs:
@@ -409,33 +401,27 @@ jobs:
   # - template: tools/ci/azure/install_firefox.yml
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
       directory: tools/wpt/
       toxenv: py27
 
-- job: wpt_integration_win_py3
+- job: wpt_integration_win_py36
   displayName: 'tools/wpt/ tests: Windows (Python 3.6)'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wpt_integration']
   pool:
     vmImage: 'windows-2019'
   steps:
   # full checkout required
   - task: UsePythonVersion@0
     inputs:
       versionSpec: '3.6.x'
-      addToPath: false
-  # Python 2.7 still needed to update manifest.
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '2.7.x'
-      addToPath: true
   # currently just using the outdated Chrome/Firefox on the VM rather than
   # figuring out how to install Chrome Dev channel on Windows
   # - template: tools/ci/azure/install_chrome.yml
   # - template: tools/ci/azure/install_firefox.yml
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
@@ -448,22 +434,16 @@ jobs:
   condition: dependencies.decision.outputs['test_jobs.wpt_integration']
   pool:
     vmImage: 'windows-2019'
   steps:
   # full checkout required
   - task: UsePythonVersion@0
     inputs:
       versionSpec: '3.8.x'
-      addToPath: false
-  # Python 2.7 still needed to update manifest.
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '2.7.x'
-      addToPath: true
   # currently just using the outdated Chrome/Firefox on the VM rather than
   # figuring out how to install Chrome Dev channel on Windows
   # - template: tools/ci/azure/install_chrome.yml
   # - template: tools/ci/azure/install_firefox.yml
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters: