From ad54655f274424fd9963863bd7b963da9a33c3e5 Mon Sep 17 00:00:00 2001
From: Justin Wood <Callek@gmail.com>
Date: Mon, 21 Mar 2016 17:41:43 -0400
Subject: [PATCH] Bug 1240184 - run mozharness tests in the gecko task graph.
 r=dustin

--HG--
extra : rebase_source : e86d1003e6a92afb8e6a94d8d6dc46f23b7d3327
---
 .../taskcluster/tasks/branches/base_jobs.yml  |  6 +++
 testing/taskcluster/tasks/lint.yml            |  4 +-
 .../taskcluster/tasks/tests/eslint-gecko.yml  |  4 ++
 .../tasks/tests/mozharness-gecko.yml          | 47 +++++++++++++++++++
 4 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 testing/taskcluster/tasks/tests/mozharness-gecko.yml

diff --git a/testing/taskcluster/tasks/branches/base_jobs.yml b/testing/taskcluster/tasks/branches/base_jobs.yml
index a81c4f1b4304..178e58c7c8e4 100644
--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -362,3 +362,9 @@ tasks:
       file_patterns:
         - 'testing/docker/android-gradle-build/**'
         - '**/*.gradle'
+  mozharness:
+    task: tasks/tests/mozharness-gecko.yml
+    root: true
+    when:
+      file_patterns:
+        - 'testing/mozharness/**'
diff --git a/testing/taskcluster/tasks/lint.yml b/testing/taskcluster/tasks/lint.yml
index e03c3ba400ab..decdbd18322d 100644
--- a/testing/taskcluster/tasks/lint.yml
+++ b/testing/taskcluster/tasks/lint.yml
@@ -34,7 +34,7 @@ task:
 
   extra:
     build_product: '{{build_product}}'
-    build_name: eslint-gecko
-    build_type: opt
+    build_name: {{build_name}}
+    build_type: {{build_type}}
     index:
       rank: {{pushlog_id}}
diff --git a/testing/taskcluster/tasks/tests/eslint-gecko.yml b/testing/taskcluster/tasks/tests/eslint-gecko.yml
index 015e20e09b65..5cfd815f5c9b 100644
--- a/testing/taskcluster/tasks/tests/eslint-gecko.yml
+++ b/testing/taskcluster/tasks/tests/eslint-gecko.yml
@@ -1,6 +1,10 @@
 ---
 $inherits:
     from: 'tasks/lint.yml'
+    variables:
+      build_product: 'lint'
+      build_name: 'eslint-gecko'
+      build_type: 'opt'
 
 task:
   metadata:
diff --git a/testing/taskcluster/tasks/tests/mozharness-gecko.yml b/testing/taskcluster/tasks/tests/mozharness-gecko.yml
new file mode 100644
index 000000000000..6fd7dc43cdcc
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/mozharness-gecko.yml
@@ -0,0 +1,47 @@
+---
+$inherits:
+    from: 'tasks/lint.yml'
+    variables:
+      build_product: 'lint'
+      build_name: 'mozharness-tox'
+      build_type: 'opt'
+
+task:
+  metadata:
+    name: '[TC] - Mozharness Tox'
+    description: 'Mozharness integration tests'
+
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-dotcache'
+
+  payload:
+    image:
+      type: 'task-image'
+      path: 'public/image.tar'
+      taskId: '{{#task_id_for_image}}desktop-test{{/task_id_for_image}}'
+
+    cache:
+      level-{{level}}-{{project}}-dotcache: '/home/worker/.cache'
+
+    command:
+      - bash
+      - -cx
+      - >
+          tc-vcs checkout ./gecko {{base_repository}} {{head_repository}} {{head_rev}} {{head_ref}} &&
+          cd gecko/testing/mozharness &&
+          pip install tox &&
+          tox -e py27-hg2.6 -e py27-hg3.2
+  extra:
+    extra:
+        build_product: '{{build_product}}'
+    locations:
+        build: null
+        tests: null
+    treeherder:
+        machine:
+            platform: lint
+        groupSymbol: tc
+        symbol: MH
+    treeherderEnv:
+        - production
+        - staging