Create a new command to trigger missing revisions to be run in a separate cron hook that runs more frequently (#827)

Fixes #718

Author: marco-c

bot/code_coverage_bot/hooks/cron.py

@@ -7,7 +7,6 @@
 
 from code_coverage_bot import commit_coverage
 from code_coverage_bot import config
-from code_coverage_bot import trigger_missing
 from code_coverage_bot import uploader
 from code_coverage_bot.cli import setup_cli
 from code_coverage_bot.hooks.base import Hook
@@ -34,8 +33,6 @@ def __init__(self, *args, **kwargs):
         super().__init__(config.MOZILLA_CENTRAL_REPOSITORY, revision, *args, **kwargs)
 
     def run(self) -> None:
-        trigger_missing.trigger_missing(config.MOZILLA_CENTRAL_REPOSITORY)
-
         self.retrieve_source_and_artifacts()
 
         commit_coverage.generate(self.repository, self.repo_dir)

bot/code_coverage_bot/hooks/crontrigger.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import structlog
+
+from code_coverage_bot import config
+from code_coverage_bot import trigger_missing
+from code_coverage_bot import uploader
+from code_coverage_bot.cli import setup_cli
+from code_coverage_bot.hooks.base import Hook
+from code_coverage_bot.secrets import secrets
+
+logger = structlog.get_logger(__name__)
+
+
+class CronTriggerHook(Hook):
+    """
+    This function is executed when the bot is triggered via cron.
+    """
+
+    def __init__(self, *args, **kwargs):
+        # Retrieve latest ingested revision
+        try:
+            revision = uploader.gcp_latest("mozilla-central")[0]["revision"]
+        except Exception as e:
+            logger.warn("Failed to retrieve the latest reports ingested: {}".format(e))
+            raise
+
+        super().__init__(config.MOZILLA_CENTRAL_REPOSITORY, revision, *args, **kwargs)
+
+    def run(self) -> None:
+        trigger_missing.trigger_missing(config.MOZILLA_CENTRAL_REPOSITORY)
+
+        # Index the task in the TaskCluster index at the given revision and as "latest".
+        # Given that all tasks have the same rank, the latest task that finishes will
+        # overwrite the "latest" entry.
+        self.index_task(
+            [
+                "project.relman.code-coverage.{}.crontrigger.{}".format(
+                    secrets[secrets.APP_CHANNEL], self.revision
+                ),
+                "project.relman.code-coverage.{}.crontrigger.latest".format(
+                    secrets[secrets.APP_CHANNEL]
+                ),
+            ]
+        )
+
+
+def main() -> None:
+    logger.info("Starting code coverage bot for crontrigger")
+    args = setup_cli(ask_revision=False, ask_repository=False)
+    hook = CronTriggerHook(args.task_name_filter, args.cache_root, args.working_dir)
+    hook.run()

bot/code_coverage_bot/trigger_missing.py

@@ -48,7 +48,7 @@ def trigger_task(task_group_id: str, revision: str) -> None:
 def trigger_missing(server_address: str, out_dir: str = ".") -> None:
     triggered_revisions_path = os.path.join(out_dir, "triggered_revisions.zst")
 
-    url = f"https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.relman.code-coverage.{secrets[secrets.APP_CHANNEL]}.cron.latest/artifacts/public/triggered_revisions.zst"
+    url = f"https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.relman.code-coverage.{secrets[secrets.APP_CHANNEL]}.crontrigger.latest/artifacts/public/triggered_revisions.zst"
     r = requests.head(url, allow_redirects=True)
     if r.status_code != 404:
         utils.download_file(url, triggered_revisions_path)

bot/setup.py

@@ -47,6 +47,7 @@ def read_requirements(file_):
     license="MPL2",
     entry_points={
         "console_scripts": [
+            "code-coverage-crontrigger = code_coverage_bot.hooks.crontrigger:main",
             "code-coverage-cron = code_coverage_bot.hooks.cron:main",
             "code-coverage-repo = code_coverage_bot.hooks.repo:main",
         ]

bot/tests/test_trigger_missing.py

@@ -22,7 +22,7 @@ def test_trigger_from_scratch(
 
     responses.add(
         responses.HEAD,
-        "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.relman.code-coverage.production.cron.latest/artifacts/public/triggered_revisions.zst",
+        "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.relman.code-coverage.production.crontrigger.latest/artifacts/public/triggered_revisions.zst",
         status=404,
     )
 
@@ -233,13 +233,13 @@ def test_trigger_from_preexisting(
 
     responses.add(
         responses.HEAD,
-        "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.relman.code-coverage.production.cron.latest/artifacts/public/triggered_revisions.zst",
+        "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.relman.code-coverage.production.crontrigger.latest/artifacts/public/triggered_revisions.zst",
         status=200,
     )
 
     responses.add(
         responses.GET,
-        "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.relman.code-coverage.production.cron.latest/artifacts/public/triggered_revisions.zst",
+        "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.relman.code-coverage.production.crontrigger.latest/artifacts/public/triggered_revisions.zst",
         status=200,
         body=zstandard.ZstdCompressor().compress(
             f"{revision2}\n{revision3}".encode("ascii")