Bug 1245398 - Use in-tree script for all mulet tests; r=ahal

MozReview-Commit-ID: AntB37HzGXa --HG-- extra : rebase_source : 7641dd1e69dd027a96a15645cc0f4df92ac7ea44
2016-02-10 18:12:02 +08:00 · 2016-02-10 18:12:02 +08:00 · c463c026b9
--- a/testing/taskcluster/scripts/tester/test-mulet.sh
+++ b/testing/taskcluster/scripts/tester/test-mulet.sh
@ -15,6 +15,7 @@ echo "running as" $(id)
 : MOZHARNESS_CONFIG             ${MOZHARNESS_CONFIG}
 : NEED_XVFB                     ${NEED_XVFB:=true}
 : NEED_PULSEAUDIO               ${NEED_PULSEAUDIO:=false}
+: NEED_PULL_GAIA                ${NEED_PULL_GAIA:=false}
 : SKIP_MOZHARNESS_RUN           ${SKIP_MOZHARNESS_RUN:=false}
 : WORKSPACE                     ${WORKSPACE:=/home/worker/workspace}
 : mozharness args               "${@}"
@ -79,6 +80,24 @@ if $NEED_XVFB; then
    if [ $xvfb_test == 255 ]; then exit 255; fi
 fi

+gaia_cmds=""
+if $NEED_PULL_GAIA; then
+    # test required parameters are supplied
+    if [[ -z ${GAIA_BASE_REPOSITORY} ]]; then exit 1; fi
+    if [[ -z ${GAIA_HEAD_REPOSITORY} ]]; then exit 1; fi
+    if [[ -z ${GAIA_REV} ]]; then exit 1; fi
+    if [[ -z ${GAIA_REF} ]]; then exit 1; fi
+
+    tc-vcs checkout \
+        ${WORKSPACE}/gaia \
+        ${GAIA_BASE_REPOSITORY} \
+        ${GAIA_HEAD_REPOSITORY} \
+        ${GAIA_REV} \
+        ${GAIA_REF}
+
+    gaia_cmds="--gaia-dir=${WORKSPACE}"
+fi
+
 # support multiple, space delimited, config files
 config_cmds=""
 for cfg in $MOZHARNESS_CONFIG; do
@ -95,5 +114,5 @@ if [ ${SKIP_MOZHARNESS_RUN} == true ]; then
 else
  # run the given mozharness script and configs, but pass the rest of the
  # arguments in from our own invocation
-  python2.7 $WORKSPACE/${MOZHARNESS_SCRIPT} ${config_cmds} "${@}"
+  python2.7 $WORKSPACE/${MOZHARNESS_SCRIPT} ${config_cmds} ${gaia_cmds} "${@}"
 fi
--- a/testing/taskcluster/tasks/tests/b2g_unittest_base.yml
+++ b/testing/taskcluster/tasks/tests/b2g_unittest_base.yml
@ -17,6 +17,8 @@ task:
        loopbackVideo: true
        loopbackAudio: true
    env:
+      GECKO_HEAD_REPOSITORY: '{{{head_repository}}}'
+      GECKO_HEAD_REV: '{{{head_rev}}}'
      GAIA_HEAD_REPOSITORY: '{{{gaia_head_repository}}}'
      GAIA_BASE_REPOSITORY: '{{{gaia_base_repository}}}'
      GAIA_REF: '{{{gaia_ref}}}'
--- a/testing/taskcluster/tasks/tests/mulet_build_test.yml
+++ b/testing/taskcluster/tasks/tests/mulet_build_test.yml
@ -7,18 +7,18 @@ task:
    description: Gaia Build Test test run

  payload:
+    env:
+      NEED_XVFB: true
+      NEED_PULL_GAIA: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/gaia_build_integration.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_gaia_integration.py'
    command:
-      - entrypoint # entrypoint ensures we are running in xvfb
-      - ./bin/pull_gaia.sh &&
-      - >
-        python ./mozharness/scripts/gaia_build_integration.py
-        --application firefox
-        --config-file ./mozharness/configs/b2g/taskcluster_gaia_integration.py
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --gaia-repo https://hg.mozilla.org/integration/gaia-central
-        --gaia-dir /home/worker
-        --xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
+      - bash
+      - /home/worker/bin/test.sh
+      - --application=firefox
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
    artifacts:
      'public/build':
        type: directory
