Bug 1304176 - Remove path to virtualenv.py in mozharness configs; r?ted
For mozharness scripts running out of a source checkout, we now use
the virtualenv vendored in the source checkout. So there's no need to
define the path to virtualenv.py in mozharness configs.
There are probably more mozharness configs that could have the
virtualenv path removed. These are the ones that didn't require me
think very hard.
MozReview-Commit-ID: G3EQZv6U4hA
--- a/testing/mozharness/configs/b2g/desktop_windows32.py
+++ b/testing/mozharness/configs/b2g/desktop_windows32.py
@@ -32,20 +32,16 @@ config = {
'c:\\mozilla-build\\buildbotve\\scripts\\buildbot'
],
"make": [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
)
],
- 'virtualenv': [
- sys.executable,
- 'c:/mozilla-build/buildbotve/virtualenv.py'
- ],
},
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
'enable_ccache': False,
'vcs_share_base': 'C:\\builds\\hg-shared',
'objdir': 'obj-firefox',
'tooltool_script': [sys.executable,
'C:/mozilla-build/tooltool.py'],
'tooltool_bootstrap': "setup.sh",
--- a/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
@@ -29,20 +29,16 @@ config = {
'c:\\mozilla-build\\buildbotve\\scripts\\buildbot'
],
"make": [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
)
],
- 'virtualenv': [
- sys.executable,
- 'c:/mozilla-build/buildbotve/virtualenv.py'
- ],
},
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env
'enable_signing': True,
'enable_ccache': False,
'vcs_share_base': 'C:/builds/hg-shared',
'objdir': 'obj-firefox',
'tooltool_script': [sys.executable,
--- a/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
@@ -29,20 +29,16 @@ config = {
'c:\\mozilla-build\\buildbotve\\scripts\\buildbot'
],
"make": [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
)
],
- 'virtualenv': [
- sys.executable,
- 'c:/mozilla-build/buildbotve/virtualenv.py'
- ],
},
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env
'enable_signing': True,
'enable_ccache': False,
'vcs_share_base': 'C:/builds/hg-shared',
'objdir': 'obj-firefox',
'tooltool_script': [sys.executable,
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_debug.py
@@ -20,22 +20,16 @@ config = {
'exes': {
'python2.7': sys.executable,
'make': [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
)
],
- 'virtualenv': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'src', 'python', 'virtualenv', 'virtualenv.py'
- )
- ],
'mach-build': [
os.path.join(os.environ['MOZILLABUILD'], 'msys', 'bin', 'bash.exe'),
os.path.join(os.getcwd(), 'build', 'src', 'mach'),
'--log-no-times', 'build', '-v'
],
},
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win32_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win32_opt.py
@@ -20,22 +20,16 @@ config = {
'exes': {
'python2.7': sys.executable,
'make': [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
)
],
- 'virtualenv': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'src', 'python', 'virtualenv', 'virtualenv.py'
- )
- ],
'mach-build': [
os.path.join(os.environ['MOZILLABUILD'], 'msys', 'bin', 'bash.exe'),
os.path.join(os.getcwd(), 'build', 'src', 'mach'),
'--log-no-times', 'build', '-v'
],
},
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_debug.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_debug.py
@@ -20,22 +20,16 @@ config = {
'exes': {
'python2.7': sys.executable,
'make': [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
)
],
- 'virtualenv': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'src', 'python', 'virtualenv', 'virtualenv.py'
- )
- ],
'mach-build': [
os.path.join(os.environ['MOZILLABUILD'], 'msys', 'bin', 'bash.exe'),
os.path.join(os.getcwd(), 'build', 'src', 'mach'),
'--log-no-times', 'build', '-v'
],
},
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env
--- a/testing/mozharness/configs/builds/taskcluster_firefox_win64_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_win64_opt.py
@@ -20,22 +20,16 @@ config = {
'exes': {
'python2.7': sys.executable,
'make': [
sys.executable,
os.path.join(
os.getcwd(), 'build', 'src', 'build', 'pymake', 'make.py'
)
],
- 'virtualenv': [
- sys.executable,
- os.path.join(
- os.getcwd(), 'build', 'src', 'python', 'virtualenv', 'virtualenv.py'
- )
- ],
'mach-build': [
os.path.join(os.environ['MOZILLABUILD'], 'msys', 'bin', 'bash.exe'),
os.path.join(os.getcwd(), 'build', 'src', 'mach'),
'--log-no-times', 'build', '-v'
],
},
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env