Bug 1218452 - Remove the spark distro from the Aries Engineering builds. r=wcosta
authorNaoki Hirata <nhirata@mozilla.com>
Thu, 05 Nov 2015 17:43:54 -0800
changeset 271824 661a1b6450a0d869f49758cbc9f53f5d7881590e
parent 271823 d653788ecddbfebaee9016a3a6d0e05a24869816
child 271825 9b2c15970aa07cc7d38b03e6106c71372624862b
push id18579
push usercbook@mozilla.com
push dateTue, 10 Nov 2015 10:08:12 +0000
treeherderb2g-inbound@9b2c15970aa0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswcosta
bugs1218452
milestone45.0a1
Bug 1218452 - Remove the spark distro from the Aries Engineering builds. r=wcosta
testing/mozharness/configs/b2g/taskcluster-phone-eng.py
testing/taskcluster/tasks/branches/base_jobs.yml
testing/taskcluster/tasks/builds/b2g_aries_eng.yml
testing/taskcluster/tasks/builds/b2g_aries_spark_eng.yml
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/b2g/taskcluster-phone-eng.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+config = {
+    "default_vcs": "tc-vcs",
+    "default_actions": [
+        'checkout-sources',
+        'build',
+        'build-symbols',
+        'prep-upload'
+    ],
+    "upload": {
+        "default": {
+            "upload_dep_target_exclusions": []
+        }
+    },
+    "env": {
+        "GAIA_OPTIMIZE": "1",
+        "WGET_OPTS": "-c -q",
+        "B2G_PATH": "%(work_dir)s",
+        "BOWER_FLAGS": "--allow-root",
+        "WGET_OPTS": "-c -q",
+    },
+    "is_automation": True,
+    "repo_remote_mappings": {
+        'https://android.googlesource.com/': 'https://git.mozilla.org/external/aosp',
+        'git://codeaurora.org/': 'https://git.mozilla.org/external/caf',
+        'https://git.mozilla.org/b2g': 'https://git.mozilla.org/b2g',
+        'git://github.com/mozilla-b2g/': 'https://git.mozilla.org/b2g',
+        'git://github.com/mozilla/': 'https://git.mozilla.org/b2g',
+        'https://git.mozilla.org/releases': 'https://git.mozilla.org/releases',
+        'http://android.git.linaro.org/git-ro/': 'https://git.mozilla.org/external/linaro',
+        'git://github.com/apitrace/': 'https://git.mozilla.org/external/apitrace',
+    },
+}
--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -68,17 +68,17 @@ builds:
         task: tasks/builds/b2g_aries_spark_opt.yml
       debug:
         task: tasks/builds/b2g_aries_spark_debug.yml
   aries-eng:
     platforms:
       - b2g
     types:
       opt:
-        task: tasks/builds/b2g_aries_spark_eng.yml
+        task: tasks/builds/b2g_aries_eng.yml
   flame-kk:
     platforms:
       - b2g
     types:
       opt:
         task: tasks/builds/b2g_flame_kk_opt.yml
       debug:
         task: tasks/builds/b2g_flame_kk_debug.yml
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/b2g_aries_eng.yml
@@ -0,0 +1,31 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_eng_base.yml'
+  variables:
+    build_name: 'aries-eng'
+    build_type: 'opt'
+task:
+  scopes:
+    - 'docker-worker:cache:build-aries-eng'
+    - 'docker-worker:cache:build-aries-eng-objdir-gecko-{{project}}'
+  metadata:
+    name: '[TC] B2G Aries Eng'
+
+  payload:
+    cache:
+      build-aries-eng: /home/worker/workspace
+      build-aries-eng-objdir-gecko-{{project}}: /home/worker/objdir-gecko
+    env:
+      TARGET: 'aries'
+      MOZHARNESS_CONFIG: b2g/taskcluster-phone-eng.py
+  extra:
+    treeherderEnv:
+      - production
+      - staging
+    treeherder:
+      symbol: Be
+      groupSymbol: Aries
+      groupName: Aries Device Image
+      machine:
+        platform: b2g-device-image
+    locations:
+      img: 'private/build/aries.zip'
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_eng.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_eng_base.yml'
-  variables:
-    build_name: 'aries-eng'
-    build_type: 'opt'
-task:
-  scopes:
-    - 'docker-worker:cache:build-aries-eng'
-    - 'docker-worker:cache:build-aries-eng-objdir-gecko-{{project}}'
-  metadata:
-    name: '[TC] B2G Aries Eng'
-
-  payload:
-    cache:
-      build-aries-eng: /home/worker/workspace
-      build-aries-eng-objdir-gecko-{{project}}: /home/worker/objdir-gecko
-    env:
-      TARGET: 'aries'
-      MOZHARNESS_CONFIG: b2g/taskcluster-spark.py
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      symbol: Be
-      groupSymbol: Aries
-      groupName: Aries Device Image
-      machine:
-        platform: b2g-device-image
-    locations:
-      img: 'private/build/aries.zip'