Skip to content

Commit

Permalink
Remove esr31
Browse files Browse the repository at this point in the history
  • Loading branch information
@Callek
Callek committed Aug 11, 2015
1 parent f702285 commit 3e381d7
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 22 deletions.
3 changes: 1 addition & 2 deletions buildbot-helpers/mozconfig_whitelist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Other keys in whitelist contain things are in that branches mozconfigs and allowed to be missing from nightly builds.
whitelist = {
'mozilla-release': {},
'mozilla-esr31': {},
'mozilla-esr38': {},
'mozilla-beta': {},
'comm-beta': {},
Expand Down Expand Up @@ -163,7 +162,7 @@ for branch in ('mozilla-release', 'comm-esr31', 'comm-esr38'):
whitelist[branch]['android-x86'] += ['ac_add_options --enable-updater']


for branch in ('mozilla-esr31', 'mozilla-esr38'):
for branch in ('mozilla-esr38', ):
for platform in all_platforms:
whitelist[branch][platform] = [
'ac_add_options --enable-official-branding',
Expand Down
7 changes: 0 additions & 7 deletions buildfarm/maintenance/production-branches.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@
],
"repo_type": "hg"
},
"mozilla-esr31": {
"repo": "https://hg.mozilla.org/releases/mozilla-esr31",
"graph_branches": [
"Mozilla-Esr31"
],
"repo_type": "hg"
},
"mozilla-esr38": {
"repo": "https://hg.mozilla.org/releases/mozilla-esr38",
"graph_branches": [
Expand Down
26 changes: 13 additions & 13 deletions buildfarm/maintenance/production-masters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@
"name": "bm70-build1",
"pb_port": 9001,
"role": "build",
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr31", "mozilla-esr38"],
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr38"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
"thunderbird_release_branches": ["comm-beta", "comm-esr31", "comm-esr38"],
"ssh_port": 7001,
Expand Down Expand Up @@ -796,7 +796,7 @@
"name": "bm71-build1",
"pb_port": 9001,
"role": "build",
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr31", "mozilla-esr38"],
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr38"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
"thunderbird_release_branches": ["comm-beta", "comm-esr31", "comm-esr38"],
"ssh_port": 7001,
Expand Down Expand Up @@ -824,7 +824,7 @@
"name": "bm72-build1",
"pb_port": 9001,
"role": "build",
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr31", "mozilla-esr38"],
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr38"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
"thunderbird_release_branches": ["comm-beta", "comm-esr31", "comm-esr38"],
"ssh_port": 7001,
Expand Down Expand Up @@ -852,7 +852,7 @@
"name": "bm73-build1",
"pb_port": 9001,
"role": "build",
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr31", "mozilla-esr38"],
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr38"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
"thunderbird_release_branches": ["comm-beta", "comm-esr31", "comm-esr38"],
"ssh_port": 7001,
Expand Down Expand Up @@ -880,7 +880,7 @@
"name": "bm74-build1",
"pb_port": 9001,
"role": "build",
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr31", "mozilla-esr38"],
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr38"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
"thunderbird_release_branches": ["comm-beta", "comm-esr31", "comm-esr38"],
"ssh_port": 7001,
Expand Down Expand Up @@ -958,7 +958,7 @@
"name": "bm77-build1",
"pb_port": 9001,
"role": "build",
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr31", "mozilla-esr38"],
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr38"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
"thunderbird_release_branches": ["comm-beta", "comm-esr31", "comm-esr38"],
"ssh_port": 7001,
Expand Down Expand Up @@ -1036,7 +1036,7 @@
"pb_port": 9301,
"role": "scheduler",
"ssh_port": 7301,
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr31", "mozilla-esr38"],
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr38"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
"thunderbird_release_branches": ["comm-beta", "comm-esr31", "comm-esr38"],
"tools_branch": "default",
Expand Down Expand Up @@ -1087,7 +1087,7 @@
"name": "bm82-build1",
"pb_port": 9001,
"role": "build",
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr31", "mozilla-esr38"],
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr38"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
"thunderbird_release_branches": ["comm-beta", "comm-esr31", "comm-esr38"],
"ssh_port": 7001,
Expand Down Expand Up @@ -1140,7 +1140,7 @@
"name": "bm84-build1",
"pb_port": 9001,
"role": "build",
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr31", "mozilla-esr38"],
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr38"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
"thunderbird_release_branches": ["comm-beta", "comm-esr31", "comm-esr38"],
"ssh_port": 7001,
Expand Down Expand Up @@ -1168,7 +1168,7 @@
"name": "bm85-build1",
"pb_port": 9001,
"role": "build",
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr31", "mozilla-esr38"],
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr38"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
"thunderbird_release_branches": ["comm-beta", "comm-esr31", "comm-esr38"],
"ssh_port": 7001,
Expand Down Expand Up @@ -1196,7 +1196,7 @@
"name": "bm86-build1",
"pb_port": 9001,
"role": "build",
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr31", "mozilla-esr38"],
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr38"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
"thunderbird_release_branches": ["comm-beta", "comm-esr31", "comm-esr38"],
"ssh_port": 7001,
Expand Down Expand Up @@ -1281,7 +1281,7 @@
"name": "bm91-build1",
"pb_port": 9001,
"role": "build",
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr31", "mozilla-esr38"],
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr38"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
"thunderbird_release_branches": ["comm-beta", "comm-esr31", "comm-esr38"],
"ssh_port": 7001,
Expand Down Expand Up @@ -1309,7 +1309,7 @@
"name": "bm94-build1",
"pb_port": 9001,
"role": "build",
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr31", "mozilla-esr38"],
"release_branches": ["mozilla-release", "mozilla-beta", "mozilla-esr38"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
"thunderbird_release_branches": ["comm-beta", "comm-esr31", "comm-esr38"],
"ssh_port": 7001,
Expand Down

0 comments on commit 3e381d7

Please sign in to comment.