Merge default -> production production
authorJustin Wood <Callek@gmail.com>
Thu, 10 May 2018 15:49:40 -0400
branchproduction
changeset 15767 1b2b6aef99a74890a16f18e084ade7abc602c1d9
parent 15765 02f495073bd079b38f914b9e056b0c3214b8cd8a (current diff)
parent 15766 ea30fb096227496bca2a8b5d9d6d6c5040e3f951 (diff)
child 15769 4dcae2d97474326f52058ff0c4d0ad71088db7cf
push id11066
push userCallek@gmail.com
push dateThu, 10 May 2018 19:50:38 +0000
Merge default -> production
--- a/mozilla/gecko_versions.json
+++ b/mozilla/gecko_versions.json
@@ -1,6 +1,6 @@
 {
-    "mozilla-release": 59,
-    "mozilla-beta": 60,
-    "mozilla-central": 60,
-    "comm-beta": 59
+    "mozilla-release": 60,
+    "mozilla-beta": 61,
+    "mozilla-central": 62,
+    "comm-beta": 61
 }
--- a/mozilla/scheduler_master.cfg
+++ b/mozilla/scheduler_master.cfg
@@ -106,18 +106,61 @@ for branch in ACTIVE_BRANCHES:
             else:
                 assert len(set(pre) - set(post)) == 0
 
         if not s.builderNames:
             # This scheduler has no builders left and should be removed
             branchObjects['schedulers'].remove(s)
     buildObjects = mergeBuildObjects(buildObjects, branchObjects)
 
+# get list of branches to disable buildbot builds for
+# Bug 1459831 - Switch off buildbot builds on comm-beta
+disable_tb_sched = []
+for name, branch in items_at_least(BRANCHES, 'gecko_version', 61):
+    if name != "try":
+        disable_tb_sched.append(name)
 for branch in ACTIVE_THUNDERBIRD_BRANCHES:
     branchObjects = generateBranchObjects(THUNDERBIRD_BRANCHES[branch], branch)
+
+    for s in branchObjects.get('schedulers', [])[:]:
+        # builder names to be deleted
+        if not s.builderNames:
+            continue
+
+        bnames = []
+        if branch in disable_tb_sched:
+            bnames.extend([
+                'TB Linux x86-64 ' + branch + ' periodic file update',
+                'TB Linux ' + branch + ' build',
+                'TB Linux ' + branch + ' leak test build',
+                'TB Linux x86-64' + branch + ' build',
+                'TB Linux x86-64' + branch + ' leak test build',
+                'TB OS X 10.7 ' + branch + " build",
+                'TB WINNT 5.2 ' + branch + " build",
+                'TB WINNT 5.2 ' + branch + " leak test build",
+                'TB WINNT 5.2 ' + branch + " pgo-build",
+                'TB WINNT 6.1 x86-64 ' + branch + " build",
+                'TB WINNT 6.1 x86-64 ' + branch + " pgo-build",
+                'TB WINNT 6.1 x86-64 ' + branch + " leak test build",
+            ])
+        for bname in bnames:
+            pre = s.builderNames
+            s.builderNames = [b for b in s.builderNames if builder_filter(bname, b)]
+            post = s.builderNames
+            # builder name to be deleted
+            if bname in set(pre) - set(post):
+                assert len(set(pre) - set(post)) == 1
+            # schedulers did not include builder name to be deleted
+            else:
+                assert len(set(pre) - set(post)) == 0
+
+        if not s.builderNames:
+            # This scheduler has no builders left and should be removed
+            branchObjects['schedulers'].remove(s)
+
     # Strip away any duplicate change sources
     usefulChangeSources = []
     for cs in branchObjects['change_source']:
         if cs.branch not in [x.branch for x in buildObjects['change_source'] + usefulChangeSources]:
             usefulChangeSources.append(cs)
     branchObjects['change_source'] = usefulChangeSources
     buildObjects = mergeBuildObjects(buildObjects, branchObjects)