WIP: Bug 1748336 - Remove python-3 flag from taskgraph. #releng-reviewers r=releng-reviewers,ahal

Differential Revision: https://phabricator.services.mozilla.com/D134983

taskcluster/ci/test/awsy.yml

@@ -30,7 +30,6 @@ job-defaults:
                     default: 2
             default: default
     test-manifest-loader: null  # don't load tests in the taskgraph
-    python-3: true
 
 
 awsy:

taskcluster/ci/test/browsertime-desktop.yml

@@ -35,7 +35,6 @@ job-defaults:
         extra-options:
             - --browsertime
             - --conditioned-profile=settled
-    python-3: true
 
 browsertime-tp6:
     <<: &tp6-defaults

taskcluster/ci/test/browsertime-mobile.yml

@@ -58,7 +58,6 @@ job-defaults:
             - --conditioned-profile=settled
     optimization:
         skip-unless-backstop: null
-    python-3: true
     limit-platforms:
         by-app:
             chrome-m:

taskcluster/ci/test/compiled.yml

@@ -31,7 +31,6 @@ job-defaults:
                     - unittests/mac_unittest.py
                 windows.*:
                     - unittests/win_unittest.py
-    python-3: true
     supports-artifact-builds: false
 
 cppunit:

taskcluster/ci/test/firefox-ui.yml

@@ -19,7 +19,6 @@ job-defaults:
                 linux.*:
                     - firefox_ui_tests/taskcluster.py
                     - remove_executables.py
-    python-3: true
 
 firefox-ui-functional-local:
     description: "Firefox-ui-tests functional run"

taskcluster/ci/test/marionette.yml

@@ -42,7 +42,6 @@ job-defaults:
         by-test-platform:
             windows10-64.*: hardware
             default: virtual
-    python-3: true
 
 marionette:
     description: "Marionette unittest run"

taskcluster/ci/test/misc.yml

@@ -4,7 +4,6 @@
 ---
 job-defaults:
     test-manifest-loader: null  # don't load tests in the taskgraph
-    python-3: true
 
 geckoview-junit:
     description: "Geckoview junit run"

taskcluster/ci/test/mochitest.yml

@@ -41,7 +41,6 @@ job-defaults:
                     - unittests/mac_unittest.py
                 windows.*:
                     - unittests/win_unittest.py
-    python-3: true
 
 mochitest-plain:
     description: "Mochitest plain run"

taskcluster/ci/test/raptor-chrome.yml

@@ -23,4 +23,3 @@ job-defaults:
                     - raptor/windows_config.py
                 default:
                     - raptor/linux_config.py
-    python-3: true

taskcluster/ci/test/raptor-gve.yml

@@ -21,7 +21,6 @@ job-defaults:
             - raptor/android_hw_config.py
     optimization:
         skip-unless-backstop: null
-    python-3: true
 
 raptor-speedometer-geckoview-cpu-memory:
     description: Raptor Speedometer cpu/memory on GeckoView

taskcluster/ci/test/raptor-refbrow.yml

@@ -20,7 +20,6 @@ job-defaults:
         script: raptor_script.py
         config:
             - raptor/android_hw_config.py
-    python-3: true
 
 raptor-scn-cpu-memory-idle-refbrow:
     description: "Raptor idle-browser cpu/memory on Reference Browser"

taskcluster/ci/test/raptor.yml

@@ -55,7 +55,6 @@ job-defaults:
                         default:
                             - linux64-chromium
                 default: []
-    python-3: true
     variants: [fission]
 
 raptor-youtube-playback-v9-power-firefox:

taskcluster/ci/test/reftest.yml

@@ -10,7 +10,6 @@ job-defaults:
             android-em-7.*: geckoview-test_runner.apk
             android-hw-.*: geckoview-test_runner.apk
             default: null
-    python-3: true
     tier:
         by-variant:
             fission: 2

taskcluster/ci/test/talos.yml

@@ -24,7 +24,6 @@ job-defaults:
                 default:
                     - talos/linux_config.py
     test-manifest-loader: null  # don't load tests in the taskgraph
-    python-3: true
 
 talos-bcv:
     description: Talos basic compositor video
@@ -808,7 +807,6 @@ talos-xperf:
             by-test-platform:
                 windows.*:
                     - talos/windows_vm_config.py
-    python-3: true
 
 talos-realworld-webextensions:
     description: Talos tests with realworld WebExtensions

taskcluster/ci/test/web-platform.yml

@@ -30,7 +30,6 @@ job-defaults:
             android-em-7.0-x86_64(-lite)?-qr/opt: geckoview-test_runner.apk
             android-em-7.0-x86_64(-lite)?-qr/debug(-isolated-process)?: geckoview-test_runner.apk
             default: null
-    python-3: true
 
 web-platform-tests:
     description: "Web platform test run"

taskcluster/ci/test/xpcshell.yml

@@ -8,7 +8,6 @@ job-defaults:
         by-test-platform:
             android-em-7.*: geckoview-test_runner.apk
             default: null
-    python-3: true
     mozharness:
         script:
             by-test-platform:

taskcluster/gecko_taskgraph/transforms/job/mozharness_test.py

@@ -150,8 +150,7 @@ def mozharness_test_on_docker(config, job, taskdesc):
         }
     )
 
-    if test.get("python-3"):
-        env["PYTHON"] = "python3"
+    env["PYTHON"] = "python3"
 
     # Legacy linux64 tests rely on compiz.
     if test.get("docker-image", {}).get("in-tree") == "desktop1604-test":
@@ -369,22 +368,18 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
             "artifact-reference": "<decision/public/tests-by-manifest.json.gz>"
         }
 
-    py_3 = test.get("python-3", False)
-
     if is_windows:
-        py_binary = "c:\\mozilla-build\\{python}\\{python}.exe".format(
-            python="python3" if py_3 else "python"
-        )
+        py_binary = "c:\\mozilla-build\\{python}\\{python}.exe".format(python="python3")
         mh_command = [
             py_binary,
             "-u",
             "mozharness\\scripts\\" + normpath(mozharness["script"]),
         ]
     elif is_bitbar:
-        py_binary = "python3" if py_3 else "python"
+        py_binary = "python3"
         mh_command = ["bash", f"./{bitbar_script}"]
     elif is_macosx:
-        py_binary = "/usr/local/bin/{}".format("python3" if py_3 else "python2")
+        py_binary = "/usr/local/bin/{}".format("python3")
         mh_command = [
             py_binary,
             "-u",
@@ -392,7 +387,7 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
         ]
     else:
         # is_linux
-        py_binary = "/usr/bin/{}".format("python3" if py_3 else "python2")
+        py_binary = "/usr/bin/{}".format("python3")
         mh_command = [
             # Using /usr/bin/python2.7 rather than python2.7 because
             # /usr/local/bin/python2.7 is broken on the mac workers.
@@ -402,8 +397,7 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
             "mozharness/scripts/" + mozharness["script"],
         ]
 
-    if py_3:
-        env["PYTHON"] = py_binary
+    env["PYTHON"] = py_binary
 
     for mh_config in mozharness["config"]:
         cfg_path = "mozharness/configs/" + mh_config

taskcluster/gecko_taskgraph/transforms/test/__init__.py

@@ -275,8 +275,6 @@ test_description_schema = Schema(
         # A list of artifacts to install from 'fetch' tasks. Validation deferred
         # to 'job' transforms.
         Optional("fetches"): object,
-        # Opt-in to Python 3 support
-        Optional("python-3"): bool,
         # Raptor / browsertime specific keys, defer validation to 'raptor.py'
         # transform.
         Optional("raptor"): object,