Bug 1019724 - Update channels for single locale Beta and Release buil…

…ds of Firefox for Android 30 (and beyond) r=rail
mozilla-releng · Oct 28, 2014 · a966757 · a966757
1 parent d2011d0
commit a966757
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/process/release.py b/process/release.py
@@ -1503,7 +1503,7 @@ def getMessageId():
 
     if not releaseConfig.get('disableBouncerEntries'):
         trigger_uptake_factory = BuildFactory()
-        schedulerNames = [builderPrefix('almost-ready-for-release')]
+        schedulerNames = [builderPrefix('almost-ready-for-release_%s' % releaseConfig['productName'])]
         if releaseConfig.get('verifyConfigs'):
             schedulerNames.append(builderPrefix('ready-for-rel-test'))
         trigger_uptake_factory.addStep(Trigger(
@@ -1514,10 +1514,10 @@ def getMessageId():
             },
         ))
         builders.append({
-            'name': builderPrefix('start_uptake_monitoring'),
+            'name': builderPrefix('start_uptake_monitoring_%s' % releaseConfig['productName']),
             'slavenames': all_slaves,
             'category': builderPrefix(''),
-            'builddir': builderPrefix('start_uptake_monitoring'),
+            'builddir': builderPrefix('start_uptake_monitoring_%s' % releaseConfig['productName']),
             'slavebuilddir': normalizeName(builderPrefix('st_uptake'), releaseConfig['productName']),
             'factory': trigger_uptake_factory,
             'env': builder_env,
@@ -1559,7 +1559,7 @@ def getMessageId():
 
     if not releaseConfig.get('disableBouncerEntries'):
         builders.append(makeDummyBuilder(
-            name=builderPrefix('ready_for_releasetest_testing'),
+            name=builderPrefix('ready_for_releasetest_testing_%s' % releaseConfig['productName']),
             slaves=all_slaves,
             category=builderPrefix(''),
             properties={
@@ -1569,10 +1569,10 @@ def getMessageId():
             },
         ))
         important_builders.append(
-            builderPrefix('ready_for_releasetest_testing'))
+            builderPrefix('ready_for_releasetest_testing_%s' % releaseConfig['productName']))
 
         builders.append(makeDummyBuilder(
-            name=builderPrefix('almost_ready_for_release'),
+            name=builderPrefix('almost_ready_for_release_%s' % releaseConfig['productName']),
             slaves=all_slaves,
             category=builderPrefix(''),
             properties={
@@ -1582,7 +1582,7 @@ def getMessageId():
         ))
 
         builders.append(makeDummyBuilder(
-            name=builderPrefix('ready_for_release'),
+            name=builderPrefix('ready_for_release_%s' % releaseConfig['productName']),
             slaves=all_slaves,
             category=builderPrefix(''),
             properties={
@@ -1591,7 +1591,7 @@ def getMessageId():
                 'event_group': 'release',
             },
         ))
-        important_builders.append(builderPrefix('ready_for_release'))
+        important_builders.append(builderPrefix('ready_for_release_%s' % releaseConfig['productName']))
 
     if not releaseConfig.get('disableBouncerEntries'):
         extra_args = ["-c", releaseConfig["bouncer_submitter_config"],
@@ -1612,11 +1612,11 @@ def getMessageId():
         )
 
         builders.append({
-            'name': builderPrefix('bouncer_submitter'),
+            'name': builderPrefix('bouncer_submitter_%s' % releaseConfig['productName'] ),
             'slavenames': branchConfig['platforms']['linux']['slaves'] +
             branchConfig['platforms']['linux64']['slaves'],
             'category': builderPrefix(''),
-            'builddir': builderPrefix('bouncer_submitter'),
+            'builddir': builderPrefix('bouncer_submitter_%s' % releaseConfig['productName']),
             'slavebuilddir': normalizeName(builderPrefix('bncr_sub'), releaseConfig['productName']),
             'factory': bouncer_submitter_factory,
             'env': builder_env,
@@ -1671,7 +1671,7 @@ def getMessageId():
 
     if releaseConfig['buildNumber'] == 1 \
             and not releaseConfig.get('disableBouncerEntries'):
-        tag_downstream.append(builderPrefix('bouncer_submitter'))
+        tag_downstream.append(builderPrefix('bouncer_submitter_%s' % releaseConfig['productName']))
 
     if releaseConfig.get('xulrunnerPlatforms'):
         tag_downstream.append(builderPrefix('xulrunner_source'))
@@ -1732,7 +1732,7 @@ def getMessageId():
         schedulers.append(s)
 
     if not releaseConfig.get('disableBouncerEntries'):
-        readyForReleaseUpstreams = [builderPrefix('almost_ready_for_release')]
+        readyForReleaseUpstreams = [builderPrefix('almost_ready_for_release_%s' % releaseConfig['productName'])]
         if releaseConfig.get('verifyConfigs'):
             readyForReleaseUpstreams += post_update_builders
             finalVerifyBuilders = []
@@ -1745,7 +1745,7 @@ def getMessageId():
                 configRepo=config_repo,
                 minUptake=releaseConfig.get('releasetestUptake', 10000),
                 builderNames=[builderPrefix(
-                    'ready_for_releasetest_testing')] + finalVerifyBuilders,
+                    'ready_for_releasetest_testing_%s' % releaseConfig['productName'])] + finalVerifyBuilders,
                 username=BuildSlaves.tuxedoUsername,
                 password=BuildSlaves.tuxedoPassword)
 
@@ -1758,20 +1758,20 @@ def getMessageId():
         # "ready for release" scheduler to be downstream of both it and the
         # update verify builders to get the behaviour we need.
         schedulers.append(TriggerBouncerCheck(
-            name=builderPrefix('almost-ready-for-release'),
+            name=builderPrefix('almost-ready-for-release_%s' % releaseConfig['productName']),
             configRepo=config_repo,
             minUptake=releaseConfig.get('releaseUptake', 10000),
             checkMARs=not releaseConfig.get('skip_updates', False),
-            builderNames=[builderPrefix('almost_ready_for_release')],
+            builderNames=[builderPrefix('almost_ready_for_release_%s' % releaseConfig['productName'])],
             username=BuildSlaves.tuxedoUsername,
             password=BuildSlaves.tuxedoPassword
         ))
 
         schedulers.append(AggregatingScheduler(
-            name=builderPrefix('ready-for-release'),
+            name=builderPrefix('ready-for-release_%s' % releaseConfig['productName']),
             branch=sourceRepoInfo['path'],
             upstreamBuilders=readyForReleaseUpstreams,
-            builderNames=[builderPrefix('ready_for_release')],
+            builderNames=[builderPrefix('ready_for_release_%s' % releaseConfig['productName'])],
         ))
 
     if releaseConfig.get('enableAutomaticPushToMirrors') and \
@@ -1850,7 +1850,7 @@ def getMessageId():
                 '%s_uptake_check' % releaseConfig['productName']),
             branch=sourceRepoInfo['path'],
             upstreamBuilders=upstream_builders,
-            builderNames=[builderPrefix('start_uptake_monitoring')]
+            builderNames=[builderPrefix('start_uptake_monitoring_%s' % releaseConfig['productName'])]
         ))
 
     # This builder should be come after all AggregatingSchedulers are set