Bug 1281004: only set MOZ_NODE_PATH for desktop; r=gbrown draft
authorDustin J. Mitchell <dustin@mozilla.com>
Wed, 06 Jul 2016 22:14:52 +0000
changeset 389204 8190d2f6f2368acd1c9c11a3e16062e4589a23ac
parent 389203 08bd1896b08596b30a5fe8d735add194fa724fea
child 389205 03e70902c2d3a297eb9e3ce852f8737c2550d5a6
push id23312
push userdmitchell@mozilla.com
push dateMon, 18 Jul 2016 17:58:50 +0000
reviewersgbrown
bugs1281004
milestone50.0a1
Bug 1281004: only set MOZ_NODE_PATH for desktop; r=gbrown MOZ_NODE_PATH should not be set for Android tests. Rather than setting it to the literal "None", this omits the environment variable on that platform. Only `fx_docker_desktop_generic.yml` (and now `fx_docker_android_generic.yml`) inherit from `fx_docker_test_base.yml`. And `fx_android-api-15_generic.yml` is the only Android-related YAML file to inherit from `fx_docker_desktop_generic.yml`. MozReview-Commit-ID: 7BhGXk9c8ir
taskcluster/ci/legacy/tasks/tests/fx_android-api-15_generic.yml
taskcluster/ci/legacy/tasks/tests/fx_docker_android_generic.yml
taskcluster/ci/legacy/tasks/tests/fx_docker_desktop_generic.yml
taskcluster/ci/legacy/tasks/tests/fx_docker_test_base.yml
--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_generic.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_generic.yml
@@ -1,11 +1,11 @@
 ---
 $inherits:
-  from: 'tasks/tests/fx_docker_desktop_generic.yml'
+  from: 'tasks/tests/fx_docker_android_generic.yml'
 task:
   payload:
     cache:
       tooltool-cache: '/home/worker/tooltool-cache'
     capabilities:
       devices:
         loopbackVideo: true
     command:
@@ -14,17 +14,16 @@ task:
       - {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
     env:
         MOZHARNESS_SCRIPT: 'mozharness/scripts/android_emulator_unittest.py'
         MOZHARNESS_CONFIG: >
           mozharness/configs/android/androidarm_4_3.py
           mozharness/configs/remove_executables.py
           mozharness/configs/android/androidarm_4_3-tc.py
         MOZHARNESS_ACTIONS: 'get-secrets'
-        MOZ_NODE_PATH: None
     features:
       relengAPIProxy: true
   scopes:
     - 'docker-worker:capability:device:loopbackVideo'
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.internal'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
   extra:
new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/legacy/tasks/tests/fx_docker_android_generic.yml
@@ -0,0 +1,10 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_docker_test_base.yml'
+task:
+  payload:
+    # do not set MOZ_NODE_PATH here as it causes tests which do not pass to run
+    command:
+      - bash
+      - /home/worker/bin/test.sh
+
--- a/taskcluster/ci/legacy/tasks/tests/fx_docker_desktop_generic.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_docker_desktop_generic.yml
@@ -1,8 +1,10 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_docker_test_base.yml'
 task:
   payload:
+    env:
+        MOZ_NODE_PATH: '/usr/local/bin/node'
     command:
       - bash
       - /home/worker/bin/test.sh
--- a/taskcluster/ci/legacy/tasks/tests/fx_docker_test_base.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_docker_test_base.yml
@@ -13,17 +13,16 @@ task:
       taskId:
         task-reference: "<docker-image>"
 
     env:
         NEED_WINDOW_MANAGER: true
         NEED_PULSEAUDIO: true
         GECKO_HEAD_REPOSITORY: '{{{head_repository}}}'
         GECKO_HEAD_REV: '{{{head_rev}}}'
-        MOZ_NODE_PATH: '/usr/local/bin/node'
 
     cache:
       # put the workspace and /tmp on a cache, less for inter-task caching than
       # to get this directory on fast, non-aufs storage
       level-{{level}}-{{project}}-test-workspace: '/home/worker/workspace'
 
     artifacts:
       'public/test':