Bug 1424146: Remove unused `exes.virtualenv` from mozharness configs; r=jlund

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

--HG--
extra : rebase_source : 2a77f1387cb5269940a2cdfc1deef342f8cf49a1

testing/mozharness/configs/awsy/taskcluster_windows_config.py

@@ -12,10 +12,6 @@ config = {
     "virtualenv_path": 'venv',
     "exes": {
         'python': sys.executable,
-        'virtualenv': [
-            sys.executable,
-            os.path.join(os.path.dirname(sys.executable), 'Lib', 'site-packages', 'virtualenv.py')
-        ],
         'mozinstall': ['build/venv/scripts/python', 'build/venv/scripts/mozinstall-script.py'],
         'tooltool.py': [sys.executable, os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')],
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')

testing/mozharness/configs/firefox_ui_tests/taskcluster.py

@@ -5,7 +5,6 @@ config = {
     "vcs_share_base": "/builds/hg-shared",
 
     "exes": {
-        'virtualenv': '/tools/virtualenv/bin/virtualenv',
         'tooltool.py': "/tools/tooltool.py",
     },
 

testing/mozharness/configs/firefox_ui_tests/taskcluster_windows.py

@@ -9,10 +9,6 @@ config = {
     "virtualenv_path": 'venv',
     "exes": {
         'python': sys.executable,
-        'virtualenv': [
-            sys.executable,
-            os.path.join(os.path.dirname(sys.executable), 'Lib', 'site-packages', 'virtualenv.py')
-        ],
         'mozinstall': ['build/venv/scripts/python', 'build/venv/scripts/mozinstall-script.py'],
         'tooltool.py': [sys.executable, os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')],
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')

testing/mozharness/configs/marionette/prod_config.py

@@ -10,7 +10,6 @@ config = {
 
     "vcs_share_base": HG_SHARE_BASE_DIR,
     "exes": {
-        'virtualenv': '/tools/virtualenv/bin/virtualenv',
         'tooltool.py': "/tools/tooltool.py",
     },
 

testing/mozharness/configs/marionette/windows_config.py

@@ -11,7 +11,6 @@ config = {
     "virtualenv_path": 'venv',
     "exes": {
         'python': 'c:/mozilla-build/python27/python',
-        'virtualenv': ['c:/mozilla-build/python27/python', 'c:/mozilla-build/buildbotve/virtualenv.py'],
         'hg': 'c:/mozilla-build/hg/hg',
         'mozinstall': ['%s/build/venv/scripts/python' % os.getcwd(),
                        '%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],

testing/mozharness/configs/marionette/windows_taskcluster_config.py

@@ -11,10 +11,6 @@ config = {
     "virtualenv_path": 'venv',
     "exes": {
         'python': sys.executable,
-        'virtualenv': [
-            sys.executable,
-            os.path.join(os.path.dirname(sys.executable), 'Lib', 'site-packages', 'virtualenv.py')
-        ],
         'mozinstall': ['build/venv/scripts/python', 'build/venv/scripts/mozinstall-script.py'],
         'tooltool.py': [sys.executable, os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')],
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')

testing/mozharness/configs/releng_infra_configs/builders.py

@@ -10,7 +10,6 @@ PLATFORM_CONFIG = {
     'linux64': {
         'exes': {
             'gittool.py': '/usr/local/bin/gittool.py',
-            'virtualenv': '/tools/virtualenv/bin/virtualenv',
         },
         'env': {
             'DISPLAY': ':2',
@@ -19,7 +18,6 @@ PLATFORM_CONFIG = {
     'macosx': {
         'exes': {
             'gittool.py': '/usr/local/bin/gittool.py',
-            'virtualenv': '/tools/virtualenv/bin/virtualenv',
         },
     },
     'win32': {
@@ -27,7 +25,6 @@ PLATFORM_CONFIG = {
             'gittool.py': [PYTHON_WIN32, 'c:/builds/hg-shared/build/tools/buildfarm/utils/gittool.py'],
             # Otherwise, depending on the PATH we can pick python 2.6 up
             'python': PYTHON_WIN32,
-            'virtualenv': [PYTHON_WIN32, 'c:/mozilla-build/buildbotve/virtualenv.py'],
         }
     }
 }

testing/mozharness/configs/releng_infra_configs/testers.py

@@ -19,7 +19,6 @@ PLATFORM_CONFIG = {
     'linux': {
         'exes': {
             'gittool.py': os.path.join(external_tools_path, 'gittool.py'),
-            'virtualenv': '/tools/virtualenv/bin/virtualenv',
         },
         'env': {
             'DISPLAY': ':0',
@@ -29,7 +28,6 @@ PLATFORM_CONFIG = {
     'linux64': {
         'exes': {
             'gittool.py': os.path.join(external_tools_path, 'gittool.py'),
-            'virtualenv': '/tools/virtualenv/bin/virtualenv',
         },
         'env': {
             'DISPLAY': ':0',
@@ -39,7 +37,6 @@ PLATFORM_CONFIG = {
     'macosx': {
         'exes': {
             'gittool.py': os.path.join(external_tools_path, 'gittool.py'),
-            'virtualenv': '/tools/virtualenv/bin/virtualenv',
         },
         'env': {
             'PATH': '%(PATH)s:' + external_tools_path,
@@ -50,7 +47,6 @@ PLATFORM_CONFIG = {
             'gittool.py': [PYTHON_WIN32, os.path.join(external_tools_path, 'gittool.py')],
             # Otherwise, depending on the PATH we can pick python 2.6 up
             'python': PYTHON_WIN32,
-            'virtualenv': [PYTHON_WIN32, 'c:/mozilla-build/buildbotve/virtualenv.py'],
         }
     }
 }

testing/mozharness/configs/single_locale/win32.py

@@ -30,10 +30,5 @@ config = {
 
     # use mozmake?
     "enable_mozmake": True,
-    'exes': {
-        'virtualenv': [
-            sys.executable,
-            'c:/mozilla-build/buildbotve/virtualenv.py'
-        ],
-    }
+    'exes': {}
 }

testing/mozharness/configs/single_locale/win32_devedition.py

@@ -29,12 +29,7 @@ config = {
 
     # use mozmake?
     "enable_mozmake": True,
-    'exes': {
-        'virtualenv': [
-            sys.executable,
-            'c:/mozilla-build/buildbotve/virtualenv.py'
-        ],
-    },
+    'exes': {},
 
     "update_channel": "aurora",
 }

testing/mozharness/configs/single_locale/win64.py

@@ -29,10 +29,5 @@ config = {
 
     # use mozmake?
     "enable_mozmake": True,
-    'exes': {
-        'virtualenv': [
-            sys.executable,
-            'c:/mozilla-build/buildbotve/virtualenv.py'
-        ],
-    }
+    'exes': {}
 }

testing/mozharness/configs/single_locale/win64_devedition.py

@@ -29,12 +29,7 @@ config = {
 
     # use mozmake?
     "enable_mozmake": True,
-    'exes': {
-        'virtualenv': [
-            sys.executable,
-            'c:/mozilla-build/buildbotve/virtualenv.py'
-        ],
-    },
+    'exes': {},
 
     "update_channel": "aurora",
 }

testing/mozharness/configs/talos/linux64_config_taskcluster.py

@@ -15,7 +15,6 @@ else:
 exes = {
     'tooltool.py': ["/builds/tooltool.py"],
     'python': PYTHON,
-    'virtualenv': [PYTHON, '/usr/local/lib/python2.7/dist-packages/virtualenv.py'],
 }
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
 INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.tar.bz2")

testing/mozharness/configs/talos/windows_config.py

@@ -19,7 +19,6 @@ config = {
     "virtualenv_modules": ['pywin32', 'talos', 'mozinstall'],
     "exes": {
         'python': PYTHON,
-        'virtualenv': [PYTHON, 'c:/mozilla-build/buildbotve/virtualenv.py'],
         'easy_install': ['%s/scripts/python' % VENV_PATH,
                          '%s/scripts/easy_install-2.7-script.py' % VENV_PATH],
         'mozinstall': ['%s/scripts/python' % VENV_PATH,

testing/mozharness/configs/talos/windows_taskcluster_config.py

@@ -19,10 +19,6 @@ config = {
     "virtualenv_modules": ['pypiwin32', 'talos', 'mozinstall'],
     "exes": {
         'python': PYTHON,
-        'virtualenv': [
-            sys.executable,
-            os.path.join(os.path.dirname(sys.executable), 'Lib', 'site-packages', 'virtualenv.py')
-        ],
         'mozinstall': ['%s/scripts/python' % VENV_PATH,
                        '%s/scripts/mozinstall-script.py' % VENV_PATH],
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),

testing/mozharness/configs/talos/windows_vm_config.py

@@ -20,7 +20,6 @@ config = {
     "virtualenv_modules": ['pywin32', 'talos', 'mozinstall'],
     "exes": {
         'python': PYTHON,
-        'virtualenv': [PYTHON, os.path.join(os.path.dirname(sys.executable), 'Lib', 'site-packages', 'virtualenv.py')],
         'easy_install': ['%s/scripts/python' % VENV_PATH,
                          '%s/scripts/easy_install-2.7-script.py' % VENV_PATH],
         'mozinstall': ['%s/scripts/python' % VENV_PATH,

testing/mozharness/configs/unittests/linux_unittest.py

@@ -36,7 +36,6 @@ else:
 config = {
     "buildbot_json_path": "buildprops.json",
     "exes": {
-        "virtualenv": "/tools/virtualenv/bin/virtualenv",
         "tooltool.py": "/tools/tooltool.py",
     },
     "find_links": [

testing/mozharness/configs/unittests/mac_unittest.py

@@ -10,7 +10,6 @@ ADJUST_MOUSE_AND_SCREEN = False
 config = {
     "buildbot_json_path": "buildprops.json",
     "exes": {
-        'virtualenv': '/tools/virtualenv/bin/virtualenv',
         'tooltool.py': "/tools/tooltool.py",
     },
     "find_links": [

testing/mozharness/configs/unittests/thunderbird_buildbot.py

@@ -17,6 +17,5 @@ config = {
 if platform.system() == "Linux":
     config["exes"] = {
         "python": "/tools/buildbot/bin/python",
-        "virtualenv": ["/tools/buildbot/bin/python", "/tools/misc-python/virtualenv.py"],
         "tooltool.py": "/tools/tooltool.py",
     }

testing/mozharness/configs/unittests/win_taskcluster_unittest.py

@@ -24,10 +24,6 @@ TASKBAR_AUTOHIDE_REG_PATH = {
 config = {
     "exes": {
         'python': sys.executable,
-        'virtualenv': [
-            sys.executable,
-            os.path.join(os.path.dirname(sys.executable), 'Lib', 'site-packages', 'virtualenv.py')
-        ],
         'mozinstall': ['build/venv/scripts/python', 'build/venv/scripts/mozinstall-script.py'],
         'tooltool.py': [sys.executable, os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')],
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')

testing/mozharness/configs/unittests/win_unittest.py

@@ -14,7 +14,6 @@ config = {
     "buildbot_json_path": "buildprops.json",
     "exes": {
         'python': sys.executable,
-        'virtualenv': [sys.executable, 'c:/mozilla-build/buildbotve/virtualenv.py'],
         'hg': 'c:/mozilla-build/hg/hg',
         'mozinstall': ['%s/build/venv/scripts/python' % os.getcwd(),
                        '%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],

testing/mozharness/configs/web_platform_tests/prod_config.py

@@ -17,7 +17,6 @@ config = {
     ],
 
     "exes": {
-        'virtualenv': '/tools/virtualenv/bin/virtualenv',
         'tooltool.py': "/tools/tooltool.py",
     },
 

testing/mozharness/configs/web_platform_tests/prod_config_windows.py

@@ -22,7 +22,6 @@ config = {
 
     "exes": {
         'python': sys.executable,
-        'virtualenv': [sys.executable, 'c:/mozilla-build/buildbotve/virtualenv.py'],
         'hg': 'c:/mozilla-build/hg/hg',
         'mozinstall': ['%s/build/venv/scripts/python' % os.getcwd(),
                        '%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],

testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py

@@ -22,10 +22,6 @@ config = {
 
     "exes": {
         'python': sys.executable,
-        'virtualenv': [
-            sys.executable,
-            os.path.join(os.path.dirname(sys.executable), 'Lib', 'site-packages', 'virtualenv.py')
-        ],
         'mozinstall': ['build/venv/scripts/python', 'build/venv/scripts/mozinstall-script.py'],
         'tooltool.py': [sys.executable, os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')],
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')

testing/mozharness/configs/web_platform_tests/test_config_windows.py

@@ -20,7 +20,6 @@ config = {
 
     "exes": {
         'python': sys.executable,
-        'virtualenv': [sys.executable, 'c:/mozilla-source/cedar/python/virtualenv/virtualenv.py'], #'c:/mozilla-build/buildbotve/virtualenv.py'],
         'hg': 'c:/mozilla-build/hg/hg',
         'mozinstall': ['%s/build/venv/scripts/python' % os.getcwd(),
                        '%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],

testing/mozharness/mozharness/base/python.py

@@ -313,9 +313,7 @@ class VirtualenvMixin(object):
         """
         Create a python virtualenv.
 
-        The virtualenv exe can be defined in c['virtualenv'] or
-        c['exes']['virtualenv'], as a string (path) or list (path +
-        arguments).
+        This uses the copy of virtualenv that is vendored in mozharness.
 
         c['virtualenv_python_dll'] is an optional config item that works
         around an old windows virtualenv bug.