Skip to content
This repository has been archived by the owner on Sep 15, 2021. It is now read-only.

Commit

Permalink
bug 720436 - generalize the firefox fetching pattern from peptest.py.…
Browse files Browse the repository at this point in the history 
… r=jhammel
  • Loading branch information
@escapewindow
escapewindow committed Apr 10, 2012
1 parent ec1ae0b commit 8d7b51e
Show file tree
Hide file tree
Showing 7 changed files with 129 additions and 176 deletions.
7 changes: 4 additions & 3 deletions configs/peptest/prod_config.py
View file
Expand Up @@ -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.
Expand Down Expand Up @@ -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",}],
Expand Down
5 changes: 0 additions & 5 deletions configs/peptest/test_config.py
View file
Expand Up @@ -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,
}
19 changes: 0 additions & 19 deletions configs/peptest/user_config.py
View file
Expand Up @@ -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",
Expand Down Expand Up @@ -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 changes: 4 additions & 4 deletions configs/peptest/w764_config.py
View file
Expand Up @@ -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",
Expand Down Expand Up @@ -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",}],
Expand Down
8 changes: 4 additions & 4 deletions configs/peptest/win7_config.py
View file
Expand Up @@ -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",
Expand Down Expand Up @@ -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",}],
Expand Down
7 changes: 4 additions & 3 deletions configs/peptest/xp_config.py
View file
Expand Up @@ -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",
Expand Down Expand Up @@ -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",}],
Expand Down

0 comments on commit 8d7b51e

Please sign in to comment.