deleted file mode 100644
--- a/mozilla-tests/b2g_preproduction_config.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from copy import deepcopy
-
-from preproduction_config import GLOBAL_VARS, SLAVES, TRY_SLAVES
-
-GLOBAL_VARS = deepcopy(GLOBAL_VARS)
-
-GLOBAL_VARS['disable_tinderbox_mail'] = True
-GLOBAL_VARS['tinderbox_tree'] = 'MozillaTest'
-GLOBAL_VARS['stage_username'] = 'ffxbld'
-GLOBAL_VARS['stage_ssh_key'] = 'ffxbld_rsa'
-
-BRANCHES = {
- 'try': {
- 'enable_mail_notifier': False, # Set to True when testing
- 'email_override': [], # Set to your address when testing
- 'package_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/b2g/try-builds',
- 'package_dir': '%(who)s-%(got_revision)s',
- 'stage_username': 'trybld',
- 'stage_ssh_key': 'trybld_dsa',
- },
-}
-
-PLATFORM_VARS = {}
-
-PROJECTS = {}
-B2G_PROJECTS = {}deleted file mode 100644
--- a/mozilla-tests/preproduction_config.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from staging_config import SLAVES, TRY_SLAVES
-
-GRAPH_CONFIG = ['--resultsServer', 'graphs.allizom.org',
- '--resultsLink', '/server/collect.cgi']
-
-GLOBAL_VARS = {
- 'disable_tinderbox_mail': True,
- 'tinderbox_tree': 'MozillaTest',
- 'mobile_tinderbox_tree': 'MobileTest',
- 'build_tools_repo_path': 'build/tools',
- 'mozharness_repo': 'https://hg.mozilla.org/build/mozharness',
- 'mozharness_tag': 'production',
- 'stage_server': 'preproduction-stage.srv.releng.scl3.mozilla.com',
- 'stage_username': 'ffxbld',
- 'stage_ssh_key': 'ffxbld_rsa',
- 'datazilla_url': 'https://datazilla.mozilla.org/test',
-}
-
-BRANCHES = {
- 'try': {
- 'enable_mail_notifier': False, # Set to True when testing
- 'email_override': [], # Set to your address when testing
- 'package_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox/try-builds',
- 'package_dir': '%(who)s-%(got_revision)s',
- 'stage_username': 'trybld',
- 'stage_ssh_key': 'trybld_dsa',
- },
-}
-
-PLATFORM_VARS = {
-}
-
-PROJECTS = {
- 'jetpack': {
- 'scripts_repo': 'https://hg.mozilla.org/build/tools',
- 'tinderbox_tree': 'MozillaTest',
- },
-}
-B2G_PROJECTS = {}deleted file mode 100644
--- a/mozilla-tests/preproduction_tests_master_localconfig.py
+++ /dev/null
@@ -1,30 +0,0 @@
-c = BuildmasterConfig = {}
-c['slavePortnum'] = 9012
-
-from buildbot.status.html import WebStatus
-c['status'] = [
- WebStatus(http_port=8012, allowForce=True)
-]
-
-c['buildbotURL'] = 'http://preproduction-master.srv.releng.scl3.mozilla.com:8012/'
-
-from buildbot import manhole
-c['manhole'] = manhole.PasswordManhole("tcp:1236:interface=127.0.0.1", "cltbld", "password")
-
-from config import BRANCHES, PLATFORMS, PROJECTS
-import thunderbird_config
-import b2g_config
-from b2g_config import PROJECTS as B2G_PROJECTS
-import mobile_config
-# Do everything!
-ACTIVE_BRANCHES = BRANCHES.keys()
-ACTIVE_THUNDERBIRD_BRANCHES = thunderbird_config.BRANCHES.keys()
-ACTIVE_B2G_BRANCHES = b2g_config.BRANCHES.keys()
-ACTIVE_MOBILE_BRANCHES = mobile_config.BRANCHES.keys()
-ACTIVE_PLATFORMS = dict((platform, None) for platform in PLATFORMS.keys())
-ACTIVE_THUNDERBIRD_PLATFORMS = dict((platform, None) for platform in thunderbird_config.PLATFORMS.keys())
-ACTIVE_MOBILE_PLATFORMS = dict((platform, None) for platform in mobile_config.PLATFORMS.keys())
-ACTIVE_PROJECTS = PROJECTS.keys()
-ACTIVE_B2G_PROJECTS = B2G_PROJECTS.keys()
-
-QUEUEDIR = "/dev/shm/queue"deleted file mode 100644
--- a/mozilla-tests/preproduction_tests_scheduler_master_localconfig.py
+++ /dev/null
@@ -1,24 +0,0 @@
-c = BuildmasterConfig = {}
-c['slavePortnum'] = 9008 # No slaves should be connecting here
-
-from buildbot import manhole
-c['manhole'] = manhole.PasswordManhole("tcp:1233:interface=127.0.0.1", "cltbld", "password")
-
-from config import BRANCHES, PLATFORMS, PROJECTS
-import thunderbird_config
-import b2g_config
-from b2g_config import PROJECTS as B2G_PROJECTS
-import mobile_config
-# Do everything!
-ACTIVE_BRANCHES = BRANCHES.keys()
-ACTIVE_THUNDERBIRD_BRANCHES = thunderbird_config.BRANCHES.keys()
-ACTIVE_B2G_BRANCHES = b2g_config.BRANCHES.keys()
-ACTIVE_MOBILE_BRANCHES = mobile_config.BRANCHES.keys()
-ACTIVE_PLATFORMS = dict((platform, None) for platform in PLATFORMS.keys())
-ACTIVE_THUNDERBIRD_PLATFORMS = dict((platform, None) for platform in thunderbird_config.PLATFORMS.keys())
-ACTIVE_B2G_PLATFORMS = dict((platform, None) for platform in b2g_config.PLATFORMS.keys())
-ACTIVE_MOBILE_PLATFORMS = dict((platform, None) for platform in mobile_config.PLATFORMS.keys())
-ACTIVE_PROJECTS = PROJECTS.keys()
-ACTIVE_B2G_PROJECTS = B2G_PROJECTS.keys()
-
-QUEUEDIR = "/dev/shm/queue"deleted file mode 100644
--- a/mozilla-tests/thunderbird_preproduction_config.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from copy import deepcopy
-
-from preproduction_config import GLOBAL_VARS, SLAVES, TRY_SLAVES
-
-GLOBAL_VARS = deepcopy(GLOBAL_VARS)
-
-GLOBAL_VARS['disable_tinderbox_mail'] = True
-GLOBAL_VARS['tinderbox_tree'] = 'ThunderbirdTest'
-GLOBAL_VARS['stage_username'] = 'tbirdbld'
-GLOBAL_VARS['stage_ssh_key'] = 'tbirdbld_dsa'
-
-BRANCHES = {
- 'try-comm-central': {
- 'enable_mail_notifier': False, # Set to True when testing
- 'email_override': [], # Set to your address when testing
- 'package_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird/try-builds',
- 'package_dir': '%(who)s-%(got_revision)s',
- 'stage_username': 'tbirdbld',
- 'stage_ssh_key': 'tbirdbld_dsa',
- },
-}
-
-PLATFORM_VARS = {}
-
-PROJECTS = {}
-B2G_PROJECTS = {}--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -2,17 +2,17 @@ from copy import deepcopy
from config import GLOBAL_VARS, PLATFORM_VARS, SLAVES, TRY_SLAVES
import b2g_project_branches
reload(b2g_project_branches)
from b2g_project_branches import PROJECT_BRANCHES, ACTIVE_PROJECT_BRANCHES
# Note that b2g_localconfig.py is symlinked to one of:
-# {production,staging,preproduction}_b2g_config.py
+# {production,staging}_b2g_config.py
import b2g_localconfig
reload(b2g_localconfig)
import master_common
reload(master_common)
from master_common import items_before, setMainFirefoxVersions, items_at_least
GLOBAL_VARS = deepcopy(GLOBAL_VARS)deleted file mode 100644
--- a/mozilla/b2g_preproduction_config.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from copy import deepcopy
-import localconfig
-
-from localconfig import GLOBAL_VARS, BUILDS_BEFORE_REBOOT, \
- SYMBOL_SERVER_HOST
-
-GLOBAL_VARS = deepcopy(localconfig.GLOBAL_VARS)
-
-# Local branch overrides
-BRANCHES = {
- 'try': {
- 'package_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/b2g/try-builds',
- },
-}
-
-PLATFORM_VARS = {}
-
-PROJECTS = {}
-BUILDS_BEFORE_REBOOT = localconfig.BUILDS_BEFORE_REBOOTdeleted file mode 100644
--- a/mozilla/preproduction_builder_master_localconfig.py
+++ /dev/null
@@ -1,26 +0,0 @@
-c = BuildmasterConfig = {}
-c['slavePortnum'] = 9010
-
-from buildbot.status.html import WebStatus
-c['status'] = [
- WebStatus(http_port=8010, allowForce=True)
-]
-
-c['buildbotURL'] = 'http://preproduction-master.srv.releng.scl3.mozilla.com:8010/'
-
-from buildbot import manhole
-c['manhole'] = manhole.PasswordManhole("tcp:1235:interface=127.0.0.1", "cltbld", "password")
-
-from config import BRANCHES, SLAVES, PROJECTS
-from thunderbird_config import BRANCHES as THUNDERBIRD_BRANCHES
-ACTIVE_BRANCHES = BRANCHES.keys()
-ACTIVE_THUNDERBIRD_BRANCHES = THUNDERBIRD_BRANCHES.keys()
-ACTIVE_PROJECTS = [p for p in PROJECTS.keys() if p != 'fuzzing']
-ACTIVE_RELEASE_BRANCHES = []
-ACTIVE_THUNDERBIRD_RELEASE_BRANCHES = []
-ACTIVE_MOBILE_RELEASE_BRANCHES = []
-ACTIVE_B2G_BRANCHES = []
-
-ENABLE_RELEASES = False
-
-QUEUEDIR = "/dev/shm/queue"deleted file mode 100644
--- a/mozilla/preproduction_config.py
+++ /dev/null
@@ -1,151 +0,0 @@
-GLOBAL_VARS = {
- 'staging': True,
- 'config_repo_path': 'build/buildbot-configs',
- 'buildbotcustom_repo_path': 'build/buildbotcustom',
- 'build_tools_repo_path': 'build/tools',
- 'stage_server': 'preproduction-stage.srv.releng.scl3.mozilla.com',
- 'aus2_host': 'preproduction-stage.srv.releng.scl3.mozilla.com',
- 'aus2_user': 'cltbld',
- 'aus2_ssh_key': 'cltbld_dsa',
- 'download_base_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox',
- 'mobile_download_base_url': 'http://preproduction-stage.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',
- 'base_clobber_url': 'http://clobberer-preproduction.pvt.build.mozilla.org/index.php',
- 'pollInterval': 6*60*60,
- 'l10nPollInterval': 6*60*60,
- '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': [
- ('preproduction-master.srv.releng.scl3.mozilla.com:9008', True, 1),
- ],
- # List of unittest masters to notify of new builds to test,
- # if a failure to notify the master should result in a warning,
- # and sendchange retry count before give up
- 'unittest_masters': [
- ('preproduction-master.srv.releng.scl3.mozilla.com:9008', True, 1),
- ],
- 'xulrunner_tinderbox_tree': 'MozillaTest',
- 'weekly_tinderbox_tree': 'MozillaTest',
- 'l10n_tinderbox_tree': 'MozillaStaging',
- 'packaged_unittest_tinderbox_tree': 'MozillaTest',
- 'tinderbox_tree': 'MozillaTest',
- 'mobile_tinderbox_tree': 'MobileTest',
- 'hg_username': 'stage-ffxbld',
- 'base_bundle_urls': ['http://preproduction-master.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox/bundles'],
- 'tooltool_url_list': ['http://tooltool.pvt.build.mozilla.org/build'],
-}
-
-BUILDS_BEFORE_REBOOT = 1
-SYMBOL_SERVER_HOST = 'preproduction-stage.srv.releng.scl3.mozilla.com'
-
-# Local branch overrides
-BRANCHES = {
- 'mozilla-central': {
- 'enable_blocklist_update': False,
- 'enable_hsts_update': False,
- 'enable_hpkp_update': False,
- 'file_update_on_closed_tree': False,
- },
- 'mozilla-release': {
- 'enable_blocklist_update': False,
- 'enable_hsts_update': False,
- 'enable_hpkp_update': False,
- 'file_update_on_closed_tree': False,
- },
- 'mozilla-beta': {
- 'enable_blocklist_update': False,
- 'enable_hsts_update': False,
- 'enable_hpkp_update': False,
- 'file_update_on_closed_tree': False,
- },
- 'mozilla-aurora': {
- 'enable_blocklist_update': False,
- 'enable_hsts_update': False,
- 'enable_hpkp_update': False,
- 'file_update_on_closed_tree': False,
- },
- 'mozilla-b2g30_v1_4': {
- 'enable_blocklist_update': False,
- 'enable_hsts_update': False,
- 'enable_hpkp_update': False,
- 'file_update_on_closed_tree': False,
- },
- 'mozilla-b2g32_v2_0': {
- 'enable_blocklist_update': False,
- 'enable_hsts_update': False,
- 'enable_hpkp_update': False,
- 'file_update_on_closed_tree': False,
- },
- 'mozilla-b2g34_v2_1': {
- 'enable_blocklist_update': False,
- 'enable_hsts_update': False,
- 'enable_hpkp_update': False,
- 'file_update_on_closed_tree': False,
- },
- 'mozilla-b2g34_v2_1s': {
- 'enable_blocklist_update': False,
- 'enable_hsts_update': False,
- 'enable_hpkp_update': False,
- 'file_update_on_closed_tree': False,
- },
- 'try': {
- 'email_override': [], # Set to your address when testing
- 'download_base_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox',
- 'mobile_download_base_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/mobile',
- 'enable_mail_notifier': False,
- 'package_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox/try-builds',
- 'talos_masters': [],
- 'platforms': {
- 'win32': {
- 'env': {
- 'SYMBOL_SERVER_HOST': 'preproduction-stage.srv.releng.scl3.mozilla.com',
- 'MOZ_OBJDIR': 'obj-firefox',
- 'TINDERBOX_OUTPUT': '1',
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- # Source server support, bug 506702
- 'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
- 'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
- 'PATH': "${MOZILLABUILD}python27;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
- },
- },
- }
- }
-}
-
-PLATFORM_VARS = {
-}
-
-PROJECTS = {
- 'fuzzing': {
- 'disable_tinderbox_mail': True,
- 'scripts_repo': 'https://hg.mozilla.org/build/tools',
- 'fuzzing_bundle': 'http://pvtbuilds.pvt.build.mozilla.org/bundles/fuzzing.hg',
- 'fuzzing_repo': 'ssh://stage-ffxbld@hg.mozilla.org/private/fuzzing',
- 'fuzzing_remote_host': 'ffxbld@preproduction-stage.srv.releng.scl3.mozilla.com',
- # Path needs extra leading slash due to optparse expansion on Win32
- 'fuzzing_base_dir': '/pub/mozilla.org/firefox/tinderbox-builds/fuzzing/',
- 'idle_slaves': 0,
- },
-}
-
-BRANCH_PROJECTS = {
- 'spidermonkey_tier_1': {
- 'scripts_repo': 'https://hg.mozilla.org/build/tools',
- 'idle_slaves': 0,
- 'disable_tinderbox_mail': False,
- },
- 'spidermonkey_try': {
- 'scripts_repo': 'https://hg.mozilla.org/build/tools',
- 'idle_slaves': 0,
- 'disable_tinderbox_mail': False,
- },
- 'spidermonkey_info': {
- 'scripts_repo': 'https://hg.mozilla.org/build/tools',
- 'idle_slaves': 0,
- 'disable_tinderbox_mail': False,
- },
-}deleted file mode 100644
--- a/mozilla/preproduction_config_overrides.py
+++ /dev/null
@@ -1,4 +0,0 @@
-GLOBAL_VARS['config_repo_path'] = 'users/prepr-ffxbld/buildbot-configs'
-GLOBAL_VARS['buildbotcustom_repo_path'] = 'users/prepr-ffxbld/buildbotcustom'
-GLOBAL_VARS['compare_locales_repo_path'] = 'users/prepr-ffxbld/compare-locales'
-GLOBAL_VARS['build_tools_repo_path'] = 'users/prepr-ffxbld/tools'
deleted file mode 100644
--- a/mozilla/preproduction_release_master_localconfig.py
+++ /dev/null
@@ -1,24 +0,0 @@
-c = BuildmasterConfig = {}
-c['slavePortnum'] = 9020
-
-from buildbot.status.html import WebStatus
-c['status'] = [
- WebStatus(http_port=8020, allowForce=True)
-]
-
-c['buildbotURL'] = 'http://preproduction-master.srv.releng.scl3.mozilla.com:8020/'
-
-from buildbot import manhole
-c['manhole'] = manhole.PasswordManhole("tcp:1245:interface=127.0.0.1", "cltbld", "password")
-
-from config import BRANCHES, SLAVES, PROJECTS
-ACTIVE_BRANCHES = []
-ACTIVE_PROJECTS = []
-ACTIVE_THUNDERBIRD_BRANCHES = []
-ACTIVE_RELEASE_BRANCHES = ['mozilla-beta']
-ACTIVE_THUNDERBIRD_RELEASE_BRANCHES = ['comm-beta']
-ACTIVE_MOBILE_RELEASE_BRANCHES = ['mozilla-beta']
-
-ENABLE_RELEASES = True
-
-QUEUEDIR = "/dev/shm/queue"deleted file mode 100644
--- a/mozilla/preproduction_release_overrides-beta.py
+++ /dev/null
@@ -1,9 +0,0 @@
-releaseConfig['sourceRepositories']['mozilla']['path'] = 'users/prepr-ffxbld/mozilla-beta'
-releaseConfig['sourceRepositories']['mozilla']['clonePath'] = 'releases/mozilla-beta'
-releaseConfig['l10nRepoClonePath'] = 'releases/l10n/mozilla-beta'
-releaseConfig['otherReposToTag'] = {
- 'users/prepr-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
- 'users/prepr-ffxbld/buildbot': 'production-0.8',
- 'users/prepr-ffxbld/partner-repacks': 'default',
- 'users/prepr-ffxbld/mozharness': 'production',
-}deleted file mode 100644
--- a/mozilla/preproduction_release_overrides-release.py
+++ /dev/null
@@ -1,9 +0,0 @@
-releaseConfig['sourceRepositories']['mozilla']['path'] = 'users/prepr-ffxbld/mozilla-release'
-releaseConfig['sourceRepositories']['mozilla']['clonePath'] = 'releases/mozilla-release'
-releaseConfig['l10nRepoClonePath'] = 'releases/l10n/mozilla-release'
-releaseConfig['otherReposToTag'] = {
- 'users/prepr-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
- 'users/prepr-ffxbld/buildbot': 'production-0.8',
- 'users/prepr-ffxbld/partner-repacks': 'default',
- 'users/prepr-ffxbld/mozharness': 'production',
-}deleted file mode 100644
--- a/mozilla/preproduction_release_overrides.py
+++ /dev/null
@@ -1,13 +0,0 @@
-releaseConfig['AllRecipients'] = ['<release+releasespam@mozilla.com>',]
-releaseConfig['ImportantRecipients'] = ['<release+releasespam@mozilla.com>',]
-releaseConfig['l10nRepoPath'] = 'users/prepr-ffxbld'
-releaseConfig['hgUsername'] = 'prepr-ffxbld'
-releaseConfig['stagingServer'] = 'preproduction-stage.srv.releng.scl3.mozilla.com'
-releaseConfig['ausServerUrl'] = 'http://preproduction-stage.srv.releng.scl3.mozilla.com'
-releaseConfig['partnersRepoPath'] = 'users/prepr-ffxbld/partner-repacks'
-releaseConfig['tuxedoServerUrl'] = 'https://tuxedo.stage.mozilla.com/api/'
-releaseConfig['enable_repo_setup'] = True
-releaseConfig['messagePrefix'] = '[preprod-release] '
-releaseConfig['userRepoRoot'] = 'users/prepr-ffxbld'
-releaseConfig['ftpServer'] = 'preproduction-stage.srv.releng.scl3.mozilla.com'
-releaseConfig['disableBouncerEntries'] = True
deleted file mode 100644
--- a/mozilla/preproduction_scheduler_master_localconfig.py
+++ /dev/null
@@ -1,7 +0,0 @@
-c = BuildmasterConfig = {}
-c['slavePortnum'] = 9009 # No slaves should be connecting here
-
-from buildbot import manhole
-c['manhole'] = manhole.PasswordManhole("tcp:1234:interface=127.0.0.1", "cltbld", "password")
-
-QUEUEDIR = "/dev/shm/queue"--- a/mozilla/test/test_slave_allocation.py
+++ b/mozilla/test/test_slave_allocation.py
@@ -1,20 +1,18 @@
from twisted.trial import unittest
import production_config as prod
-import staging_config as stag
-import preproduction_config as preprod
class SlaveCheck(unittest.TestCase):
def test_prod_vs_try(self):
if hasattr(prod, 'TRY_SLAVES'):
prod_slaves = [x for k, s in prod.SLAVES.iteritems() for x in s]
try_slaves = [x for k, s in prod.TRY_SLAVES.iteritems() for x in s]
common_slaves = set(prod_slaves) & set(try_slaves)
self.assertEqual(
common_slaves, set([]),
- 'Try slaves must not be used in production, however the ' + \
- 'following slaves used for both:\n%s' % \
+ 'Try slaves must not be used in production, however the ' +
+ 'following slaves used for both:\n%s' %
'\n'.join(common_slaves)
)--- a/mozilla/thunderbird_config.py
+++ b/mozilla/thunderbird_config.py
@@ -2,17 +2,17 @@ from copy import deepcopy
from os import uname
from config import GLOBAL_VARS, PLATFORM_VARS
import thunderbird_project_branches
reload(thunderbird_project_branches)
from thunderbird_project_branches import PROJECT_BRANCHES, ACTIVE_PROJECT_BRANCHES
-# Note that thunderbird_localconfig.py is symlinked to one of: {production,staging,preproduction}_thunderbird_config.py
+# Note that thunderbird_localconfig.py is symlinked to one of: {production,staging}_thunderbird_config.py
import thunderbird_localconfig
reload(thunderbird_localconfig)
# Can't reload this one because it gets reloaded in another file
from localconfig import SLAVES, TRY_SLAVES
import master_common
reload(master_common)deleted file mode 100644
--- a/mozilla/thunderbird_preproduction_config.py
+++ /dev/null
@@ -1,84 +0,0 @@
-from localconfig import SLAVES
-
-GLOBAL_VARS = {
- 'staging': True,
- 'config_repo_path': 'build/buildbot-configs',
- 'buildbotcustom_repo_path': 'build/buildbotcustom',
- 'stage_server': 'preproduction-stage.srv.releng.scl3.mozilla.com',
- 'aus2_user': 'cltbld',
- 'aus2_ssh_key': 'cltbld_dsa',
- 'aus2_host': 'preproduction-stage.srv.releng.scl3.mozilla.com',
- 'download_base_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird',
- 'graph_server': 'graphs.allizom.org',
- 'build_tools_repo_path': 'build/tools',
- 'base_clobber_url': 'http://clobberer-preproduction.pvt.build.mozilla.org/index.php',
- 'pollInterval': 6*60*60,
- 'l10nPollInterval': 6*60*60,
- 'disable_tinderbox_mail': True,
- 'talos_masters': [],
- # List of unittest masters to notify of new builds to test,
- # if a failure to notify the master should result in a warning,
- # and sendchange retry count before give up
- 'unittest_masters': [
- ('preproduction-master.srv.releng.scl3.mozilla.com:9008', True, 1),
- ],
- 'xulrunner_tinderbox_tree': 'MozillaTest',
- 'weekly_tinderbox_tree': 'MozillaTest',
- 'l10n_tinderbox_tree': 'MozillaStaging',
- 'packaged_unittest_tinderbox_tree': 'MozillaTest',
- 'tinderbox_tree': 'MozillaTest',
- 'hg_username': 'stage-tbirdbld',
- 'base_bundle_urls': ['http://preproduction-master.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird/bundles'],
-}
-
-BUILDS_BEFORE_REBOOT = 1
-SYMBOL_SERVER_HOST = 'preproduction-stage.srv.releng.scl3.mozilla.com'
-
-# Local branch overrides
-BRANCHES = {
- 'comm-central': {
- 'enable_blocklist_update': False,
- 'file_update_on_closed_tree': False,
- 'download_base_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird',
- },
- 'comm-beta': {
- 'enable_blocklist_update': False,
- 'file_update_on_closed_tree': False,
- },
- 'comm-aurora': {
- 'enable_blocklist_update': False,
- 'file__update_on_closed_tree': False,
- 'download_base_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird',
- },
- 'comm-esr31': {
- 'enable_blocklist_update': False,
- 'file_update_on_closed_tree': False,
- },
- 'try-comm-central': {
- 'download_base_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird/',
- 'enable_mail_notifier': False, # Set to True when testing
- 'email_override': [], # Set to your address when testing
- 'package_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird/try-builds',
- 'talos_masters': [],
- 'platforms': {
- 'win32': {
- 'env': {
- 'SYMBOL_SERVER_HOST': 'preproduction-stage.srv.releng.scl3.mozilla.com',
- 'MOZ_OBJDIR': 'objdir-tb',
- 'TINDERBOX_OUTPUT': '1',
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- # Source server support, bug 506702
- 'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
- 'HG_SHARE_BASE_DIR': 'c:/builds/hg-shared',
- 'PATH': "${MOZILLABUILD}python27;${MOZILLABUILD}buildbotve\\scripts;${PATH}",
- }
- }
- }
- },
-}
-
-PLATFORM_VARS = {
-}
-
-PROJECTS = {
-}deleted file mode 100644
--- a/preproduction-pip.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-coverage==3.4
-pylint==0.23.0
-mercurial==1.8.2
-mock==0.7.0
-nose==1.0.0
-webob==1.2
--- a/setup-master.py
+++ b/setup-master.py
@@ -17,17 +17,18 @@ import logging
try:
import simplejson as json
assert json
except ImportError:
import json
class MasterConfig:
- def __init__(self, name=None, config_dir=None, globs=None, renames=None, local_links=None, extras=None, log=None):
+ def __init__(self, name=None, config_dir=None, globs=None, renames=None,
+ local_links=None, extras=None, log=None):
self.name = name or None
self.config_dir = config_dir
self.globs = globs or []
self.renames = renames or []
self.local_links = local_links or []
self.extras = extras or []
self.log = log or None
@@ -41,17 +42,18 @@ class MasterConfig:
extras=self.extras + o.extras,
)
return retval
def createMaster(self, master_dir, buildbot, logfile=None):
# The following is needed to maintain exisitng behaviour
# of printing stderr of buildbot
if logfile:
- self.log.debug('opening "%s" for buildbot create master stdout and stderr' % logfile)
+ self.log.debug('opening "%s" for buildbot create master stdout '
+ 'and stderr' % logfile)
s_out = open(logfile, 'w+')
s_err = subprocess.STDOUT
else:
s_out = open(os.devnull, 'w+')
s_err = sys.stderr
subprocess.check_call([buildbot, 'create-master', master_dir],
stdout=s_out, stderr=s_err)
s_out.close()
@@ -122,17 +124,18 @@ class MasterConfig:
self.log.info(
'created "%s" master, running checkconfig' % self.name)
except (OSError, subprocess.CalledProcessError):
self.log.error('TEST-FAIL failed to create "%s"' % self.name)
if error_logs:
self.logFile(create_log_filename)
return (300, create_log_filename, None)
rc = subprocess.call([buildbot, 'checkconfig'],
- cwd=test_dir, stdout=test_log, stderr=subprocess.STDOUT)
+ cwd=test_dir, stdout=test_log,
+ stderr=subprocess.STDOUT)
test_log.close()
log = open(test_log_filename)
log_size = os.path.getsize(test_log_filename)
# We expect that the reconfig done message is before the last K of
# output
if log_size > 1024:
log.seek(log_size - 1024)
log_tail = log.readlines()
@@ -140,18 +143,18 @@ class MasterConfig:
self.log.info("TEST-PASS checkconfig OK for %s" % self.name)
shutil.rmtree(test_dir)
os.remove(test_log_filename)
return (0, None, None)
else:
if error_logs:
self.logFile(test_log_filename)
if rc == 0:
- self.log.warn('checkconfig returned 0 for %s but didn\'t print "Config file is good!"' %
- self.name)
+ self.log.warn('checkconfig returned 0 for %s but didn\'t '
+ 'print "Config file is good!"' % self.name)
else:
self.log.error(
"TEST-FAIL %s failed to run checkconfig" % self.name)
self.log.info(
'log for "%s" is "%s"' % (self.name, test_log_filename))
return (rc, test_log_filename, test_dir)
@@ -167,67 +170,58 @@ def load_masters_json(masters_json, role
# Mapping of unique master representatoin to the first master of that
# type
unique_masters = {}
# List of master instances
new_masters = []
for m in masters:
m0 = m.copy()
# Remove unimportant stuff
- for k in ("basedir", "bbcustom_dir", "buildbot_bin", "buildbot_python", "buildbot_setup", "datacentre", "db_name", "hostname", "http_port", "master_dir", "name", "pb_port", "ssh_port", "tools_dir"):
+ for k in ("basedir", "bbcustom_dir", "buildbot_bin",
+ "buildbot_python", "buildbot_setup", "datacentre",
+ "db_name", "hostname", "http_port", "master_dir", "name",
+ "pb_port", "ssh_port", "tools_dir"):
if k in m0:
del m0[k]
k = json.dumps(m0, sort_keys=True)
if k not in unique_masters:
unique_masters[k] = m
new_masters.append(m)
else:
- log.debug("Skipping %s; same as %s" % (m['name'], unique_masters[k]['name']))
+ log.debug("Skipping %s; same as %s", m['name'],
+ unique_masters[k]['name'])
masters = new_masters
retval = []
for m in masters:
# Sometimes we only want masters of a specific role to be loaded
if role and m['role'] != role:
continue
if ignored_roles and m['role'] in ignored_roles:
continue
if m['environment'] == 'production':
environment_config = 'production_config.py'
elif m['environment'] == 'staging':
environment_config = 'staging_config.py'
- elif m['environment'] == 'preproduction':
- environment_config = 'preproduction_config.py'
- c = MasterConfig(name=m['name'],
- globs=[
- 'config.py',
- 'thunderbird_config.py',
- '*_config.py',
- '*_common.py',
- '*_project_branches.py',
- 'project_branches.py',
- 'gecko_versions.json',
- ],
- renames=[
- ('BuildSlaves.py.template', 'BuildSlaves.py'),
- ('passwords.py.template', 'passwords.py'),
- ],
- local_links=[
- (environment_config, 'localconfig.py'),
- ('thunderbird_' +
- environment_config, 'thunderbird_localconfig.py'),
- ('b2g_' + environment_config, 'b2g_localconfig.py'),
- ],
- extras=[
- ('master_config.json', json.dumps(
- m, indent=2, sort_keys=True)),
- ],
- log=log
- )
+ c = MasterConfig(
+ name=m['name'],
+ globs=['config.py', 'thunderbird_config.py', '*_config.py',
+ '*_common.py', '*_project_branches.py',
+ 'project_branches.py', 'gecko_versions.json'],
+ renames=[('BuildSlaves.py.template', 'BuildSlaves.py'),
+ ('passwords.py.template', 'passwords.py')],
+ local_links=[(environment_config, 'localconfig.py'),
+ ('thunderbird_' + environment_config,
+ 'thunderbird_localconfig.py'),
+ ('b2g_' + environment_config, 'b2g_localconfig.py')],
+ extras=[('master_config.json',
+ json.dumps(m, indent=2, sort_keys=True))],
+ log=log
+ )
if universal:
c.name += '-universal'
mastercfg = 'universal_master_sqlite.cfg'
else:
if m['role'] == 'tests':
mastercfg = 'tests_master.cfg'
elif m['role'] == 'build' or m['role'] == 'try':
@@ -295,45 +289,46 @@ def load_masters_json(masters_json, role
c.local_links.append((mastercfg, 'master.cfg'))
c.local_links.append(
('scheduler_localconfig.py', 'master_localconfig.py'))
retval.append(c)
return retval
-def filter_masters(master_list):
- return [m for m in master_list if m != 'preprod-release-master']
-
if __name__ == "__main__":
from optparse import OptionParser
parser = OptionParser(__doc__)
parser.set_defaults(action=None, masters_json=None)
parser.add_option("-l", "--list", action="store_true", dest="list")
parser.add_option("-t", "--test", action="store_true", dest="test")
parser.add_option(
"-8", action="store_true", dest="buildbot08", default=False)
parser.add_option("-b", "--buildbot", dest="buildbot", default="buildbot")
parser.add_option("-j", "--masters-json", dest="masters_json",
- default="https://hg.mozilla.org/build/tools/raw-file/tip/buildfarm/maintenance/production-masters.json")
+ default="https://hg.mozilla.org/build/tools/raw-file/"
+ "default/buildfarm/maintenance/production-masters.json")
parser.add_option("-R", "--role", dest="role", default=None,
- help="Filter by given comma-separated role(s), eg try, build, tests, scheduler")
+ help="Filter by given comma-separated role(s), eg try,"
+ "build, tests, scheduler")
parser.add_option(
"-u", "--universal", dest="universal", action="store_true",
help="Set up a universal master")
parser.add_option("-q", "--quiet", dest="quiet", action="store_true")
parser.add_option(
"-e", "--error-logs", dest="error_logs", action="store_true")
parser.add_option("-d", "--debug", dest="debug", action="store_true")
- parser.add_option("--tested-only", dest="tested_only", action="store_true",
- help="Restrict to the set of masters that would be used with -t")
- parser.add_option("--ignore-role", dest="ignored_roles", action="append", default=[],
- help="Ignore masters with this role. May be passed multiple times.")
+ parser.add_option(
+ "--tested-only", dest="tested_only", action="store_true",
+ help="Restrict to the set of masters that would be used with -t")
+ parser.add_option(
+ "--ignore-role", dest="ignored_roles", action="append", default=[],
+ help="Ignore masters with this role. May be passed multiple times.")
options, args = parser.parse_args()
if options.debug:
loglvl = logging.DEBUG
elif options.quiet:
loglvl = logging.ERROR
else:
@@ -359,33 +354,39 @@ if __name__ == "__main__":
master_list = load_masters_json(options.masters_json, role=options.role,
log=log, universal=options.universal,
dedupe=options.tested_only,
ignored_roles=ignored_roles)
if options.tested_only:
log.debug('adding universal builders because we are testing')
# a universal scheduler master doesn't make any sense
ignored_roles += ['scheduler']
- uni_masters = load_masters_json(options.masters_json, role=options.role, universal=not options.universal, log=log, ignored_roles=ignored_roles)
+ uni_masters = load_masters_json(
+ options.masters_json, role=options.role,
+ universal=not options.universal, log=log,
+ ignored_roles=ignored_roles)
master_list.extend(uni_masters)
# Make sure we don't have duplicate names
master_map = dict((m.name, m) for m in master_list)
assert len(
master_map.values()) == len(master_list), "Duplicate master names"
assert len(master_list) > 0, "No masters specified. Bad role?"
if options.list or options.test:
- masters = filter_masters(master_list)
if len(args) > 0:
wanted = set(args)
- available = set([ m.name for m in masters ])
+ available = set([m.name for m in master_list])
unknown = wanted - available
- assert len(unknown) == 0, "%d unknown masters requested: %s" % (len(unknown), " ".join(unknown))
- masters = [ m for m in masters if m.name in wanted ]
+ assert len(unknown) == 0, \
+ "%d unknown masters requested: %s" % (len(unknown),
+ " ".join(unknown))
+ masters = [m for m in master_list if m.name in wanted]
+ else:
+ masters = master_list
if options.list:
for m in masters:
print m.name
elif options.test:
failing_masters = []
# Test the masters, once normally and onces as a universal master
for m in masters: