Permalink
Browse files

bug 720436 - generalize the firefox fetching pattern from peptest.py.…

… r=jhammel
  • Loading branch information...
1 parent ec1ae0b commit 8d7b51ee8bf2c19af0d799f0454a8e8ac2b0f5f1 @escapewindow escapewindow committed Apr 10, 2012
@@ -7,7 +7,6 @@
# mozharness script options
"log_name": "pep",
"buildbot_json_path": "buildprops.json",
- "virtualenv_modules": ["simplejson"],
"simplejson_url": "http://build.mozilla.org/talos/zips/simplejson-2.2.1.tar.gz",
# peptest options
# defaults to firefox, can also be thunderbird, fennec, etc.
@@ -38,9 +37,11 @@
"default_actions": [
"clobber",
- "create-virtualenv",
+ "pull",
"read-buildbot-config",
- "create-deps",
+ "download-and-extract",
+ "create-virtualenv",
+ "install",
"run-peptest",
],
"repos": [{"repo": "http://hg.mozilla.org/build/tools",}],
@@ -16,9 +16,4 @@
"tracer_threshold": 50,
"tracer_interval": 10,
"symbols_path": None,
-
- # get latest tinderbox options
- "get_latest_tinderbox_product": "mozilla-central",
- "get_latest_tinderbox_platform": None,
- "get_latest_tinderbox_debug_build": False,
}
@@ -6,8 +6,6 @@
config = {
# mozharness script options
- "base_work_dir": os.getcwd(),
- "work_dir": "build",
"log_name": "pep",
"log_level": "info",
"test_url": "url_to_packaged_tests",
@@ -36,21 +34,4 @@
"tracer_interval": 10,
# URL or path to the symbols directory for debugging crashes
"symbols_path": None,
-
- # get latest tinderbox options
- # (these are only used by the get-latest-tinderbox action)
- "get_latest_tinderbox_product": "mozilla-central",
- "get_latest_tinderbox_platform": None, # defaults to current platform
- "get_latest_tinderbox_debug_build": False,
}
-
-# these config options depend on the abs_work_dir option
-abs_work_dir = os.path.abspath(os.path.join(config['base_work_dir'],
- config['work_dir']))
-
-config['virtualenv_path'] = os.path.join(abs_work_dir, "venv")
-# directory to extract tests to
-config['test_install_dir'] = os.path.join(abs_work_dir, "tests")
-# directory to install application to
-config['application_install_dir'] = os.path.join(abs_work_dir,
- "application")
@@ -8,9 +8,7 @@
"log_name": "pep",
"buildbot_json_path": "buildprops.json",
"virtualenv_path": 'c:/talos-slave/test/build/venv',
- "virtualenv_modules": ["simplejson"],
"virtualenv_python_dll": 'c:/mozilla-build/python25/python25.dll',
-# "virtualenv_options": ['--no-site-packages', '--distribute', '--never-download'],
"distribute_url": "http://build.mozilla.org/talos/zips/distribute-0.6.24.tar.gz",
"pip_url": "http://build.mozilla.org/talos/zips/pip-1.0.2.tar.gz",
"simplejson_url": "http://build.mozilla.org/talos/zips/simplejson-2.2.1.tar.gz",
@@ -44,9 +42,11 @@
"default_actions": [
"clobber",
- "create-virtualenv",
+ "pull",
"read-buildbot-config",
- "create-deps",
+ "download-and-extract",
+ "create-virtualenv",
+ "install",
"run-peptest",
],
"repos": [{"repo": "http://hg.mozilla.org/build/tools",}],
@@ -8,9 +8,7 @@
"log_name": "pep",
"buildbot_json_path": "buildprops.json",
"virtualenv_path": 'c:/talos-slave/test/build/venv',
- "virtualenv_modules": ["simplejson"],
"virtualenv_python_dll": 'c:/mozilla-build/python25/python25.dll',
-# "virtualenv_options": ['--no-site-packages', '--distribute', '--never-download'],
"distribute_url": "http://build.mozilla.org/talos/zips/distribute-0.6.24.tar.gz",
"pip_url": "http://build.mozilla.org/talos/zips/pip-1.0.2.tar.gz",
"simplejson_url": "http://build.mozilla.org/talos/zips/simplejson-2.2.1.tar.gz",
@@ -44,9 +42,11 @@
"default_actions": [
"clobber",
- "create-virtualenv",
+ "pull",
"read-buildbot-config",
- "create-deps",
+ "download-and-extract",
+ "create-virtualenv",
+ "install",
"run-peptest",
],
"repos": [{"repo": "http://hg.mozilla.org/build/tools",}],
@@ -8,7 +8,6 @@
"log_name": "pep",
"buildbot_json_path": "buildprops.json",
"virtualenv_path": 'c:/talos-slave/test/build/venv',
- "virtualenv_modules": ["simplejson"],
"virtualenv_python_dll": 'c:/mozilla-build/python25/python25.dll',
"distribute_url": "http://build.mozilla.org/talos/zips/distribute-0.6.24.tar.gz",
"pip_url": "http://build.mozilla.org/talos/zips/pip-1.0.2.tar.gz",
@@ -43,9 +42,11 @@
"default_actions": [
"clobber",
- "create-virtualenv",
+ "pull",
"read-buildbot-config",
- "create-deps",
+ "download-and-extract",
+ "create-virtualenv",
+ "install",
"run-peptest",
],
"repos": [{"repo": "http://hg.mozilla.org/build/tools",}],
Oops, something went wrong.

0 comments on commit 8d7b51e

Please sign in to comment.