wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1238469 - Part 2: Refactor b2g mulet tests to remove the usage of custom mozharness configs; r=ahal

Browse Source
This commit is contained in:
Edgar Chen 2016-01-20 19:33:41 +08:00
parent 9c180e5fa7
commit 4195c31ff0
15 changed files with 87 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
testing/mozharness/configs/b2g/desktop_automation_config.py
View File

@ -1,78 +0,0 @@
# This is a template config file for b2g desktop unittest production.
import os
config = {
# mozharness options
"application": "b2g",
"tooltool_cache": "/builds/tooltool_cache",
"exes": {
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
"find_links": [
"http://pypi.pvt.build.mozilla.org/pub",
"http://pypi.pub.build.mozilla.org/pub",
],
"pip_index": False,
"buildbot_json_path": "buildprops.json",
"default_actions": [
'clobber',
'read-buildbot-config',
'download-and-extract',
'create-virtualenv',
'install',
'run-tests',
],
"download_symbols": "ondemand",
"download_minidump_stackwalk": True,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
# testsuite options
"run_file_names": {
"mochitest": "runtestsb2g.py",
"reftest": "runreftestb2g.py",
},
"suite_definitions": {
"mochitest": {
"options": [
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--profile=%(gaia_profile)s",
"--app=%(application)s",
"--desktop",
"--utility-path=%(utility_path)s",
"--certificate-path=%(cert_path)s",
"--symbols-path=%(symbols_path)s",
"--browser-arg=%(browser_arg)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
"run_filename": "runtestsb2g.py",
"testsdir": "mochitest"
},
"reftest": {
"options": [
"--desktop",
"--profile=%(gaia_profile)s",
"--appname=%(application)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--browser-arg=%(browser_arg)s",
"--symbols-path=%(symbols_path)s",
"%(test_manifest)s"
],
"run_filename": "runreftestsb2g.py",
"testsdir": "reftest"
}
},
}

40
testing/mozharness/configs/b2g/gaia_integration_config.py
View File

@ -1,40 +0,0 @@
# This is a template config file for b2g emulator unittest testing
import platform
HG_SHARE_BASE_DIR = "/builds/hg-shared"
if platform.system().lower() == 'darwin':
xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/4d8d7a37d90c34a2a2fda3066a8fe85c189b183d05389cb957fc6fed31f10a6924e50c1b84488ff61c015293803f58a3aed5d4819374d04c8e0ee2b9e3997278"
else:
xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/dc9503b21c87b5a469118746f99e4f41d73888972ce735fa10a80f6d218086da0e3da525d9a4cd8e4ea497ec199fef720e4a525873d77a1af304ac505e076462"
config = {
# mozharness script options
"xre_url": xre_url,
"vcs_share_base": HG_SHARE_BASE_DIR,
"exes": {
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
"find_links": [
"http://pypi.pvt.build.mozilla.org/pub",
"http://pypi.pub.build.mozilla.org/pub",
],
"pip_index": False,
"buildbot_json_path": "buildprops.json",
"default_actions": [
'clobber',
'read-buildbot-config',
'pull',
'download-and-extract',
'create-virtualenv',
'install',
'run-tests',
],
"vcs_output_timeout": 1760,
}

45
testing/mozharness/configs/b2g/gaia_unit_production_config.py
View File

@ -1,45 +0,0 @@
# This is a template config file for b2g emulator unittest testing
import platform
import os
HG_SHARE_BASE_DIR = "/builds/hg-shared"
if platform.system().lower() == 'darwin':
xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/4d8d7a37d90c34a2a2fda3066a8fe85c189b183d05389cb957fc6fed31f10a6924e50c1b84488ff61c015293803f58a3aed5d4819374d04c8e0ee2b9e3997278"
else:
xre_url = "https://api.pub.build.mozilla.org/tooltool/sha512/dc9503b21c87b5a469118746f99e4f41d73888972ce735fa10a80f6d218086da0e3da525d9a4cd8e4ea497ec199fef720e4a525873d77a1af304ac505e076462"
config = {
# mozharness script options
"xre_url": xre_url,
"vcs_share_base": HG_SHARE_BASE_DIR,
"exes": {
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
"find_links": [
"http://pypi.pvt.build.mozilla.org/pub",
"http://pypi.pub.build.mozilla.org/pub",
],
"pip_index": False,
"buildbot_json_path": "buildprops.json",
"default_actions": [
'clobber',
'read-buildbot-config',
'pull',
'download-and-extract',
'create-virtualenv',
'install',
'run-tests',
],
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
"vcs_output_timeout": 1760,
}

25
testing/mozharness/configs/b2g/generic_config.py
View File

@ -1,25 +0,0 @@
# This is a config with generic releng related values
import os
config = {
"exes": {
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
"find_links": [
"http://pypi.pvt.build.mozilla.org/pub",
"http://pypi.pub.build.mozilla.org/pub",
],
"pip_index": False,
"buildbot_json_path": "buildprops.json",
"download_symbols": "ondemand",
"download_minidump_stackwalk": True,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
}

28
testing/mozharness/configs/b2g/taskcluster_gaia_integration.py Normal file
View File

@ -0,0 +1,28 @@
# This is a template config file for b2g emulator unittest testing
import platform
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
# mozharness script options
"vcs_share_base": HG_SHARE_BASE_DIR,
"find_links": [
"http://pypi.pvt.build.mozilla.org/pub",
"http://pypi.pub.build.mozilla.org/pub",
],
"pip_index": False,
"download_symbols": "ondemand",
# We bake this directly into the tester image now.
"download_minidump_stackwalk": False,
"default_actions": [
'clobber',
'download-and-extract',
'create-virtualenv',
'install',
'run-tests',
],
"vcs_output_timeout": 1760,
}

32
testing/mozharness/configs/b2g/taskcluster_gaia_unit_production.py Normal file
View File

@ -0,0 +1,32 @@
# This is a template config file for b2g emulator unittest testing
import platform
import os
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
# mozharness script options
"vcs_share_base": HG_SHARE_BASE_DIR,
"find_links": [
"http://pypi.pvt.build.mozilla.org/pub",
"http://pypi.pub.build.mozilla.org/pub",
],
"pip_index": False,
"default_actions": [
'clobber',
'download-and-extract',
'create-virtualenv',
'install',
'run-tests',
],
"download_symbols": "ondemand",
# We bake this directly into the tester image now.
"download_minidump_stackwalk": False,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
"vcs_output_timeout": 1760,
}

21
testing/mozharness/configs/b2g/mulet_config.py → testing/mozharness/configs/b2g/taskcluster_mulet_automation.py
View File

@ -1,14 +1,29 @@
# Call --cfg b2g/generic_config.py before this config
# This is a template config file for mulet unittest testing
import os
config = {
"find_links": [
"http://pypi.pvt.build.mozilla.org/pub",
"http://pypi.pub.build.mozilla.org/pub",
],
"pip_index": False,
"download_symbols": "ondemand",
# We bake this directly into the tester image now.
"download_minidump_stackwalk": False,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
"default_actions": [
'clobber',
'read-buildbot-config',
'pull',
'download-and-extract',
'create-virtualenv',
'install',
'run-tests',
],
# testsuite options
"suite_definitions": {
"reftest": {

7
testing/taskcluster/tasks/tests/b2g_gaia_unit_oop.yml
View File

@ -12,13 +12,8 @@ task:
- ./bin/pull_gaia.sh &&
- >
python ./mozharness/scripts/gaia_unit.py
--no-read-buildbot-config
--config-file ./mozharness/configs/b2g/gaia_unit_production_config.py
--config-file ./mozharness_configs/gaia_integration_override.py
--config-file ./mozharness_configs/remove_executables.py
--no-pull
--config-file ./mozharness/configs/b2g/taskcluster_gaia_unit_production.py
--browser-arg -oop
--download-symbols ondemand
--installer-url {{build_url}}
--test-url {{tests_url}}
--gaia-repo https://hg.mozilla.org/integration/gaia-central

7
testing/taskcluster/tasks/tests/mulet_build_test.yml
View File

@ -13,14 +13,9 @@ task:
- >
python ./mozharness/scripts/gaia_build_integration.py
--application firefox
--no-read-buildbot-config
--config-file ./mozharness/configs/b2g/gaia_integration_config.py
--config-file ./mozharness_configs/gaia_integration_override.py
--config-file ./mozharness_configs/remove_executables.py
--config-file ./mozharness/configs/b2g/taskcluster_gaia_integration.py
--installer-url {{build_url}}
--no-pull
--test-packages-url {{test_packages_url}}
--download-symbols ondemand
--gaia-repo https://hg.mozilla.org/integration/gaia-central
--gaia-dir /home/worker
--xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547

7
testing/taskcluster/tasks/tests/mulet_build_unit.yml
View File

@ -13,12 +13,7 @@ task:
- >
python ./mozharness/scripts/gaia_build_unit.py
--application firefox
--no-read-buildbot-config
--config-file ./mozharness/configs/b2g/gaia_integration_config.py
--config-file ./mozharness_configs/gaia_integration_override.py
--config-file ./mozharness_configs/remove_executables.py
--no-pull
--download-symbols ondemand
--config-file ./mozharness/configs/b2g/taskcluster_gaia_integration.py
--installer-url {{build_url}}
--test-packages-url {{test_packages_url}}
--gaia-repo https://hg.mozilla.org/integration/gaia-central

7
testing/taskcluster/tasks/tests/mulet_gaia_js_integration_tests.yml
View File

@ -14,14 +14,9 @@ task:
- >
python ./mozharness/scripts/gaia_integration.py
--application firefox
--no-read-buildbot-config
--config-file b2g/gaia_integration_config.py
--config-file ./mozharness_configs/gaia_integration_override.py
--config-file ./mozharness_configs/remove_executables.py
--no-pull
--config-file b2g/taskcluster_gaia_integration.py
--installer-url {{build_url}}
--test-packages-url {{test_packages_url}}
--download-symbols ondemand
--total-chunk {{total_chunks}}
--this-chunk {{chunk}}
--gaia-repo {{gaia_head_repository}}

7
testing/taskcluster/tasks/tests/mulet_gaia_unit.yml
View File

@ -13,14 +13,9 @@ task:
- >
python ./mozharness/scripts/gaia_unit.py
--application firefox
--no-read-buildbot-config
--config-file b2g/gaia_unit_production_config.py
--config-file ./mozharness_configs/gaia_integration_override.py
--config-file ./mozharness_configs/remove_executables.py
--no-pull
--config-file b2g/taskcluster_gaia_unit_production.py
--installer-url {{build_url}}
--test-packages-url {{test_packages_url}}
--download-symbols ondemand
--gaia-repo {{gaia_head_repository}}
--gaia-dir /home/worker
--xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547

7
testing/taskcluster/tasks/tests/mulet_gaia_unit_oop.yml
View File

@ -13,15 +13,10 @@ task:
- >
python ./mozharness/scripts/gaia_unit.py
--application firefox
--no-read-buildbot-config
--config-file b2g/gaia_unit_production_config.py
--config-file ./mozharness_configs/gaia_integration_override.py
--config-file ./mozharness_configs/remove_executables.py
--no-pull
--config-file b2g/taskcluster_gaia_unit_production.py
--browser-arg -oop
--installer-url {{build_url}}
--test-packages-url {{test_packages_url}}
--download-symbols ondemand
--gaia-repo {{gaia_head_repository}}
--gaia-dir /home/worker
--xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547

6
testing/taskcluster/tasks/tests/mulet_linter.yml
View File

@ -13,11 +13,7 @@ task:
- >
python ./mozharness/scripts/gaia_linter.py
--application firefox
--no-read-buildbot-config
--config-file ./mozharness/configs/b2g/gaia_integration_config.py
--config-file ./mozharness_configs/gaia_integration_override.py
--download-symbols ondemand
--no-pull
--config-file ./mozharness/configs/b2g/taskcluster_gaia_integration.py
--installer-url {{build_url}}
--test-packages-url {{test_packages_url}}
--gaia-repo https://hg.mozilla.org/integration/gaia-central

8
testing/taskcluster/tasks/tests/mulet_reftests.yml
View File

@ -13,14 +13,10 @@ task:
- entrypoint
- ./bin/pull_gaia.sh &&
- >
python ./mozharness/scripts/mulet_unittest.py --no-read-buildbot-config
--config-file ./mozharness/configs/b2g/generic_config.py
--config-file ./mozharness/configs/b2g/mulet_config.py
--config-file ./mozharness_configs/remove_executables.py
--no-pull
python ./mozharness/scripts/mulet_unittest.py
--config-file ./mozharness/configs/b2g/taskcluster_mulet_automation.py
--installer-url {{build_url}}
--test-packages-url {{test_packages_url}}
--download-symbols ondemand
--test-suite reftest
--test-manifest tests/layout/reftests/reftest.list
--this-chunk {{chunk}}