--- a/testing/taskcluster/tasks/tests/mulet_build_unit.yml
+++ b/testing/taskcluster/tasks/tests/mulet_build_unit.yml
@ -7,17 +7,17 @@ task:
    description: Gaia Build Unit Test

  payload:
+    env:
+      NEED_XVFB: true
+      NEED_PULL_GAIA: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/gaia_build_unit.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_gaia_integration.py'
    command:
-      - entrypoint
-      - ./bin/pull_gaia.sh &&
-      - >
-        python ./mozharness/scripts/gaia_build_unit.py
-        --application firefox
-        --config-file ./mozharness/configs/b2g/taskcluster_gaia_integration.py
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --gaia-repo https://hg.mozilla.org/integration/gaia-central
-        --gaia-dir /home/worker
+      - bash
+      - /home/worker/bin/test.sh
+      - --application=firefox
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
    artifacts:
      'public/build':
        type: directory
--- a/testing/taskcluster/tasks/tests/mulet_gaia_js_integration_tests.yml
+++ b/testing/taskcluster/tasks/tests/mulet_gaia_js_integration_tests.yml
@ -8,19 +8,19 @@ task:
    description: Mulet Gaia JS Integration Test run {{chunk}}

  payload:
+    env:
+      NEED_XVFB: true
+      NEED_PULL_GAIA: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/gaia_integration.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_gaia_integration.py'
    command:
-      - entrypoint # entrypoint ensures we are running in xvfb
-      - ./bin/pull_gaia.sh &&
-      - >
-        python ./mozharness/scripts/gaia_integration.py
-        --application firefox
-        --config-file b2g/taskcluster_gaia_integration.py
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --total-chunk {{total_chunks}}
-        --this-chunk {{chunk}}
-        --gaia-repo {{gaia_head_repository}}
-        --gaia-dir /home/worker
+      - bash
+      - /home/worker/bin/test.sh
+      - --application=firefox
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
    artifacts:
      'public/build':
        type: directory
--- a/testing/taskcluster/tasks/tests/mulet_gaia_unit.yml
+++ b/testing/taskcluster/tasks/tests/mulet_gaia_unit.yml
@ -7,20 +7,20 @@ task:
    description: Mulet Gaia Unit Test

  payload:
+    env:
+      NEED_XVFB: true
+      NEED_PULL_GAIA: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/gaia_unit.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_gaia_unit_production.py'
    command:
-      - entrypoint
-      - ./bin/pull_gaia.sh &&
-      - >
-        python ./mozharness/scripts/gaia_unit.py
-        --application firefox
-        --config-file b2g/taskcluster_gaia_unit_production.py
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --gaia-repo {{gaia_head_repository}}
-        --gaia-dir /home/worker
-        --xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-        --total-chunk={{total_chunks}}
-        --this-chunk={{chunk}}
+      - bash
+      - /home/worker/bin/test.sh
+      - --application=firefox
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
    artifacts:
      'public/build':
        type: directory
--- a/testing/taskcluster/tasks/tests/mulet_gaia_unit_oop.yml
+++ b/testing/taskcluster/tasks/tests/mulet_gaia_unit_oop.yml
@ -7,21 +7,21 @@ task:
    description: Mulet Gaia Unit Test OOP

  payload:
+    env:
+      NEED_XVFB: true
+      NEED_PULL_GAIA: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/gaia_unit.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_gaia_unit_production.py'
    command:
-      - entrypoint
-      - ./bin/pull_gaia.sh &&
-      - >
-        python ./mozharness/scripts/gaia_unit.py
-        --application firefox
-        --config-file b2g/taskcluster_gaia_unit_production.py
-        --browser-arg -oop
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --gaia-repo {{gaia_head_repository}}
-        --gaia-dir /home/worker
-        --xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-        --total-chunk={{total_chunks}}
-        --this-chunk={{chunk}}
+      - bash
+      - /home/worker/bin/test.sh
+      - --application=firefox
+      - --browser-arg=-oop
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
+      - --total-chunk={{total_chunks}}
+      - --this-chunk={{chunk}}
    artifacts:
      'public/build':
        type: directory
