From 422e0d06d2aaa87ed8429b09543faef42cc34d2e Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Fri, 6 Jan 2017 22:04:15 +0100 Subject: [PATCH] Backed out changeset 1f38938f4e9b (bug 1316749) for flake8 lint error. r=backout --- taskcluster/taskgraph/task/docker_image.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/taskcluster/taskgraph/task/docker_image.py b/taskcluster/taskgraph/task/docker_image.py index 495efd1c362c..a388e57b435a 100644 --- a/taskcluster/taskgraph/task/docker_image.py +++ b/taskcluster/taskgraph/task/docker_image.py @@ -19,16 +19,8 @@ from taskgraph.util.templates import Templates logger = logging.getLogger(__name__) GECKO = os.path.realpath(os.path.join(__file__, '..', '..', '..', '..')) - -# if running in a task, prefer to use the taskcluster proxy (http://taskcluster/), -# otherwise hit the services directly -if os.environ.get('TASK_ID'): - ARTIFACT_URL = 'http://taskcluster/queue/v1/task/{}/artifacts/{}' - INDEX_URL = 'http://taskcluster/index/v1/task/{}' -else: - ARTIFACT_URL = 'https://queue.taskcluster.net/v1/task/{}/artifacts/{}' - INDEX_URL = 'https://index.taskcluster.net/v1/task/{}' - +ARTIFACT_URL = 'https://queue.taskcluster.net/v1/task/{}/artifacts/{}' +INDEX_URL = 'https://index.taskcluster.net/v1/task/{}' class DockerImageTask(base.Task):