Skip to content

Split workflow in several hooks #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Sep 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .taskcluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,9 @@ tasks:
- "git clone --quiet ${repository} &&
cd code-coverage &&
git checkout ${head_rev} &&
sed -i -e 's/CHANNEL/${channel}/g' -e 's/REVISION/${head_rev}/g' bot/taskcluster-hook.json &&
taskboot --target . build-hook bot/taskcluster-hook.json project-relman code-coverage-${channel}"
sed -i -e 's/CHANNEL/${channel}/g' -e 's/REVISION/${head_rev}/g' bot/taskcluster-hook-*.json &&
taskboot --target . build-hook bot/taskcluster-hook-repo.json project-relman code-coverage-repo-${channel} &&
taskboot --target . build-hook bot/taskcluster-hook-cron.json project-relman code-coverage-cron-${channel}"
metadata:
name: "Code Coverage Bot hook update (${channel})"
description: Update Taskcluster hook triggering the code-coverage tasks
Expand Down
1 change: 1 addition & 0 deletions bot/code_coverage_bot/artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ def download_all(self):
[
taskcluster.get_task_details(build_task_id)["taskGroupId"]
for build_task_id in self.task_ids.values()
if build_task_id is not None
]
)
test_tasks = [
Expand Down
24 changes: 8 additions & 16 deletions bot/code_coverage_bot/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,20 @@
import os

from code_coverage_bot import config
from code_coverage_bot.codecov import CodeCov
from code_coverage_bot.secrets import secrets
from code_coverage_bot.taskcluster import taskcluster_config
from code_coverage_tools.log import init_logger


def parse_cli():
def setup_cli(ask_repository=True, ask_revision=True):
"""
Setup CLI options parser
Setup CLI options parser and taskcluster bootstrap
"""
parser = argparse.ArgumentParser(description="Mozilla Code Coverage Bot")
parser.add_argument("--repository", default=os.environ.get("REPOSITORY"))
parser.add_argument("--revision", default=os.environ.get("REVISION"))
if ask_repository:
parser.add_argument("--repository", default=os.environ.get("REPOSITORY"))
if ask_revision:
parser.add_argument("--revision", default=os.environ.get("REVISION"))
parser.add_argument(
"--cache-root", required=True, help="Cache root, used to pull changesets"
)
Expand All @@ -35,11 +36,7 @@ def parse_cli():
)
parser.add_argument("--taskcluster-client-id", help="Taskcluster Client ID")
parser.add_argument("--taskcluster-access-token", help="Taskcluster Access token")
return parser.parse_args()


def main():
args = parse_cli()
args = parser.parse_args()

# Auth on Taskcluster
taskcluster_config.auth(args.taskcluster_client_id, args.taskcluster_access_token)
Expand All @@ -55,9 +52,4 @@ def main():
sentry_dsn=secrets.get("SENTRY_DSN"),
)

c = CodeCov(args.repository, args.revision, args.task_name_filter, args.cache_root)
c.go()


if __name__ == "__main__":
main()
return args
303 changes: 0 additions & 303 deletions bot/code_coverage_bot/codecov.py

This file was deleted.

3 changes: 3 additions & 0 deletions bot/code_coverage_bot/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

PROJECT_NAME = "code-coverage-bot"
HG_BASE = "https://hg.mozilla.org/"
MOZILLA_CENTRAL_REPOSITORY = "{}mozilla-central".format(HG_BASE)
TRY_REPOSITORY = "{}try".format(HG_BASE)
3 changes: 3 additions & 0 deletions bot/code_coverage_bot/hgmo.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ def __init__(self, repo_dir=None, server_address=None):
else:
self.server_address = HGMO.SERVER_ADDRESS
self.repo_dir = repo_dir
logger.info(
"Configured HGMO server", address=self.server_address, dir=self.repo_dir
)
self.pid_file = os.path.join(os.getcwd(), HGMO.PID_FILE)

def __get_pid(self):
Expand Down
Empty file.
Loading