--- a/testing/taskcluster/tasks/tests/mulet_linter.yml
+++ b/testing/taskcluster/tasks/tests/mulet_linter.yml
@ -7,17 +7,17 @@ task:
    description: Linter Test

  payload:
+    env:
+      NEED_XVFB: true
+      NEED_PULL_GAIA: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/gaia_linter.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_gaia_integration.py'
    command:
-      - entrypoint
-      - ./bin/pull_gaia.sh &&
-      - >
-        python ./mozharness/scripts/gaia_linter.py
-        --application firefox
-        --config-file ./mozharness/configs/b2g/taskcluster_gaia_integration.py
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --gaia-repo https://hg.mozilla.org/integration/gaia-central
-        --gaia-dir /home/worker
+      - bash
+      - /home/worker/bin/test.sh
+      - --application=firefox
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
    artifacts:
      'public/build':
        type: directory
--- a/testing/taskcluster/tasks/tests/mulet_mochitests.yml
+++ b/testing/taskcluster/tasks/tests/mulet_mochitests.yml
@ -1,28 +1,13 @@
 ---
 $inherits:
-  from: 'tasks/test.yml'
+  from: 'tasks/tests/b2g_unittest_base.yml'
 task:
  metadata:
    name: '[TC] Mulet Mochitests ( {{chunk}} )'
    description: Mulet Mochitest run {{chunk}}
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-dotcache'
-    - 'docker-worker:capability:device:loopbackVideo'
-    - 'docker-worker:capability:device:loopbackAudio'
+
  payload:
-    image: '{{#docker_image}}tester{{/docker_image}}'
-    cache:
-      # So pip installs are cached...
-      level-{{level}}-{{project}}-dotcache: /home/worker/.cache
-      level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
-    capabilities:
-      devices:
-        loopbackVideo: true
-        loopbackAudio: true
    env:
-      GECKO_HEAD_REPOSITORY: '{{{head_repository}}}'
-      GECKO_HEAD_REV: '{{{head_rev}}}'
      NEED_XVFB: true
      NEED_PULSEAUDIO: true
      MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
--- a/testing/taskcluster/tasks/tests/mulet_reftests.yml
+++ b/testing/taskcluster/tasks/tests/mulet_reftests.yml
@ -3,26 +3,25 @@ $inherits:
  from: 'tasks/tests/b2g_unittest_base.yml'
 task:
  metadata:
-    name: '[TC] Reftest'
-    description: Reftest test run {{chunk}}
+    name: '[TC] Mulet Reftest ( {{chunk}} )'
+    description: Mulet Reftest run {{chunk}}

  payload:
    env:
      MOZ_DISABLE_NONLOCAL_CONNECTIONS: 0
+      NEED_XVFB: true
+      NEED_PULL_GAIA: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/mulet_unittest.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_mulet_automation.py'
    command:
-      - entrypoint
-      - ./bin/pull_gaia.sh &&
-      - >
-        python ./mozharness/scripts/mulet_unittest.py
-        --config-file ./mozharness/configs/b2g/taskcluster_mulet_automation.py
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --test-suite reftest
-        --test-manifest tests/layout/reftests/reftest.list
-        --this-chunk {{chunk}}
-        --total-chunk {{total_chunks}}
-        --gaia-repo https://hg.mozilla.org/integration/gaia-central
-        --gaia-dir /home/worker/gaia
+      - bash
+      - /home/worker/bin/test.sh
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --test-suite=reftest
+      - --test-manifest=tests/layout/reftests/reftest.list
+      - --this-chunk={{chunk}}
+      - --total-chunk={{total_chunks}}
    artifacts:
      'public/build':
        type: directory
@ -40,3 +39,4 @@ task:
      groupName: Mulet Reftest
      symbol: 'R{{chunk}}'
      productName: b2g
+      tier: 3