From a6fbab9c5bde8bff32cba7f6a7acf62d5cddb102 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Fri, 21 Sep 2018 12:45:20 +0200
Subject: [PATCH] =?UTF-8?q?Adapt=20servo/servo-taskcluster-experiments?=
 =?UTF-8?q?=E2=80=99s=20code=20for=20servo/servo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .taskcluster.yml                    | 10 +++++-----
 etc/ci/taskcluster/decision-task.py |  9 ---------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index 1a99a2ad5b6..7cd50c26675 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -5,7 +5,7 @@ policy:
 tasks:
   - $if: 'tasks_for == "github-push"'
     then:
-      $if: 'event.ref == "refs/heads/master"'
+      $if: 'event.ref in ["refs/heads/auto", "refs/heads/try"]'
       then:
         taskGroupId: {$eval: as_slugid("decision_task")}
         taskId: {$eval: as_slugid("decision_task")}
@@ -14,17 +14,17 @@ tasks:
         created: {$fromNow: ''}
         deadline: {$fromNow: '1 day'}
         metadata:
-          name: "Taskcluster experiments for Servo: decision task"
+          name: "Servo: decision task"
           description: ""
           owner: &task_owner ${event.pusher.name}@users.noreply.github.com
           source: &task_source ${event.compare}
         scopes:
           - "queue:scheduler-id:taskcluster-github"
 
-          # Granted to role "repo:github.com/servo/servo-taskcluster-experiments:branch:master"
+          # Granted to role "repo:github.com/servo/servo:branch:*"
           - "queue:create-task:highest:aws-provisioner-v1/servo-*"
+          - "queue:route:index.project.servo.servo.*"
           - "docker-worker:cache:cargo-*"
-          - "queue:route:index.project.servo.servo-taskcluster-experiments.*"
 
         payload:
           maxRunTime: {$eval: '20 * 60'}
@@ -47,4 +47,4 @@ tasks:
               cd repo &&
               git fetch --depth 1 "$GIT_URL" "$GIT_REF" &&
               git reset --hard "$GIT_SHA" &&
-              python3 decision-task.py
+              python3 etc/ci/taskcluster/decision-task.py
diff --git a/etc/ci/taskcluster/decision-task.py b/etc/ci/taskcluster/decision-task.py
index cca8f3a16f5..c3f8549314d 100644
--- a/etc/ci/taskcluster/decision-task.py
+++ b/etc/ci/taskcluster/decision-task.py
@@ -16,15 +16,6 @@ def main():
         worker_type="servo-docker-worker",
     )
 
-    # FIXME: remove this before merging in servo/servo
-    os.environ["GIT_URL"] = "https://github.com/SimonSapin/servo"
-    os.environ["GIT_REF"] = "refs/heads/taskcluster-experiments-20180920"
-    os.environ["GIT_SHA"] = "a6dbfdd29f9b3f0ce0c13adc79fad99538a9a44b"
-    decision.docker_image_cache_expiry = "1 week"
-    decision.route_prefix = "project.servo.servo-taskcluster-experiments"
-    # ~
-
-
     build_artifacts_expiry = "1 week"
     log_artifacts_expiry = "1 year"