Skip to content

Use official taskcluster config #292

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 4 commits into from
Dec 3, 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
4 changes: 2 additions & 2 deletions backend/code_coverage_backend/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# 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/.
from code_coverage_tools.taskcluster import TaskclusterConfig
from taskcluster.helper import TaskclusterConfig

taskcluster = TaskclusterConfig()
taskcluster = TaskclusterConfig("https://firefox-ci-tc.services.mozilla.com")
2 changes: 1 addition & 1 deletion backend/code_coverage_backend/backend/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def create_app():
taskcluster.auth()
taskcluster.load_secrets(
os.environ.get("TASKCLUSTER_SECRET"),
code_coverage_backend.config.PROJECT_NAME,
prefixes=["common", "backend", "code-coverage-backend"],
required=["GOOGLE_CLOUD_STORAGE", "APP_CHANNEL"],
existing={"REDIS_URL": os.environ.get("REDIS_URL", "redis://localhost:6379")},
)
Expand Down
1 change: 0 additions & 1 deletion bot/code_coverage_bot/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# 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/.

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: 1 addition & 2 deletions bot/code_coverage_bot/secrets.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# 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/.

from code_coverage_bot import config
from code_coverage_bot.taskcluster import taskcluster_config


Expand All @@ -19,7 +18,7 @@ class Secrets(dict):
def load(self, taskcluster_secret):
taskcluster_config.load_secrets(
taskcluster_secret,
config.PROJECT_NAME,
prefixes=["common", "code-coverage-bot"],
required=[
Secrets.APP_CHANNEL,
Secrets.BACKEND_HOST,
Expand Down
4 changes: 2 additions & 2 deletions bot/code_coverage_bot/taskcluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
import requests
import structlog
import taskcluster
from taskcluster.helper import TaskclusterConfig

from code_coverage_bot.utils import retry
from code_coverage_tools.taskcluster import TaskclusterConfig

logger = structlog.getLogger(__name__)
taskcluster_config = TaskclusterConfig()
taskcluster_config = TaskclusterConfig("https://firefox-ci-tc.services.mozilla.com")


def get_task(branch, revision, platform):
Expand Down
117 changes: 0 additions & 117 deletions tools/code_coverage_tools/taskcluster.py

This file was deleted.

2 changes: 1 addition & 1 deletion tools/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
logbook
structlog
taskcluster
taskcluster==24.0.0
Copy link
Collaborator

@marco-c marco-c Dec 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

>=?

raven

# limit async-timeout version to avoid using the alpha 4.0.0a0
Expand Down