Backed out changeset da3af6a077fc (bug 1562083) for busting gecko decision task. CLOSED TREE
authorCosmin Sabou <csabou@mozilla.com>
Wed, 03 Jul 2019 19:48:58 +0300
changeset 540793 be232271fcde16cffc84ef2f24a8e849302c5991
parent 540792 da3af6a077fc1273e1062f558af635a2cef642f4
child 540794 17183959c3a91f478dd3426df4439bb1d714f28a
push id11529
push userarchaeopteryx@coole-files.de
push dateThu, 04 Jul 2019 15:22:33 +0000
treeherdermozilla-beta@ebb510a784b8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1562083
milestone69.0a1
backs outda3af6a077fc1273e1062f558af635a2cef642f4
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
Backed out changeset da3af6a077fc (bug 1562083) for busting gecko decision task. CLOSED TREE
taskcluster/ci/source-test/python.yml
taskcluster/taskgraph/transforms/job/mach.py
testing/mozbase/mozprocess/tests/test_kill.py
testing/mozbase/mozprocess/tests/test_misc.py
testing/mozbase/mozprocess/tests/test_wait.py
--- a/taskcluster/ci/source-test/python.yml
+++ b/taskcluster/ci/source-test/python.yml
@@ -3,17 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ---
 job-defaults:
     platform: linux64/opt
     always-target: true
     worker-type:
         by-platform:
             linux64.*: t-linux-xlarge
-            macosx1014-64.*: t-osx-1014
+            macosx1010-64.*: t-osx-1010
             windows10-64.*: t-win10-64
     worker:
         by-platform:
             linux64.*:
                 docker-image: {in-tree: "lint"}
                 max-run-time: 3600
             default:
                 max-run-time: 3600
@@ -113,17 +113,17 @@ mochitest-harness:
             - 'testing/mozharness/mozharness/mozilla/structuredlog.py'
             - 'testing/mozharness/mozharness/mozilla/testing/errors.py'
             - 'testing/profiles/**'
 
 mozbase:
     description: testing/mozbase unit tests
     platform:
         - linux64/opt
-        - macosx1014-64/opt
+        - macosx1010-64/opt
         - windows10-64/opt
     python-version: [2, 3]
     treeherder:
         symbol: mb
     run:
         using: python-test
         subsuite: mozbase
     when:
@@ -143,17 +143,17 @@ mozharness:
     when:
         files-changed:
             - 'testing/mozharness/**'
 
 mozlint:
     description: python/mozlint unit tests
     platform:
         - linux64/opt
-        - macosx1014-64/opt
+        - macosx1010-64/opt
         - windows10-64/opt
     python-version: [2]
     treeherder:
         symbol: ml
     run:
         using: python-test
         subsuite: mozlint
     when:
--- a/taskcluster/taskgraph/transforms/job/mach.py
+++ b/taskcluster/taskgraph/transforms/job/mach.py
@@ -38,24 +38,19 @@ defaults = {
 }
 
 
 @run_job_using("docker-worker", "mach", schema=mach_schema, defaults=defaults)
 @run_job_using("generic-worker", "mach", schema=mach_schema, defaults=defaults)
 def configure_mach(config, job, taskdesc):
     run = job['run']
 
-    additional_prefix = []
+    command_prefix = 'cd $GECKO_PATH && ./mach '
     if job['worker-type'].endswith('1014'):
-        additional_prefix = [
-            'LC_ALL=en_US.UTF-8',
-            'LANG=en_US.UTF-8'
-        ]
-
-    command_prefix = ' '.join(['cd $GECKO_PATH'] + additional_prefix + ['&& ./mach '])
+        command_prefix = 'cd $GECKO_PATH && LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 ./mach '
 
     mach = run['mach']
     if isinstance(mach, dict):
         ref, pattern = next(iter(mach.items()))
         command = {ref: command_prefix + pattern}
     else:
         command = command_prefix + mach
 
--- a/testing/mozbase/mozprocess/tests/test_kill.py
+++ b/testing/mozbase/mozprocess/tests/test_kill.py
@@ -2,17 +2,16 @@
 
 from __future__ import absolute_import
 
 import os
 import time
 import unittest
 import proctest
 import signal
-import sys
 
 import mozunit
 
 from mozprocess import processhandler
 
 here = os.path.dirname(os.path.abspath(__file__))
 
 
@@ -46,27 +45,19 @@ class ProcTestKill(proctest.ProcTest):
         p.kill()
 
         self.determine_status(p, expectedfail=('returncode',))
 
     def test_process_kill_deep_wait(self):
         """Process is started, we use a deep process tree, we let it spawn
            for a bit, we kill it"""
 
