Skip to content

Commit 45ea3a2

Browse files
committed
bot: Use hg.mozilla.org instead of local instance of hgmo as we can't rely on if for push data
1 parent 80ab1c7 commit 45ea3a2

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

bot/code_coverage_bot/hooks/cron.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# License, v. 2.0. If a copy of the MPL was not distributed with this
44
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
55

6-
76
import structlog
87

98
from code_coverage_bot import commit_coverage
@@ -35,9 +34,9 @@ def __init__(self, *args, **kwargs):
3534
super().__init__(config.MOZILLA_CENTRAL_REPOSITORY, revision, *args, **kwargs)
3635

3736
def run(self) -> None:
38-
self.retrieve_source_and_artifacts()
37+
trigger_missing.trigger_missing(config.MOZILLA_CENTRAL_REPOSITORY)
3938

40-
trigger_missing.trigger_missing(self.repo_dir)
39+
self.retrieve_source_and_artifacts()
4140

4241
commit_coverage.generate(self.repo_dir)
4342

bot/code_coverage_bot/trigger_missing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def trigger_task(task_group_id: str, revision: str) -> None:
4242
)
4343

4444

45-
def trigger_missing(repo_dir: str, out_dir: str = ".") -> None:
45+
def trigger_missing(server_address: str, out_dir: str = ".") -> None:
4646
triggered_revisions_path = os.path.join(out_dir, "triggered_revisions.zst")
4747

4848
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" # noqa
@@ -62,7 +62,7 @@ def trigger_missing(repo_dir: str, out_dir: str = ".") -> None:
6262
# Get all mozilla-central revisions from the past year.
6363
days = 365 if secrets[secrets.APP_CHANNEL] == "production" else 30
6464
a_year_ago = datetime.utcnow() - timedelta(days=days)
65-
with hgmo.HGMO(repo_dir=repo_dir) as hgmo_server:
65+
with hgmo.HGMO(server_address=server_address) as hgmo_server:
6666
data = hgmo_server.get_pushes(
6767
startDate=a_year_ago.strftime("%Y-%m-%d"), full=False, tipsonly=True
6868
)

bot/tests/test_trigger_missing.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import responses
66
import zstandard
77

8+
from code_coverage_bot import hgmo
89
from code_coverage_bot import taskcluster
910
from code_coverage_bot import trigger_missing
1011
from code_coverage_bot import uploader
@@ -187,7 +188,8 @@ def get_tasks_in_group(group_id):
187188

188189
monkeypatch.setattr(taskcluster, "get_tasks_in_group", get_tasks_in_group)
189190

190-
trigger_missing.trigger_missing(local, out_dir=tmp_path)
191+
with hgmo.HGMO(repo_dir=local) as hgmo_server:
192+
trigger_missing.trigger_missing(hgmo_server.server_address, out_dir=tmp_path)
191193

192194
assert gcp_covdir_exists_calls == 4
193195
assert trigger_hook_calls == 2
@@ -335,7 +337,8 @@ def get_tasks_in_group(group_id):
335337

336338
monkeypatch.setattr(taskcluster, "get_tasks_in_group", get_tasks_in_group)
337339

338-
trigger_missing.trigger_missing(local, out_dir=tmp_path)
340+
with hgmo.HGMO(repo_dir=local) as hgmo_server:
341+
trigger_missing.trigger_missing(hgmo_server.server_address, out_dir=tmp_path)
339342

340343
assert gcp_covdir_exists_calls == 1
341344
assert trigger_hook_calls == 1

0 commit comments

Comments
 (0)