Backed out changeset e760aa2e4016 (
bug 1275775)
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2144,17 +2144,17 @@ apply_localconfig(PROJECTS, localconfig.
# project has both 'platforms' and 'variants' entries for 'linux' or
# 'linux64'.)
#
BRANCH_PROJECTS = {
# Builds that should trigger backouts if they break. Should be on all trees
# feeding into mozilla-central.
'spidermonkey_tier_1': {
'variants': {
- 'linux64-debug': [],
+ 'linux64-debug': ['rootanalysis', 'compacting', 'arm64-sim'],
'linux-debug': ['arm-sim'],
'macosx64-debug': [],
'win32-debug': ['plaindebug', 'compacting'],
'win32': ['plain'],
},
'platforms': {
'linux': {},
'linux-debug': {},
@@ -2169,31 +2169,28 @@ BRANCH_PROJECTS = {
},
'hgurl': 'https://hg.mozilla.org/',
},
# Try server builds only triggered on changes to the spidermonkey source
'spidermonkey_try': {
'enable_try': True,
'try_by_default': {
- 'plain': set('win32', 'win64']),
- 'plaindebug': set('win32-debug', 'win64-debug']),
'rootanalysis': True, # all platforms for which it is defined
'compacting': set(['linux64-debug', 'win32-debug']),
'arm-sim': True,
'arm64-sim': True,
'arm-sim-osx': set([]),
},
'variants': {
- 'linux': [],
- 'linux-debug': ['arm-sim'],
- 'linux64': [],
+ 'linux': ['warnaserr'],
+ 'linux-debug': ['arm-sim', 'warnaserrdebug'],
+ 'linux64': ['warnaserr'],
'linux64-debug': ['rootanalysis', 'compacting', 'warnaserrdebug', 'arm64-sim'],
- 'macosx64': ['plain', 'compacting'],
- 'macosx64-debug': ['arm-sim-osx', 'plaindebug'],
+ 'macosx64-debug': ['arm-sim-osx'],
'win32': ['compacting', 'plain'],
'win32-debug': ['compacting', 'plaindebug'],
'win64': ['compacting', 'plain'],
'win64-debug': ['compacting', 'plaindebug'],
},
'platforms': {
'linux': {},
'linux-debug': {},
@@ -2203,16 +2200,39 @@ BRANCH_PROJECTS = {
'win32-debug': {},
'win64': {},
'win64-debug': {},
'macosx64': {},
'macosx64-debug': {},
},
'hgurl': 'https://hg.mozilla.org/',
},
+
+ # Non-tier-1 builds that provide useful information but are hidden on tbpl.
+ # These should be run on the (small) subset of trees looked at by the
+ # relevant developers.
+ 'spidermonkey_info': {
+ 'variants': {
+ 'linux64': ['warnaserr'],
+ 'linux64-debug': ['warnaserrdebug'],
+ },
+ 'platforms': {
+ 'linux': {},
+ 'linux-debug': {},
+ 'linux64': {},
+ 'linux64-debug': {},
+ 'win32': {},
+ 'win32-debug': {},
+ 'win64': {},
+ 'win64-debug': {},
+ 'macosx64': {},
+ 'macosx64-debug': {},
+ },
+ 'hgurl': 'https://hg.mozilla.org/',
+ },
}
apply_localconfig(BRANCH_PROJECTS, localconfig.BRANCH_PROJECTS)
# All branches (not in project_branches) that are to be built MUST be listed here, along with their
# platforms (if different from the default set).
BRANCHES = {
'mozilla-central': {
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -139,16 +139,20 @@ BRANCH_PROJECTS = {
'spidermonkey_tier_1': {
'scripts_repo': 'https://hg.mozilla.org/build/tools',
'idle_slaves': 0,
},
'spidermonkey_try': {
'scripts_repo': 'https://hg.mozilla.org/build/tools',
'idle_slaves': 0,
},
+ 'spidermonkey_info': {
+ 'scripts_repo': 'https://hg.mozilla.org/build/tools',
+ 'idle_slaves': 0,
+ },
}
if __name__ == "__main__":
import sys
args = sys.argv[1:]
# print build slave details
host_info = {
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -16,17 +16,17 @@ PROJECT_BRANCHES = {
'repo_path': 'integration/mozilla-inbound',
'enable_perproduct_builds': True,
'mozconfig_dir': 'mozilla-central',
'pgo_strategy': 'periodic',
'periodic_start_hours': range(1, 24, 3),
'talos_suites': {
'xperf': 1,
},
- 'branch_projects': ['spidermonkey_tier_1'],
+ 'branch_projects': ['spidermonkey_tier_1', 'spidermonkey_info'],
},
#'services-central': {}, # Bug 1010674
# 'alder': {},
# Bug 1252292 - Schedule e10s tests on Ash for all desktop platforms
'ash': {
'enable_talos': False,
'enable_valgrind': False,
'lock_platforms': True,
--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -134,9 +134,13 @@ BRANCH_PROJECTS = {
'spidermonkey_tier_1': {
'scripts_repo': 'https://hg.mozilla.org/users/stage-ffxbld/tools',
'idle_slaves': 0,
},
'spidermonkey_try': {
'scripts_repo': 'https://hg.mozilla.org/users/stage-ffxbld/tools',
'idle_slaves': 0,
},
+ 'spidermonkey_info': {
+ 'scripts_repo': 'https://hg.mozilla.org/users/stage-ffxbld/tools',
+ 'idle_slaves': 0,
+ },
}