-        myenv = None
-        # On macosx1014, subprocess fails to find `six` when run with python3.
-        # This ensures that subprocess first looks to sys.path to find `six`.
-        # See https://bugzilla.mozilla.org/show_bug.cgi?id=1562083
-        if sys.platform == 'darwin' and sys.version_info[0] > 2:
-            myenv = os.environ.copy()
-            myenv['PYTHONPATH'] = ':'.join(sys.path)
-
         p = processhandler.ProcessHandler([self.python, self.proclaunch,
                                            "process_normal_deep.ini"],
-                                          cwd=here, env=myenv)
+                                          cwd=here)
         p.run()
         # Let the tree spawn a bit, before attempting to kill
         time.sleep(3)
         p.kill()
 
         self.determine_status(p, expectedfail=('returncode',))
 
     def test_process_kill_broad(self):
@@ -79,27 +70,19 @@ class ProcTestKill(proctest.ProcTest):
         p.kill()
 
         self.determine_status(p, expectedfail=('returncode',))
 
     def test_process_kill_broad_delayed(self):
         """Process is started, we use a broad process tree, we let it spawn
            for a bit, we kill it"""
 
-        myenv = None
-        # On macosx1014, subprocess fails to find `six` when run with python3.
-        # This ensures that subprocess first looks to sys.path to find `six`.
-        # See https://bugzilla.mozilla.org/show_bug.cgi?id=1562083
-        if sys.platform == 'darwin' and sys.version_info[0] > 2:
-            myenv = os.environ.copy()
-            myenv['PYTHONPATH'] = ':'.join(sys.path)
-
         p = processhandler.ProcessHandler([self.python, self.proclaunch,
                                            "process_normal_broad.ini"],
-                                          cwd=here, env=myenv)
+                                          cwd=here)
         p.run()
         # Let the tree spawn a bit, before attempting to kill
         time.sleep(3)
         p.kill()
 
         self.determine_status(p, expectedfail=('returncode',))
 
     @unittest.skipUnless(processhandler.isPosix, "posix only")
--- a/testing/mozbase/mozprocess/tests/test_misc.py
+++ b/testing/mozbase/mozprocess/tests/test_misc.py
@@ -1,15 +1,14 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from __future__ import absolute_import
 
 import os
-import sys
 
 import mozunit
 
 import proctest
 from mozprocess import processhandler
 
 here = os.path.dirname(os.path.abspath(__file__))
 
@@ -21,29 +20,19 @@ class ProcTestMisc(proctest.ProcTest):
         """ Process is started, runs but we time out waiting on it
             to complete. Process should not be killed.
         """
         p = None
 
         def timeout_handler():
             self.assertEqual(p.proc.poll(), None)
             p.kill()
-
-        myenv = None
-        # On macosx1014, subprocess fails to find `six` when run with python3.
-        # This ensures that subprocess first looks to sys.path to find `six`.
-        # See https://bugzilla.mozilla.org/show_bug.cgi?id=1562083
-        if sys.platform == 'darwin' and sys.version_info[0] > 2:
-            myenv = os.environ.copy()
-            myenv['PYTHONPATH'] = ':'.join(sys.path)
-
         p = processhandler.ProcessHandler([self.python, self.proclaunch,
                                            "process_waittimeout.ini"],
                                           cwd=here,
-                                          env=myenv,
                                           onTimeout=(timeout_handler,),
                                           kill_on_timeout=False)
         p.run(timeout=1)
         p.wait()
         self.assertTrue(p.didTimeout)
 
         self.determine_status(p, False, ['returncode', 'didtimeout'])
 
--- a/testing/mozbase/mozprocess/tests/test_wait.py
+++ b/testing/mozbase/mozprocess/tests/test_wait.py
@@ -1,15 +1,14 @@
 #!/usr/bin/env python
 
 from __future__ import absolute_import
 
 import os
 import signal
-import sys
 
 import mozinfo
 import mozunit
 import proctest
 from mozprocess import processhandler
 
 here = os.path.dirname(os.path.abspath(__file__))
 
@@ -38,27 +37,19 @@ class ProcTestWait(proctest.ProcTest):
         p.wait()
 
         self.determine_status(p)
 
     def test_timeout(self):
         """ Process is started, runs but we time out waiting on it
             to complete
         """
-        myenv = None
-        # On macosx1014, subprocess fails to find `six` when run with python3.
-        # This ensures that subprocess first looks to sys.path to find `six`.
-        # See https://bugzilla.mozilla.org/show_bug.cgi?id=1562083
-        if sys.platform == 'darwin' and sys.version_info[0] > 2:
-            myenv = os.environ.copy()
-            myenv['PYTHONPATH'] = ':'.join(sys.path)
-
         p = processhandler.ProcessHandler([self.python, self.proclaunch,
                                            "process_waittimeout.ini"],
-                                          cwd=here, env=myenv)
+                                          cwd=here)
         p.run(timeout=10)
         p.wait()
 
         if mozinfo.isUnix:
             # process was killed, so returncode should be negative
             self.assertLess(p.proc.returncode, 0)
 
         self.determine_status(p, False, ['returncode', 'didtimeout'])