--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -3,17 +3,17 @@ from copy import deepcopy
from config import MOZHARNESS_REBOOT_CMD
from localconfig import SLAVES, TRY_SLAVES, GLOBAL_VARS
import b2g_localconfig
reload(b2g_localconfig)
import master_common
reload(master_common)
-from master_common import items_before
+from master_common import setMainFirefoxVersions, items_before
import config_common
reload(config_common)
from config_common import nested_haskey
GLOBAL_VARS = deepcopy(GLOBAL_VARS)
GLOBAL_VARS['stage_username'] = 'ffxbld'
@@ -43,16 +43,18 @@ BRANCHES = {
'mozilla-aurora': {},
'mozilla-inbound': {},
'b2g-inbound': {},
'services-central': {},
'ionmonkey': {},
'try': {'coallesce_jobs': False},
}
+setMainFirefoxVersions(BRANCHES)
+
PLATFORMS = {
'linux32_gecko': {},
'linux64_gecko': {},
'macosx64_gecko': {},
'emulator': {},
}
builder_prefix = "b2g"
@@ -179,114 +181,120 @@ MOCHITEST = [
'script_path': 'scripts/b2g_emulator_unittest.py',
'blob_upload': True,
},
),
]
MOCHITEST_EMULATOR_DEBUG = [
('mochitest-debug-1', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-2', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-3', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-4', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-5', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-6', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-7', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-8', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-9', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-10', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-11', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-12', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-13', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-14', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
('mochitest-debug-15', {'suite': 'mochitest-plain',
- 'use_mozharness': True,
- 'script_path': 'scripts/b2g_emulator_unittest.py',
- 'blob_upload': True,
- },
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_emulator_unittest.py',
+ 'blob_upload': True,
+ },
),
]
MOCHITEST_DESKTOP = [
('mochitest-1', {'suite': 'mochitest-plain',
'use_mozharness': True,
'script_path': 'scripts/b2g_desktop_unittest.py',
'blob_upload': True,
},
),
+ ('mochitest-2', {'suite': 'mochitest-plain',
+ 'use_mozharness': True,
+ 'script_path': 'scripts/b2g_desktop_unittest.py',
+ 'blob_upload': True,
+ },
+ ),
]
REFTEST = [
('reftest-1', {'suite': 'reftest',
'use_mozharness': True,
'script_path': 'scripts/b2g_emulator_unittest.py',
'blob_upload': True,
},
@@ -485,17 +493,24 @@ PLATFORM_UNITTEST_VARS = {
'extra_args': [
'--cfg', 'marionette/gaia_ui_test_prod_config.py',
],
},
'mochitest-1': {
'extra_args': [
'--cfg', 'b2g/desktop_automation_config.py',
'--test-suite', 'mochitest',
- '--this-chunk', 1, '--total-chunks', 1,
+ '--this-chunk', 1, '--total-chunks', 2,
+ ],
+ },
+ 'mochitest-2': {
+ 'extra_args': [
+ '--cfg', 'b2g/desktop_automation_config.py',
+ '--test-suite', 'mochitest',
+ '--this-chunk', 2, '--total-chunks', 2,
],
},
'reftest': {
'extra_args': [
'--cfg', 'b2g/desktop_automation_config.py',
'--test-suite', 'reftest',
],
},
@@ -528,17 +543,24 @@ PLATFORM_UNITTEST_VARS = {
'extra_args': [
'--cfg', 'marionette/gaia_ui_test_prod_config.py',
],
},
'mochitest-1': {
'extra_args': [
'--cfg', 'b2g/desktop_automation_config.py',
'--test-suite', 'mochitest',
- '--this-chunk', 1, '--total-chunks', 1,
+ '--this-chunk', 1, '--total-chunks', 2,
+ ],
+ },
+ 'mochitest-2': {
+ 'extra_args': [
+ '--cfg', 'b2g/desktop_automation_config.py',
+ '--test-suite', 'mochitest',
+ '--this-chunk', 2, '--total-chunks', 2,
],
},
'reftest': {
'extra_args': [
'--cfg', 'b2g/desktop_automation_config.py',
'--test-suite', 'reftest',
],
},
@@ -568,17 +590,24 @@ PLATFORM_UNITTEST_VARS = {
'extra_args': [
'--cfg', 'marionette/gaia_ui_test_prod_config.py',
],
},
'mochitest-1': {
'extra_args': [
'--cfg', 'b2g/desktop_automation_config.py',
'--test-suite', 'mochitest',
- '--this-chunk', 1, '--total-chunks', 1,
+ '--this-chunk', 1, '--total-chunks', 2,
+ ],
+ },
+ 'mochitest-2': {
+ 'extra_args': [
+ '--cfg', 'b2g/desktop_automation_config.py',
+ '--test-suite', 'mochitest',
+ '--this-chunk', 2, '--total-chunks', 2,
],
},
'reftest': {
'extra_args': [
'--cfg', 'b2g/desktop_automation_config.py',
'--test-suite', 'reftest',
],
},
@@ -1378,35 +1407,32 @@ for branch in BRANCHES.keys():
BRANCHES[branch]['pgo_platforms'] = []
# The following are exceptions to the defaults
BRANCHES['ash']['branch_name'] = "Ash"
BRANCHES['ash']['repo_path'] = "projects/ash"
BRANCHES['ash']['mozharness_repo'] = "http://hg.mozilla.org/users/asasaki_mozilla.com/ash-mozharness"
BRANCHES['ash']['mozharness_tag'] = "default"
-BRANCHES['ash']['blob_upload'] = True
BRANCHES['cedar']['branch_name'] = "Cedar"
BRANCHES['cedar']['repo_path'] = "projects/cedar"
BRANCHES['cedar']['mozharness_tag'] = "default"
BRANCHES['cedar']['platforms']['emulator']['fedora-b2g-emulator']['opt_unittest_suites'] += JSREFTEST
BRANCHES['cedar']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['opt_unittest_suites'] = ALL_UNITTESTS[:] + JSREFTEST
BRANCHES['cedar']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['debug_unittest_suites'] = MOCHITEST_EMULATOR_DEBUG[:] + REFTEST + CRASHTEST + MARIONETTE + XPCSHELL
BRANCHES['cedar']['platforms']['linux32_gecko']['ubuntu32_vm-b2gdt']['opt_unittest_suites'] += GAIA_UI + REFTEST_DESKTOP
BRANCHES['cedar']['platforms']['linux64_gecko']['ubuntu64_vm-b2gdt']['opt_unittest_suites'] += REFTEST_DESKTOP
BRANCHES['cedar']['platforms']['macosx64_gecko']['mountainlion-b2gdt']['opt_unittest_suites'] += MOCHITEST_DESKTOP + REFTEST_DESKTOP
-BRANCHES['cedar']['blob_upload'] = True
BRANCHES['pine']['branch_name'] = "Pine"
BRANCHES['pine']['repo_path'] = "projects/pine"
BRANCHES['pine']['mozharness_tag'] = "default"
BRANCHES['pine']['platforms']['emulator']['fedora-b2g-emulator']['opt_unittest_suites'] += JSREFTEST
BRANCHES['pine']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['opt_unittest_suites'] = ALL_UNITTESTS[:] + JSREFTEST
BRANCHES['pine']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['debug_unittest_suites'] = MOCHITEST_EMULATOR_DEBUG[:] + REFTEST + CRASHTEST + MARIONETTE + XPCSHELL
BRANCHES['pine']['platforms']['linux32_gecko']['ubuntu32_vm-b2gdt']['opt_unittest_suites'] += GAIA_UI
-BRANCHES['pine']['blob_upload'] = True
BRANCHES['cypress']['branch_name'] = "Cypress"
BRANCHES['cypress']['repo_path'] = "projects/cypress"
BRANCHES['fx-team']['repo_path'] = "integration/fx-team"
BRANCHES['graphics']['repo_path'] = "projects/graphics"
BRANCHES['ionmonkey']['repo_path'] = "projects/ionmonkey"
BRANCHES['mozilla-b2g18']['repo_path'] = "releases/mozilla-b2g18"
BRANCHES['mozilla-b2g18']['platforms']['emulator']['fedora-b2g-emulator']['opt_unittest_suites'] = MARIONETTE + REFTEST_SANITY
BRANCHES['mozilla-b2g18_v1_1_0_hd']['repo_path'] = "releases/mozilla-b2g18_v1_1_0_hd"
@@ -1416,17 +1442,16 @@ BRANCHES['mozilla-central']['branch_name
BRANCHES['mozilla-aurora']['repo_path'] = "releases/mozilla-aurora"
BRANCHES['mozilla-inbound']['repo_path'] = "integration/mozilla-inbound"
BRANCHES['b2g-inbound']['branch_name'] = "B2g-Inbound"
BRANCHES['b2g-inbound']['repo_path'] = "integration/b2g-inbound"
BRANCHES['b2g-inbound']['platforms']['linux64_gecko']['ubuntu64_vm-b2gdt']['opt_unittest_suites'] += GAIA_UNITTESTS
BRANCHES['services-central']['repo_path'] = "services/services-central"
BRANCHES['try']['pgo_strategy'] = "try"
BRANCHES['try']['enable_try'] = True
-BRANCHES['try']['blob_upload'] = True
# explicitly set slave platforms per branch
for branch in BRANCHES.keys():
for platform in BRANCHES[branch]['platforms']:
if 'slave_platforms' not in BRANCHES[branch]['platforms'][platform]:
BRANCHES[branch]['platforms'][platform]['slave_platforms'] = list(PLATFORMS[platform]['slave_platforms'])
NON_UBUNTU_BRANCHES = set([name for name, branch in items_before(BRANCHES, 'gecko_version', 22)])
@@ -1456,32 +1481,28 @@ for branch in BRANCHES.keys():
if branch in ('mozilla-b2g26_v1_2',
'mozilla-esr24', 'mozilla-b2g18_v1_0_0',
'mozilla-b2g18_v1_0_1', 'mozilla-b2g18_v1_1_0_hd',
'mozilla-b2g18'):
if 'emulator' in BRANCHES[branch]['platforms']:
BRANCHES[branch]['platforms']['emulator']['enable_debug_unittests'] = False
# Disable gaia-integration tests on older branches
-OLD_BRANCHES = set([name for name, branch in items_before(BRANCHES, 'gecko_version', 28)])
+OLD_BRANCHES = set([name for name, branch in items_before(BRANCHES, 'gecko_version', 29)])
for b in BRANCHES.keys():
- slave_p = None
branch = BRANCHES[b]
if b in OLD_BRANCHES:
- if nested_haskey(branch['platforms'], 'linux64_gecko', 'ubuntu64_vm-b2gdt'):
- slave_p = branch['platforms']['linux64_gecko']['ubuntu64_vm-b2gdt']
- if nested_haskey(branch['platforms'], 'linux32_gecko', 'ubuntu32_vm-b2gdt'):
- slave_p = branch['platforms']['linux32_gecko']['ubuntu32_vm-b2gdt']
- if slave_p:
- for i in slave_p['opt_unittest_suites']:
- if i[0] == "gaia-integration":
- slave_p['opt_unittest_suites'].remove(i)
- for i in slave_p['debug_unittest_suites']:
- if i[0] == "gaia-integration":
- slave_p['debug_unittest_suites'].remove(i)
+ for slave_platform in (('linux64_gecko', 'ubuntu64_vm-b2gdt'),
+ ('linux32_gecko', 'ubuntu32_vm-b2gdt')):
+ if nested_haskey(branch['platforms'], slave_platform[0], slave_platform[1]):
+ slave_p = branch['platforms'][slave_platform[0]][slave_platform[1]]
+ slave_p['opt_unittest_suites'] = [x for x in slave_p['opt_unittest_suites']
+ if x[0] != "gaia-integration"]
+ slave_p['debug_unittest_suites'] = [x for x in slave_p['debug_unittest_suites']
+ if x[0] != "gaia-integration"]
# Disable ubuntu64_vm-b2gdt/ubuntu32_vm-b2gdt (ie gaia-ui-test) on older branches
for branch in BRANCHES.keys():
if branch in ('mozilla-esr24', 'mozilla-b2g18_v1_1_0_hd', 'mozilla-b2g18'):
for platform in ('linux64_gecko', 'linux32_gecko'):
if platform in BRANCHES[branch]['platforms']:
for slave_platform in ('ubuntu64_vm-b2gdt', 'ubuntu32_vm-b2gdt'):
if slave_platform in BRANCHES[branch]['platforms'][platform]:
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -68,17 +68,16 @@ BRANCHES = {
'platforms': {
# desktop per sicking in Bug 829513
'linux64': {},
},
'lock_platforms': True,
},
'try': {
'coallesce_jobs': False,
- 'blob_upload': True,
},
}
setMainFirefoxVersions(BRANCHES)
# Talos
PLATFORMS = {
'macosx64': {},
@@ -1595,26 +1594,22 @@ for platform in PLATFORMS.keys():
# wasn't in the list anyways
pass
# Enable jittests on cedar https://bugzilla.mozilla.org/show_bug.cgi?id=912997
for platform in PLATFORMS.keys():
if platform not in (BRANCHES['cedar']['platforms'] or BRANCHES['try']['platforms']):
continue
for slave_platform in PLATFORMS[platform]['slave_platforms']:
+ if 'fedora' in slave_platform:
+ continue # Don't use rev3 mini's with this stuff
# cedar
if slave_platform in BRANCHES['cedar']['platforms'][platform]:
- if BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites']:
- BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += JITTEST[:]
- else:
- BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += JITTEST[:]
- if BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites']:
- BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites'] += JITTEST[:]
- else:
- BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites'] += JITTEST[:]
+ BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += JITTEST[:]
+ BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites'] += JITTEST[:]
# try
if slave_platform in BRANCHES['try']['platforms'][platform]:
BRANCHES['try']['platforms'][platform][slave_platform]['opt_unittest_suites'] += JITTEST[:]
BRANCHES['try']['platforms'][platform][slave_platform]['debug_unittest_suites'] += JITTEST[:]
# Enable 3 chunks mochitest-bc on cedar https://bugzilla.mozilla.org/show_bug.cgi?id=819963
for platform in PLATFORMS.keys():
if platform not in BRANCHES['cedar']['platforms']:
--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -57,16 +57,17 @@ GLOBAL_VARS = {
'disable_tinderbox_mail': True,
'build_tools_repo_path': 'build/tools',
'mozharness_repo': 'http://hg.mozilla.org/build/mozharness',
'mozharness_tag': 'production',
'stage_server': 'stage.mozilla.org',
'stage_username': 'ffxbld',
'stage_ssh_key': 'ffxbld_dsa',
'datazilla_url': 'https://datazilla.mozilla.org/talos',
+ 'blob_upload': True,
}
# Local branch overrides
BRANCHES = {
'mozilla-central': {
'tinderbox_tree': 'Firefox',
'mobile_tinderbox_tree': 'Firefox',
--- a/mozilla-tests/staging_config.py
+++ b/mozilla-tests/staging_config.py
@@ -37,16 +37,17 @@ GLOBAL_VARS = {
'mobile_tinderbox_tree': 'MobileTest',
'build_tools_repo_path': 'build/tools',
'mozharness_repo': 'http://hg.mozilla.org/build/mozharness',
'mozharness_tag': 'production',
'stage_server': 'dev-stage01.srv.releng.scl3.mozilla.com',
'stage_username': 'ffxbld',
'stage_ssh_key': 'ffxbld_dsa',
'datazilla_url': 'https://datazilla.mozilla.org/test',
+ 'blob_upload': True,
}
BRANCHES = {
'try': {
'enable_mail_notifier': False, # Set to True when testing
'email_override': [], # Set to your address when testing
'package_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox/try-builds',
'package_dir': '%(who)s-%(got_revision)s',
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -966,16 +966,17 @@ PLATFORM_VARS = {
'BINSCOPE': 'C:\Program Files (x86)\Microsoft\SDL BinScope\BinScope.exe',
'PATH': "${MOZILLABUILD}nsis-2.46u;${MOZILLABUILD}python27;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
},
'enable_unittests': False,
'enable_checktests': True,
'talos_masters': None,
'nightly_signing_servers': 'dep-signing',
'dep_signing_servers': 'dep-signing',
+ 'consider_for_nightly': False,
},
'android': {
'product_name': 'firefox',
'unittest_platform': 'android-opt',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'Android 2.2 %(branch)s',
'mozconfig': 'android/%(branch)s/nightly',
--- a/mozilla/master_common.py
+++ b/mozilla/master_common.py
@@ -105,16 +105,17 @@ def getTwlog():
global cached_twlog
if cached_twlog:
return cached_twlog
else:
from twisted.python import log as twlog
cached_twlog = twlog
return cached_twlog
+
def prioritizeBuilders(buildmaster, builders):
"""
This is called by the buildmaster to sort the list of builders
Builders for which there are no available slaves are discarded
Builders that share the same set of slaves are grouped together, and the
builders with the most important priority as defined by builderPriority()
are kept, with the rest being discarded.
The final list is shuffled so that each of the important builders has a
@@ -228,19 +229,23 @@ def prioritizeBuilders(buildmaster, buil
c['prioritizeBuilders'] = prioritizeBuilders
# BRANCHES without 'gecko_version' set are considered to have a gecko_version
# later (larger) than any other value. See items_before for example usage.
def setMainFirefoxVersions(BRANCHES):
# MERGE DAY
- BRANCHES['mozilla-release']['gecko_version'] = 26
- BRANCHES['mozilla-beta']['gecko_version'] = 27
- BRANCHES['mozilla-aurora']['gecko_version'] = 28
+ if 'mozilla-release' in BRANCHES:
+ BRANCHES['mozilla-release']['gecko_version'] = 26
+ if 'mozilla-beta' in BRANCHES:
+ BRANCHES['mozilla-beta']['gecko_version'] = 27
+ if 'mozilla-aurora' in BRANCHES:
+ BRANCHES['mozilla-aurora']['gecko_version'] = 28
+
def setMainCommVersions(BRANCHES):
# MERGE DAY
BRANCHES['comm-beta']['gecko_version'] = 27
BRANCHES['comm-aurora']['gecko_version'] = 28
# Typical usage pattern:
#
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -53,17 +53,17 @@ TRY_SLAVES = {
# Local overrides for default values
GLOBAL_VARS = {
'config_repo_path': 'build/buildbot-configs',
'buildbotcustom_repo_path': 'build/buildbotcustom',
'stage_server': 'stage.mozilla.org',
'aus2_host': 'aus3-staging.mozilla.org',
'aus2_user': 'ffxbld',
- 'aus2_ssh_key': 'auspush',
+ 'aus2_ssh_key': 'ffxbld_dsa',
'download_base_url': 'http://ftp.mozilla.org/pub/mozilla.org/firefox',
'mobile_download_base_url': 'http://ftp.mozilla.org/pub/mozilla.org/mobile',
'graph_server': 'graphs.mozilla.org',
'balrog_api_root': 'https://aus4-admin.mozilla.org',
'build_tools_repo_path': 'build/tools',
'base_clobber_url': 'http://clobberer.pvt.build.mozilla.org/index.php',
'disable_tinderbox_mail': True,
# List of talos masters to notify of new builds,
@@ -79,16 +79,17 @@ GLOBAL_VARS = {
('buildbot-master81.build.mozilla.org:9301', True, 5),
],
'xulrunner_tinderbox_tree': 'XULRunner',
'weekly_tinderbox_tree': 'Testing',
'l10n_tinderbox_tree': 'Mozilla-l10n',
'base_mirror_urls': ['http://hg-internal.dmz.scl3.mozilla.com'],
'base_bundle_urls': ['http://ftp.mozilla.org/pub/mozilla.org/firefox/bundles'],
'tooltool_url_list': ['http://runtime-binaries.pvt.build.mozilla.org/tooltool'],
+ 'blob_upload': True,
}
BUILDS_BEFORE_REBOOT = 1
SYMBOL_SERVER_HOST = 'symbolpush.mozilla.org'
# Local branch overrides
BRANCHES = {
'mozilla-central': {
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -108,17 +108,16 @@ PROJECT_BRANCHES = {
'ash': {
'mozharness_repo_path': 'users/asasaki_mozilla.com/ash-mozharness',
'mozharness_repo': 'http://hg.mozilla.org/users/asasaki_mozilla.com/ash-mozharness',
'mozharness_tag': 'default',
'lock_platforms': True,
'talos_suites': {
'xperf': 1,
},
- 'blob_upload': True,
'platforms': {
'linux': {},
'linux64': {},
'win32': {},
'macosx64': {},
'linux-debug': {},
'linux64-debug': {},
'macosx64-debug': {},
@@ -150,17 +149,16 @@ PROJECT_BRANCHES = {
'enable_talos': True,
'talos_suites': {
'xperf': 1,
'tp5o-metro': 1,
'other-metro': 1,
'svgr-metro': 1,
'dromaeojs-metro': 1,
},
- 'blob_upload': True,
'enable_opt_unittests': True,
'mobile_platforms': {
'android-x86': {
'enable_opt_unittests': True,
},
},
},
'cypress': {
@@ -286,17 +284,16 @@ PROJECT_BRANCHES = {
},
},
'pine': {
'mozharness_tag': 'default',
'enable_talos': True,
'talos_suites': {
'xperf': 1,
},
- 'blob_upload': True,
'enable_nightly': False,
'create_snippet': True,
'create_mobile_snippet': True,
'enable_opt_unittests': True,
'enable_l10n': False,
'enable_l10n_onchange': False,
'mobile_platforms': {
'android-x86': {
--- a/mozilla/release-fennec-mozilla-beta.py.template
+++ b/mozilla/release-fennec-mozilla-beta.py.template
@@ -85,17 +85,17 @@ releaseConfig['hgUsername'] = '
releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_dsa'
# Update-specific configuration
releaseConfig['ftpServer'] = 'ftp.mozilla.org'
releaseConfig['stagingServer'] = 'stage.mozilla.org'
releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
releaseConfig['ausUser'] = 'ffxbld'
-releaseConfig['ausSshKey'] = 'auspush'
+releaseConfig['ausSshKey'] = 'ffxbld_dsa'
# Partner repack configuration
releaseConfig['doPartnerRepacks'] = False
releaseConfig['partnersRepoPath'] = 'build/partner-repacks'
releaseConfig['partnerRepackPlatforms'] = ()
# mozconfigs
releaseConfig['mozconfigs'] = {
--- a/mozilla/release-fennec-mozilla-release.py
+++ b/mozilla/release-fennec-mozilla-release.py
@@ -86,17 +86,17 @@ releaseConfig['hgUsername'] = '
releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_dsa'
# Update-specific configuration
releaseConfig['ftpServer'] = 'ftp.mozilla.org'
releaseConfig['stagingServer'] = 'stage.mozilla.org'
releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
releaseConfig['ausUser'] = 'ffxbld'
-releaseConfig['ausSshKey'] = 'auspush'
+releaseConfig['ausSshKey'] = 'ffxbld_dsa'
# Partner repack configuration
releaseConfig['doPartnerRepacks'] = True
releaseConfig['partnersRepoPath'] = 'build/partner-repacks'
releaseConfig['partnerRepackPlatforms'] = ()
releaseConfig['partnerRepackConfig'] = {
'use_mozharness': True,
'platforms': {
--- a/mozilla/release-fennec-mozilla-release.py.template
+++ b/mozilla/release-fennec-mozilla-release.py.template
@@ -86,17 +86,17 @@ releaseConfig['hgUsername'] = '
releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_dsa'
# Update-specific configuration
releaseConfig['ftpServer'] = 'ftp.mozilla.org'
releaseConfig['stagingServer'] = 'stage.mozilla.org'
releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
releaseConfig['ausUser'] = 'ffxbld'
-releaseConfig['ausSshKey'] = 'auspush'
+releaseConfig['ausSshKey'] = 'ffxbld_dsa'
# Partner repack configuration
releaseConfig['doPartnerRepacks'] = True
releaseConfig['partnersRepoPath'] = 'build/partner-repacks'
releaseConfig['partnerRepackPlatforms'] = ()
releaseConfig['partnerRepackConfig'] = {
'use_mozharness': True,
'platforms': {
--- a/mozilla/release-firefox-mozilla-beta.py.template
+++ b/mozilla/release-firefox-mozilla-beta.py.template
@@ -95,17 +95,17 @@ releaseConfig['hgSshKey'] = '
# Update-specific configuration
releaseConfig['patcherConfig'] = 'mozBeta-branch-patcher2.cfg'
releaseConfig['ftpServer'] = 'ftp.mozilla.org'
releaseConfig['stagingServer'] = 'stage.mozilla.org'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
releaseConfig['ausUser'] = 'ffxbld'
-releaseConfig['ausSshKey'] = 'auspush'
+releaseConfig['ausSshKey'] = 'ffxbld_dsa'
releaseConfig['releaseNotesUrl'] = None
releaseConfig['testOlderPartials'] = False
releaseConfig['promptWaitTime'] = {{ promptWaitTime }}
releaseConfig['updateVerifyChunks'] = 6
releaseConfig['verifyConfigs'] = {
'linux': 'mozBeta-firefox-linux.cfg',
'linux64': 'mozBeta-firefox-linux64.cfg',
'macosx64': 'mozBeta-firefox-mac64.cfg',
--- a/mozilla/release-firefox-mozilla-esr24.py
+++ b/mozilla/release-firefox-mozilla-esr24.py
@@ -96,17 +96,17 @@ releaseConfig['hgSshKey'] = '
# Update-specific configuration
releaseConfig['patcherConfig'] = 'mozEsr24-branch-patcher2.cfg'
releaseConfig['ftpServer'] = 'ftp.mozilla.org'
releaseConfig['stagingServer'] = 'stage.mozilla.org'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
releaseConfig['ausUser'] = 'ffxbld'
-releaseConfig['ausSshKey'] = 'auspush'
+releaseConfig['ausSshKey'] = 'ffxbld_dsa'
releaseConfig['releaseNotesUrl'] = None
releaseConfig['testOlderPartials'] = False
releaseConfig['promptWaitTime'] = None
releaseConfig['useBetaChannel'] = 1
releaseConfig['updateVerifyChunks'] = 6
releaseConfig['verifyConfigs'] = {
'linux': 'mozEsr24-firefox-linux.cfg',
'linux64': 'mozEsr24-firefox-linux64.cfg',
--- a/mozilla/release-firefox-mozilla-esr24.py.template
+++ b/mozilla/release-firefox-mozilla-esr24.py.template
@@ -96,17 +96,17 @@ releaseConfig['hgSshKey'] = '
# Update-specific configuration
releaseConfig['patcherConfig'] = 'mozEsr24-branch-patcher2.cfg'
releaseConfig['ftpServer'] = 'ftp.mozilla.org'
releaseConfig['stagingServer'] = 'stage.mozilla.org'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
releaseConfig['ausUser'] = 'ffxbld'
-releaseConfig['ausSshKey'] = 'auspush'
+releaseConfig['ausSshKey'] = 'ffxbld_dsa'
releaseConfig['releaseNotesUrl'] = None
releaseConfig['testOlderPartials'] = False
releaseConfig['promptWaitTime'] = {{ promptWaitTime }}
releaseConfig['useBetaChannel'] = 1
releaseConfig['updateVerifyChunks'] = 6
releaseConfig['verifyConfigs'] = {
'linux': 'mozEsr24-firefox-linux.cfg',
'linux64': 'mozEsr24-firefox-linux64.cfg',
--- a/mozilla/release-firefox-mozilla-release.py
+++ b/mozilla/release-firefox-mozilla-release.py
@@ -107,17 +107,17 @@ releaseConfig['hgSshKey'] = '
# Update-specific configuration
releaseConfig['patcherConfig'] = 'mozRelease-branch-patcher2.cfg'
releaseConfig['ftpServer'] = 'ftp.mozilla.org'
releaseConfig['stagingServer'] = 'stage.mozilla.org'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
releaseConfig['ausUser'] = 'ffxbld'
-releaseConfig['ausSshKey'] = 'auspush'
+releaseConfig['ausSshKey'] = 'ffxbld_dsa'
releaseConfig['releaseNotesUrl'] = None
releaseConfig['testOlderPartials'] = False
releaseConfig['promptWaitTime'] = None
releaseConfig['updateVerifyChunks'] = 6
releaseConfig['verifyConfigs'] = {
'linux': 'mozRelease-firefox-linux.cfg',
'linux64': 'mozRelease-firefox-linux64.cfg',
'macosx64': 'mozRelease-firefox-mac64.cfg',
--- a/mozilla/release-firefox-mozilla-release.py.template
+++ b/mozilla/release-firefox-mozilla-release.py.template
@@ -95,17 +95,17 @@ releaseConfig['hgSshKey'] = '
# Update-specific configuration
releaseConfig['patcherConfig'] = 'mozRelease-branch-patcher2.cfg'
releaseConfig['ftpServer'] = 'ftp.mozilla.org'
releaseConfig['stagingServer'] = 'stage.mozilla.org'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
releaseConfig['ausUser'] = 'ffxbld'
-releaseConfig['ausSshKey'] = 'auspush'
+releaseConfig['ausSshKey'] = 'ffxbld_dsa'
releaseConfig['releaseNotesUrl'] = None
releaseConfig['testOlderPartials'] = False
releaseConfig['promptWaitTime'] = {{ promptWaitTime }}
releaseConfig['updateVerifyChunks'] = 6
releaseConfig['verifyConfigs'] = {
'linux': 'mozRelease-firefox-linux.cfg',
'linux64': 'mozRelease-firefox-linux64.cfg',
'macosx64': 'mozRelease-firefox-mac64.cfg',
--- a/mozilla/release-thunderbird-comm-beta.py
+++ b/mozilla/release-thunderbird-comm-beta.py
@@ -103,17 +103,17 @@ releaseConfig['hgSshKey'] = '
# Update-specific configuration
releaseConfig['patcherConfig'] = 'mozBeta-thunderbird-branch-patcher2.cfg'
releaseConfig['ftpServer'] = 'ftp.mozilla.org'
releaseConfig['stagingServer'] = 'stage.mozilla.org'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
releaseConfig['ausUser'] = 'tbirdbld'
-releaseConfig['ausSshKey'] = 'auspush'
+releaseConfig['ausSshKey'] = 'tbirdbld_dsa'
releaseConfig['releaseNotesUrl'] = 'http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%'
releaseConfig['testOlderPartials'] = False
releaseConfig['promptWaitTime'] = None
releaseConfig['updateVerifyChunks'] = 6
releaseConfig['verifyConfigs'] = {
'linux': 'mozBeta-thunderbird-linux.cfg',
'linux64': 'mozBeta-thunderbird-linux64.cfg',
'macosx64': 'mozBeta-thunderbird-mac64.cfg',
--- a/mozilla/release-thunderbird-comm-beta.py.template
+++ b/mozilla/release-thunderbird-comm-beta.py.template
@@ -103,17 +103,17 @@ releaseConfig['hgSshKey'] = '
# Update-specific configuration
releaseConfig['patcherConfig'] = 'mozBeta-thunderbird-branch-patcher2.cfg'
releaseConfig['ftpServer'] = 'ftp.mozilla.org'
releaseConfig['stagingServer'] = 'stage.mozilla.org'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
releaseConfig['ausUser'] = 'tbirdbld'
-releaseConfig['ausSshKey'] = 'auspush'
+releaseConfig['ausSshKey'] = 'tbirdbld_dsa'
releaseConfig['releaseNotesUrl'] = 'http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%'
releaseConfig['testOlderPartials'] = False
releaseConfig['promptWaitTime'] = {{ promptWaitTime }}
releaseConfig['updateVerifyChunks'] = 6
releaseConfig['verifyConfigs'] = {
'linux': 'mozBeta-thunderbird-linux.cfg',
'linux64': 'mozBeta-thunderbird-linux64.cfg',
'macosx64': 'mozBeta-thunderbird-mac64.cfg',
--- a/mozilla/release-thunderbird-comm-esr24.py
+++ b/mozilla/release-thunderbird-comm-esr24.py
@@ -103,17 +103,17 @@ releaseConfig['hgSshKey'] = '
# Update-specific configuration
releaseConfig['patcherConfig'] = 'mozRelease-thunderbird-branch-patcher2.cfg'
releaseConfig['ftpServer'] = 'ftp.mozilla.org'
releaseConfig['stagingServer'] = 'stage.mozilla.org'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
releaseConfig['ausUser'] = 'tbirdbld'
-releaseConfig['ausSshKey'] = 'auspush'
+releaseConfig['ausSshKey'] = 'tbirdbld_dsa'
releaseConfig['releaseNotesUrl'] = 'http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%'
releaseConfig['testOlderPartials'] = False
releaseConfig['promptWaitTime'] = None
releaseConfig['updateVerifyChunks'] = 6
releaseConfig['verifyConfigs'] = {
'linux': 'mozRelease-thunderbird-linux.cfg',
'linux64': 'mozRelease-thunderbird-linux64.cfg',
'macosx64': 'mozRelease-thunderbird-mac64.cfg',
--- a/mozilla/release-thunderbird-comm-esr24.py.template
+++ b/mozilla/release-thunderbird-comm-esr24.py.template
@@ -103,17 +103,17 @@ releaseConfig['hgSshKey'] = '
# Update-specific configuration
releaseConfig['patcherConfig'] = 'mozRelease-thunderbird-branch-patcher2.cfg'
releaseConfig['ftpServer'] = 'ftp.mozilla.org'
releaseConfig['stagingServer'] = 'stage.mozilla.org'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
releaseConfig['ausUser'] = 'tbirdbld'
-releaseConfig['ausSshKey'] = 'auspush'
+releaseConfig['ausSshKey'] = 'tbirdbld_dsa'
releaseConfig['releaseNotesUrl'] = 'http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%'
releaseConfig['testOlderPartials'] = False
releaseConfig['promptWaitTime'] = {{ promptWaitTime }}
releaseConfig['updateVerifyChunks'] = 6
releaseConfig['verifyConfigs'] = {
'linux': 'mozRelease-thunderbird-linux.cfg',
'linux64': 'mozRelease-thunderbird-linux64.cfg',
'macosx64': 'mozRelease-thunderbird-mac64.cfg',
--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -34,18 +34,17 @@ GLOBAL_VARS = {
'buildbotcustom_repo_path': 'build/buildbotcustom',
'stage_server': 'dev-stage01.srv.releng.scl3.mozilla.com',
'aus2_host': 'dev-stage01.srv.releng.scl3.mozilla.com',
'aus2_user': 'ffxbld',
'aus2_ssh_key': 'ffxbld_dsa',
'download_base_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox',
'mobile_download_base_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/mobile',
'graph_server': 'graphs.allizom.org',
- # XXX: should point at aus4-admin-dev once production is pointing elsewhere
- #'balrog_api_root': 'https://aus4-admin-dev.allizom.org',
+ 'balrog_api_root': 'https://aus4-admin-dev.allizom.org',
'build_tools_repo_path': 'build/tools',
'base_clobber_url': 'http://clobberer-stage.pvt.build.mozilla.org/index.php',
'disable_tinderbox_mail': True,
# List of talos masters to notify of new builds,
# and if a failure to notify the talos master should result in a warning,
# and sendchange retry count before give up
'talos_masters': [
('dev-master01.build.scl1.mozilla.com:9901', True, 1),
@@ -61,16 +60,17 @@ GLOBAL_VARS = {
'l10n_tinderbox_tree': 'MozillaStaging',
'packaged_unittest_tinderbox_tree': 'MozillaTest',
'tinderbox_tree': 'MozillaTest',
'mobile_tinderbox_tree': 'MobileTest',
'hg_username': 'stage-ffxbld',
'base_mirror_urls': ['http://hg-internal.dmz.scl3.mozilla.com'],
'base_bundle_urls': ['http://dev-stage01.build.mozilla.org/pub/mozilla.org/firefox/bundles'],
'tooltool_url_list': ['http://runtime-binaries.pvt.build.mozilla.org/tooltool'],
+ 'blob_upload': True,
}
BUILDS_BEFORE_REBOOT = 5
SYMBOL_SERVER_HOST = 'dev-stage01.srv.releng.scl3.mozilla.com'
# Local branch overrides
BRANCHES = {
'mozilla-central': {
--- a/mozilla/thunderbird_production_config.py
+++ b/mozilla/thunderbird_production_config.py
@@ -42,17 +42,17 @@ GLOBAL_VARS['unittest_masters'] = [
('buildbot-master81.build.mozilla.org:9301', True, 5),
]
GLOBAL_VARS['xulrunner_tinderbox_tree'] = None
GLOBAL_VARS['weekly_tinderbox_tree'] = 'Thunderbird'
GLOBAL_VARS['l10n_tinderbox_tree'] = 'Mozilla-l10n'
GLOBAL_VARS['base_mirror_urls'] = ['http://hg-internal.dmz.scl3.mozilla.com']
GLOBAL_VARS['base_bundle_urls'] = ['http://ftp.mozilla.org/pub/mozilla.org/thunderbird/bundles']
GLOBAL_VARS['aus2_user'] = 'tbirdbld'
-GLOBAL_VARS['aus2_ssh_key'] = 'auspush'
+GLOBAL_VARS['aus2_ssh_key'] = 'tbirdbld_dsa'
GLOBAL_VARS['aus2_host'] = 'aus3-staging.mozilla.org'
# Local branch overrides
BRANCHES = {
'comm-central': {
'packaged_unittest_tinderbox_tree': 'Thunderbird',
'tinderbox_tree': 'Thunderbird',
},