Bug 1373647 - Set release ETA for RC builds published to beta r=bhearsum a=release DONTBUILD

MozReview-Commit-ID: 1cxAGNMtCBT

--HG--
extra : rebase_source : bcb2e9cac635ea5a656d9eb5802dcd2982fa4223

testing/mozharness/configs/releases/dev_updates_firefox_release.py

@@ -33,7 +33,8 @@ config = {
             ],
             "channel_names": ["beta-dev", "beta-dev-localtest", "beta-dev-cdntest"],
             "rules_to_update": ["firefox-beta-dev-cdntest", "firefox-beta-dev-localtest"],
-             "publish_rules": ["firefox-beta"],
+            "publish_rules": ["firefox-beta"],
+            "schedule_asap": True,
         },
         "release-dev": {
             "version_regex": r"^\d+\.\d+(\.\d+)?$",

testing/mozharness/configs/releases/updates_firefox_beta.py

@@ -28,7 +28,7 @@ config = {
             "mar_channel_ids": [],
             "channel_names": ["beta", "beta-localtest", "beta-cdntest"],
             "rules_to_update": ["firefox-beta-cdntest", "firefox-beta-localtest"],
-            "publish_rules": ["firefox-beta"],
+            "publish_rules": [32],
         },
     },
     "balrog_use_dummy_suffix": False,

testing/mozharness/configs/releases/updates_firefox_devedition.py

@@ -31,7 +31,7 @@ config = {
             "mar_channel_ids": [],
             "channel_names": ["aurora", "aurora-localtest", "aurora-cdntest"],
             "rules_to_update": ["devedition-cdntest", "devedition-localtest"],
-            "publish_rules": ["devedition"],
+            "publish_rules": [10],
         },
     },
     "balrog_use_dummy_suffix": False,

testing/mozharness/configs/releases/updates_firefox_esr52.py

@@ -28,7 +28,7 @@ config = {
             "mar_channel_ids": [],
             "channel_names": ["esr", "esr-localtest", "esr-cdntest"],
             "rules_to_update": ["esr52-cdntest", "esr52-localtest"],
-            "publish_rules": ["esr52"],
+            "publish_rules": [521],
         },
     },
     "balrog_use_dummy_suffix": False,

testing/mozharness/configs/releases/updates_firefox_release.py

@@ -30,7 +30,8 @@ config = {
             ],
             "channel_names": ["beta", "beta-localtest", "beta-cdntest"],
             "rules_to_update": ["firefox-beta-cdntest", "firefox-beta-localtest"],
-            "publish_rules": ["firefox-beta"],
+            "publish_rules": [32],
+            "schedule_asap": True,
         },
         "release": {
             "version_regex": r"^\d+\.\d+(\.\d+)?$",
@@ -40,7 +41,7 @@ config = {
             "mar_channel_ids": [],
             "channel_names": ["release", "release-localtest", "release-cdntest"],
             "rules_to_update": ["firefox-release-cdntest", "firefox-release-localtest"],
-            "publish_rules": ["firefox-release"],
+            "publish_rules": [145],
         },
     },
     "balrog_use_dummy_suffix": False,

testing/mozharness/scripts/release/publish_balrog.py

@@ -13,6 +13,7 @@ A script publish a release to Balrog.
 
 import os
 import sys
+from datetime import datetime, timedelta
 
 sys.path.insert(1, os.path.dirname(os.path.dirname(sys.path[0])))
 from mozharness.base.vcs.vcsbase import MercurialScript
@@ -74,7 +75,7 @@ class PublishBalrog(MercurialScript, BuildbotMixin):
         :return: list
          """
         return [(n, c) for n, c in self.config["update_channels"].items() if
-            n in self.config["channels"]]
+                n in self.config["channels"]]
 
     def query_repos(self):
         """Build a list of repos to clone."""
@@ -84,7 +85,6 @@ class PublishBalrog(MercurialScript, BuildbotMixin):
         super(PublishBalrog, self).pull(
             repos=self.query_repos())
 
-
     def submit_to_balrog(self):
         for _, channel_config in self.query_channel_configs():
             self._submit_to_balrog(channel_config)
@@ -107,13 +107,21 @@ class PublishBalrog(MercurialScript, BuildbotMixin):
         ])
         for r in channel_config["publish_rules"]:
             cmd.extend(["--rules", r])
-        if self.config.get("schedule_at"):
+        if channel_config.get("schedule_asap"):
+            # RC releases going to the beta channel have no ETA set for the
+            # RC-to-beta push. The corresponding task is scheduled after we
+            # resolve the push-to-beta human decision task, so we can schedule
+            # it ASAP plus some additional 30m to avoid retry() to fail.
+            schedule_at = datetime.utcnow() + timedelta(minutes=30)
+            cmd.extend(["--schedule-at", schedule_at.isoformat()])
+        elif self.config.get("schedule_at"):
             cmd.extend(["--schedule-at", self.config["schedule_at"]])
         if self.config.get("background_rate"):
             cmd.extend(["--background-rate", str(self.config["background_rate"])])
 
         self.retry(lambda: self.run_command(cmd, halt_on_failure=True))
 
+
 # __main__ {{{1
 if __name__ == '__main__':
     PublishBalrog().run_and_exit()