Skip to content
This repository has been archived by the owner on Feb 2, 2019. It is now read-only.

Commit

Permalink
Bug 812509 - kill esr10. r=aki
Browse files Browse the repository at this point in the history
  • Loading branch information
Armen Zambrano Gasparnian committed Feb 20, 2013
1 parent 6a788ae commit 22c597d
Show file tree
Hide file tree
Showing 27 changed files with 16 additions and 1,715 deletions.
48 changes: 7 additions & 41 deletions mozilla-tests/config.py
View file
Expand Up @@ -26,17 +26,6 @@
'mozilla-aurora': {},
'mozilla-release': {},
'mozilla-beta': {},
'mozilla-esr10': {
'datazilla_url': None,
'platforms': {
'macosx': {},
'macosx64': {},
'win32': {},
'linux': {},
'linux64': {},
},
'lock_platforms': True,
},
'mozilla-esr17': {
'datazilla_url': None,
'platforms': {
Expand Down Expand Up @@ -601,27 +590,6 @@ def nested_haskey(dictionary, *keys):
BRANCHES['mozilla-aurora']['repo_path'] = "releases/mozilla-aurora"
BRANCHES['mozilla-aurora']['pgo_strategy'] = 'per-checkin'

######## mozilla-esr10
BRANCHES['mozilla-esr10']['pgo_strategy'] = 'per-checkin'
BRANCHES['mozilla-esr10']['talos_from_source_code'] = False
BRANCHES['mozilla-esr10']['tpn_tests'] = (0, True, TALOS_TP_OPTS, ALL_PLATFORMS)
BRANCHES['mozilla-esr10']['svgr_tests'] = (0, True, TALOS_TP_OPTS, ALL_PLATFORMS)
BRANCHES['mozilla-esr10']['other_tests'] = (0, True, {}, ALL_PLATFORMS)
BRANCHES['mozilla-esr10']['chromez_tests'] = (0, True, {}, ALL_PLATFORMS)
BRANCHES['mozilla-esr10']['tp_tests'] = (1, True, TALOS_TP_OPTS, ALL_PLATFORMS)
BRANCHES['mozilla-esr10']['svg_tests'] = (1, True, TALOS_TP_OPTS, ALL_PLATFORMS)
BRANCHES['mozilla-esr10']['chrome_tests'] = (1, True, {}, NO_MAC)
BRANCHES['mozilla-esr10']['chrome_mac_tests'] = (1, True, {}, MAC_ONLY)
BRANCHES['mozilla-esr10']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
BRANCHES['mozilla-esr10']['dirtypaint_tests'] = (0, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
BRANCHES['mozilla-esr10']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
BRANCHES['mozilla-esr10']['dromaeojs_tests'] = (0, True, {}, ALL_PLATFORMS)
BRANCHES['mozilla-esr10']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
BRANCHES['mozilla-esr10']['release_tests'] = 5
BRANCHES['mozilla-esr10']['repo_path'] = "releases/mozilla-esr10"
del BRANCHES['mozilla-esr10']['platforms']['macosx64']['mountainlion']
BRANCHES['mozilla-esr10']['platforms']['macosx64']['slave_platforms'] = ['leopard', 'snowleopard', 'lion']

######### mozilla-esr17
BRANCHES['mozilla-esr17']['release_tests'] = 1
BRANCHES['mozilla-esr17']['repo_path'] = "releases/mozilla-esr17"
Expand Down Expand Up @@ -763,20 +731,18 @@ def nested_haskey(dictionary, *keys):
# Remove leopard when esr10 goes away
#-------------------------------------------------------------------------
for branch in BRANCHES.keys():
if branch not in ["mozilla-esr10"]:
if 'macosx' in BRANCHES[branch]['platforms']:
del BRANCHES[branch]['platforms']['macosx']
if 'macosx64' in BRANCHES[branch]['platforms']:
del BRANCHES[branch]['platforms']['macosx64']['leopard']
BRANCHES[branch]['platforms']['macosx64']['slave_platforms'] = ['snowleopard', 'lion', 'mountainlion']
if 'macosx' in BRANCHES[branch]['platforms']:
del BRANCHES[branch]['platforms']['macosx']
if 'macosx64' in BRANCHES[branch]['platforms']:
del BRANCHES[branch]['platforms']['macosx64']['leopard']
BRANCHES[branch]['platforms']['macosx64']['slave_platforms'] = ['snowleopard', 'lion', 'mountainlion']
#-------------------------------------------------------------------------
# End disable leopard tests for FF17 onwards
#-------------------------------------------------------------------------

# MERGE DAY NOTE: remove v21 based branches from the list below
NON_UBUNTU_BRANCHES = ("mozilla-aurora", "mozilla-beta", "mozilla-release",
"mozilla-esr10", "mozilla-esr17", "mozilla-b2g18",
"mozilla-b2g18_v1_0_0", "mozilla-b2g18_v1_0_1")
NON_UBUNTU_BRANCHES = ("mozilla-beta", "mozilla-release", "mozilla-esr17",
"mozilla-b2g18", "mozilla-b2g18_v1_0_0", "mozilla-b2g18_v1_0_1")
# Green tests, including mozharness based ones
# Tests listed as Ubuntu tests won't be enabled on Fedora
UBUNTU_OPT_UNITTEST = ["crashtest", "jsreftest", "jetpack", "crashtest-ipc",
Expand Down
12 changes: 0 additions & 12 deletions mozilla-tests/mobile_config.py
View file
Expand Up @@ -40,11 +40,6 @@
'mozilla-aurora': {},
'mozilla-release': {},
'mozilla-beta': {},
'mozilla-esr10': {
'datazilla_url': None,
'platforms': {},
'lock_platforms': True,
},
'mozilla-esr17': {
'datazilla_url': None,
'platforms': {},
Expand Down Expand Up @@ -519,13 +514,6 @@
BRANCHES['mozilla-aurora']['pgo_strategy'] = 'per-checkin'
BRANCHES['mozilla-aurora']['pgo_platforms'] = []

######## mozilla-esr10
BRANCHES['mozilla-esr10']['pgo_strategy'] = 'per-checkin'
BRANCHES['mozilla-esr10']['pgo_platforms'] = []
BRANCHES['mozilla-esr10']['talos_from_source_code'] = False
BRANCHES['mozilla-esr10']['release_tests'] = 1
BRANCHES['mozilla-esr10']['repo_path'] = "releases/mozilla-esr10"

######### mozilla-esr17
BRANCHES['mozilla-esr17']['release_tests'] = 5
BRANCHES['mozilla-esr17']['repo_path'] = "releases/mozilla-esr17"
Expand Down
4 changes: 0 additions & 4 deletions mozilla-tests/production_config.py
View file
Expand Up @@ -56,10 +56,6 @@
'tinderbox_tree': 'Mozilla-Release',
'mobile_tinderbox_tree': 'Mozilla-Release',
},
'mozilla-esr10': {
'tinderbox_tree': 'Mozilla-Esr10',
'mobile_tinderbox_tree': 'Mozilla-Esr10',
},
'mozilla-esr17': {
'tinderbox_tree': 'Mozilla-Esr17',
'mobile_tinderbox_tree': 'Mozilla-Esr17',
Expand Down
6 changes: 0 additions & 6 deletions mozilla-tests/thunderbird_config.py
View file
Expand Up @@ -21,8 +21,6 @@
},
'comm-aurora': {
},
'comm-esr10': {
},
'comm-esr17': {
},
'try-comm-central': {
Expand Down Expand Up @@ -316,10 +314,6 @@
BRANCHES['comm-aurora']['pgo_strategy'] = None
BRANCHES['comm-aurora']['repo_path'] = "releases/comm-aurora"

######## comm-esr10
BRANCHES['comm-esr10']['pgo_strategy'] = None
BRANCHES['comm-esr10']['repo_path'] = "releases/comm-esr10"

######## comm-esr17
BRANCHES['comm-esr17']['pgo_strategy'] = None
BRANCHES['comm-esr17']['repo_path'] = "releases/comm-esr17"
Expand Down
3 changes: 0 additions & 3 deletions mozilla-tests/thunderbird_production_config.py
View file
Expand Up @@ -18,9 +18,6 @@
'comm-release': {
'tinderbox_tree': 'Thunderbird-Release',
},
'comm-esr10': {
'tinderbox_tree': 'Thunderbird-Esr10',
},
'comm-esr17': {
'tinderbox_tree': 'Thunderbird-Esr17',
},
Expand Down
2 changes: 0 additions & 2 deletions mozilla/build_localconfig.py
View file
Expand Up @@ -29,7 +29,6 @@
'mozilla-beta',
'mozilla-aurora',
'mozilla-release',
'mozilla-esr10',
'mozilla-esr17',
'mozilla-b2g18',
'mozilla-b2g18_v1_0_0',
Expand All @@ -43,7 +42,6 @@
'comm-beta',
'comm-aurora',
'comm-release',
'comm-esr10',
'comm-esr17',
]
if 'limit_b2g_branches' in master_config:
Expand Down
167 changes: 4 additions & 163 deletions mozilla/config.py
View file
Expand Up @@ -60,7 +60,6 @@
'linux64-debug': {},
'linux64-asan': {},
'linux64-dbg-asan': {},
'macosx-debug': {},
'macosx64-debug': {},
'win32-debug': {},
'android': {},
Expand Down Expand Up @@ -659,50 +658,6 @@
('/home/cltbld/.hgrc', '/builds/.hgrc'),
],
},
'macosx-debug': {
'enable_nightly': False,
'enable_xulrunner': False,
'enable_leaktests': True,
'product_name': 'firefox',
'app_name': 'browser',
'brand_name': 'Minefield',
'base_name': 'OS X 10.7 32-bit %(branch)s leak test',
'mozconfig': 'macosx/%(branch)s/debug',
'src_mozconfig': 'browser/config/mozconfigs/macosx32/debug',
'profiled_build': False,
'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
'download_symbols': True,
'packageTests': True,
'build_space': 10,
'slaves': SLAVES['macosx64-lion'],
'platform_objdir': OBJDIR,
'stage_product': 'firefox',
'stage_platform': 'macosx-debug',
'enable_shared_checkouts': True,
'enable_ccache': True,
'env': {
'MOZ_OBJDIR': OBJDIR,
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'XPCOM_DEBUG_BREAK': 'stack-and-abort',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'LC_ALL': 'C',
'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
},
'enable_unittests': False,
'enable_checktests': True,
'talos_masters': None,
# These refer to items in passwords.secrets
# nightly_signing_servers defaults to dep-signing because we don't want
# random new branches to accidentally use nightly-signing, which signs
# with valid keys. Any branch that needs to be signed with these keys
# must be overridden explicitly.
'nightly_signing_servers': 'mac-dep-signing',
'dep_signing_servers': 'mac-dep-signing',
'tooltool_manifest_src': 'browser/config/tooltool-manifests/macosx32/releng.manifest',
},
'macosx64-debug': {
'enable_nightly': False,
'enable_xulrunner': False,
Expand Down Expand Up @@ -1115,32 +1070,6 @@
PLATFORM_VARS["macosx64-lion"]["slaves"] = SLAVES['macosx64-lion']
PLATFORM_VARS["macosx64-lion-debug"]["slaves"] = SLAVES['macosx64-lion']

# begin delete WIN32_ENV and WIN32_DEBUG_ENV for esr10 EOL
WIN32_ENV = {
'MOZ_OBJDIR': OBJDIR,
'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
'SYMBOL_SERVER_USER': 'ffxbld',
'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
'SYMBOL_SERVER_SSH_KEY': "/c/Documents and Settings/cltbld/.ssh/ffxbld_dsa",
'TINDERBOX_OUTPUT': '1',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
# Source server support, bug 506702
'PDBSTR_PATH': '/c/Program Files/Debugging Tools for Windows/srcsrv/pdbstr.exe',
'HG_SHARE_BASE_DIR': 'e:/builds/hg-shared',
'BINSCOPE': 'C:\Program Files\Microsoft\SDL BinScope\Binscope.exe',
'PATH': "${MOZILLABUILD}buildbotve\\scripts;${PATH}",
}
WIN32_DEBUG_ENV = {
'MOZ_OBJDIR': OBJDIR,
'XPCOM_DEBUG_BREAK': 'stack-and-abort',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'HG_SHARE_BASE_DIR': 'e:/builds/hg-shared',
'BINSCOPE': 'C:\Program Files\Microsoft\SDL Binscope\Binscope.exe',
'PATH': "${MOZILLABUILD}buildbotve\\scripts;${PATH}",
}
# end delete

PROJECTS = {
'fuzzing': {
'platforms': ['linux', 'linux64', 'macosx64-lion', 'win32'],
Expand Down Expand Up @@ -1232,20 +1161,6 @@
},
'mozilla-aurora': {
},
'mozilla-esr10': {
'lock_platforms': True,
'platforms': {
'linux': {},
'linux64': {},
'win32': {},
'macosx64': {},
'linux-debug': {},
'linux64-debug': {},
'macosx-debug': {},
'macosx64-debug': {},
'win32-debug': {},
},
},
'mozilla-esr17': {
'lock_platforms': True,
'platforms': {
Expand Down Expand Up @@ -1606,73 +1521,6 @@
BRANCHES['mozilla-aurora']['l10n_extra_configure_args']= ['--with-macbundlename-prefix=Firefox']
BRANCHES['mozilla-aurora']['enabled_products'] = ['firefox', 'mobile']

######## mozilla-esr10
BRANCHES['mozilla-esr10']['repo_path'] = 'releases/mozilla-esr10'
BRANCHES['mozilla-esr10']['update_channel'] = 'nightly-esr10'
BRANCHES['mozilla-esr10']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
BRANCHES['mozilla-esr10']['enable_weekly_bundle'] = True
BRANCHES['mozilla-esr10']['start_hour'] = [3]
BRANCHES['mozilla-esr10']['start_minute'] = [45]
BRANCHES['mozilla-esr10']['enable_xulrunner'] = False
BRANCHES['mozilla-esr10']['enable_mac_a11y'] = True
BRANCHES['mozilla-esr10']['pgo_strategy'] = 'per-checkin'
# L10n configuration
BRANCHES['mozilla-esr10']['enable_l10n'] = False
BRANCHES['mozilla-esr10']['enable_l10n_onchange'] = False
BRANCHES['mozilla-esr10']['l10nNightlyUpdate'] = False
BRANCHES['mozilla-esr10']['l10n_platforms'] = ['linux', 'linux64', 'win32',
'macosx64']
BRANCHES['mozilla-esr10']['l10nDatedDirs'] = True
BRANCHES['mozilla-esr10']['l10n_tree'] = 'fxesr10'
BRANCHES['mozilla-esr10']['enable_multi_locale'] = True
BRANCHES['mozilla-esr10']['enUS_binaryURL'] = \
GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-esr10'
BRANCHES['mozilla-esr10']['allLocalesFile'] = 'browser/locales/all-locales'
BRANCHES['mozilla-esr10']['localesURL'] = \
'%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.mozilla-esr10' % (GLOBAL_VARS['hgurl'])
# temp disable nightlies (which includes turning off enable_l10n and l10nNightlyUpdate)
BRANCHES['mozilla-esr10']['enable_nightly'] = True
BRANCHES['mozilla-esr10']['create_snippet'] = True
BRANCHES['mozilla-esr10']['create_partial'] = True
# use mozilla-esr10-test when disabling updates for merges
BRANCHES['mozilla-esr10']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/mozilla-esr10'
BRANCHES['mozilla-esr10']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/mozilla-esr10'
BRANCHES['mozilla-esr10']['enable_blocklist_update'] = True
BRANCHES['mozilla-esr10']['blocklist_update_on_closed_tree'] = False
BRANCHES['mozilla-esr10']['enable_valgrind'] = False
BRANCHES['mozilla-esr10']['upload_mobile_symbols'] = True
BRANCHES['mozilla-esr10']['platforms']['win32']['slaves'] = SLAVES['win32']
BRANCHES['mozilla-esr10']['platforms']['win32']['env'] = WIN32_ENV
BRANCHES['mozilla-esr10']['platforms']['win32-debug']['slaves'] = SLAVES['win32']
BRANCHES['mozilla-esr10']['platforms']['win32-debug']['env'] = WIN32_DEBUG_ENV
BRANCHES['mozilla-esr10']['platforms']['macosx64']['base_name'] = 'OS X 10.6.2 mozilla-esr10'
BRANCHES['mozilla-esr10']['platforms']['macosx64']['slaves'] = SLAVES['macosx64']
BRANCHES['mozilla-esr10']['platforms']['macosx64']['enable_ccache'] = False
BRANCHES['mozilla-esr10']['platforms']['macosx-debug']['base_name'] = 'OS X 10.5.2 mozilla-esr10 leak test'
BRANCHES['mozilla-esr10']['platforms']['macosx-debug']['slaves'] = SLAVES['macosx64']
BRANCHES['mozilla-esr10']['platforms']['macosx-debug']['enable_ccache'] = False
BRANCHES['mozilla-esr10']['platforms']['macosx64-debug']['base_name'] = 'OS X 10.6.2 mozilla-esr10 leak test'
BRANCHES['mozilla-esr10']['platforms']['macosx64-debug']['slaves'] = SLAVES['macosx64']
BRANCHES['mozilla-esr10']['platforms']['macosx64-debug']['enable_ccache'] = False
# mock disabled block start
BRANCHES['mozilla-esr10']['platforms']['linux']['use_mock'] = False
BRANCHES['mozilla-esr10']['platforms']['linux64']['use_mock'] = False
BRANCHES['mozilla-esr10']['platforms']['linux-debug']['use_mock'] = False
BRANCHES['mozilla-esr10']['platforms']['linux64-debug']['use_mock'] = False
BRANCHES['mozilla-esr10']['platforms']['linux']['slaves'] = SLAVES['linux']
BRANCHES['mozilla-esr10']['platforms']['linux64']['slaves'] = SLAVES['linux64']
BRANCHES['mozilla-esr10']['platforms']['linux-debug']['slaves'] = SLAVES['linux']
BRANCHES['mozilla-esr10']['platforms']['linux64-debug']['slaves'] = SLAVES['linux64']
BRANCHES['mozilla-esr10']['platforms']['linux']['env']['PYTHON26'] = '/tools/python-2.6.5/bin/python'
BRANCHES['mozilla-esr10']['platforms']['linux64']['env']['PYTHON26'] = '/tools/python-2.6.5/bin/python'
BRANCHES['mozilla-esr10']['platforms']['linux']['env']['SYMBOL_SERVER_SSH_KEY'] = "/home/cltbld/.ssh/ffxbld_dsa"
BRANCHES['mozilla-esr10']['platforms']['linux64']['env']['SYMBOL_SERVER_SSH_KEY'] = "/home/cltbld/.ssh/ffxbld_dsa"
del BRANCHES['mozilla-esr10']['platforms']['linux']['env']['PATH']
del BRANCHES['mozilla-esr10']['platforms']['linux64']['env']['PATH']
del BRANCHES['mozilla-esr10']['platforms']['linux-debug']['env']['PATH']
del BRANCHES['mozilla-esr10']['platforms']['linux64-debug']['env']['PATH']
# mock disabled block stop

######## mozilla-esr17
BRANCHES['mozilla-esr17']['repo_path'] = 'releases/mozilla-esr17'
BRANCHES['mozilla-esr17']['update_channel'] = 'nightly-esr17'
Expand Down Expand Up @@ -1884,13 +1732,6 @@
# isn't true for try :(
BRANCHES['try']['platforms'][platform]['stage_product'] = 'firefox'

# MERGE day - when FF17 moves into such branch remove it from the list
# MERGE day - when FF17 moves into mozilla-release (and esr10 is gone) remove the whole block
for branch in BRANCHES:
if branch not in ('mozilla-esr10',) and \
'macosx-debug' in BRANCHES[branch]['platforms']:
del BRANCHES[branch]['platforms']['macosx-debug']

######## generic branch configs
for branch in ACTIVE_PROJECT_BRANCHES:
branchConfig = PROJECT_BRANCHES[branch]
Expand Down Expand Up @@ -1993,7 +1834,7 @@

# MERGE DAY
# When Firefox 18 merges into these branches, they can be removed from the list
for b in ('mozilla-esr10', 'mozilla-esr17'):
for b in ('mozilla-esr17',):
# Disable pymake
for p in ('win32', 'win32-debug', 'win64'):
if p not in BRANCHES[b]['platforms']:
Expand All @@ -2017,9 +1858,9 @@
del BRANCHES[b]['platforms'][p]

# MERGE DAY - pulseaudio-libs-devel package rides the trains (bug 662417)
for b in ['mozilla-aurora', 'mozilla-beta', 'mozilla-release', 'mozilla-esr10',
'mozilla-esr17', 'mozilla-b2g18', 'mozilla-b2g18_v1_0_0',
'mozilla-b2g18_v1_0_1'
# MERGE DAY - Remove branches as FF21 reaches them
for b in ['mozilla-beta', 'mozilla-release', 'mozilla-esr17',
'mozilla-b2g18', 'mozilla-b2g18_v1_0_0', 'mozilla-b2g18_v1_0_1'
]:
for p, pc in BRANCHES[b]['platforms'].items():
if 'mock_packages' in pc:
Expand Down

0 comments on commit 22c597d

Please sign in to comment.