Bug 1291370 - Add Fennec-and-GeckoView Task Cluster job building using --with-gradle. r=dustin,gbrown

We run only a small subset of the test suite to save resources. Over time, we'll run more of the platform test suite. --HG-- extra : rebase_source : 264fbe55be5b56857278ae8d731ef51b1b41cf3c extra : histedit_source : a3550c7e2ea8a41cd6285e511b7268a9e7af11cd%2Cec6024dadcb7c071170aa452064776666283bb27
2016-08-03 16:02:00 -07:00 · 2016-08-03 16:02:00 -07:00 · 4b68f17715
--- a/mobile/android/config/mozconfigs/android-api-15-gradle/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15-gradle/nightly
@ -0,0 +1,23 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+ac_add_options --enable-profiling
+
+# Android
+ac_add_options --with-android-min-sdk=15
+ac_add_options --target=arm-linux-androideabi
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+ac_add_options --with-gradle="$topsrcdir/gradle/bin/gradle"
+export GRADLE_MAVEN_REPOSITORY="file://$topsrcdir/jcentral"
+
+# From here on, just like ../android-api-15/nightly.
+
+# This will overwrite the default of stripping everything and keep the symbol table.
+# This is useful for profiling with eideticker. See bug 788680
+STRIP_FLAGS="--strip-debug"
+
+export MOZILLA_OFFICIAL=1
+export MOZ_TELEMETRY_REPORTING=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/taskcluster/ci/android-test/test-platforms.yml
+++ b/taskcluster/ci/android-test/test-platforms.yml
@ -20,3 +20,6 @@ android-4.3-arm7-api-15/opt:
 android-4.2-x86/opt:
    build-platform: android-x86/opt
    test-set: x86-tests
+android-4.3-arm7-api-15-gradle/opt:
+    build-platform: android-api-15-gradle/opt
+    test-set: gradle-tests
--- a/taskcluster/ci/android-test/test-sets.yml
+++ b/taskcluster/ci/android-test/test-sets.yml
@ -36,5 +36,9 @@ opt-tests:
    - robocop
    - xpcshell

+gradle-tests:
+    - robocop
+    - mochitest-chrome
+
 x86-tests:
    - xpcshell
--- a/taskcluster/ci/android-test/tests.yml
+++ b/taskcluster/ci/android-test/tests.yml
@ -33,7 +33,7 @@ crashtest:
    chunks:
        by-test-platform:
            android-4.3-arm7-api-15/debug: 10
-            android-4.3-arm7-api-15/opt: 4
+            default: 4
    loopback-video: true
    e10s: false
    mozharness:
@ -54,7 +54,7 @@ jsreftest:
    chunks:
        by-test-platform:
            android-4.3-arm7-api-15/debug: 20
-            android-4.3-arm7-api-15/opt: 6
+            default: 6
    loopback-video: true
    max-run-time: 7200
    e10s: false
@ -79,7 +79,7 @@ mochitest:
    max-run-time:
        by-test-platform:
            android-4.3-arm7-api-15/debug: 10800
-            android-4.3-arm7-api-15/opt: 3600
+            default: 3600
    mozharness:
        script: mozharness/scripts/android_emulator_unittest.py
        no-read-buildbot-config: true
@ -98,7 +98,7 @@ mochitest-chrome:
    chunks:
        by-test-platform:
            android-4.3-arm7-api-15/debug: 2
-            android-4.3-arm7-api-15/opt: 1
+            default: 1
    loopback-video: true
    e10s: false
    max-run-time: 5400
@ -156,7 +156,7 @@ mochitest-media:
    max-run-time:
        by-test-platform:
            android-4.3-arm7-api-15/debug: 5400
-            android-4.3-arm7-api-15/opt: 3600
+            default: 3600
    mozharness:
        script: mozharness/scripts/android_emulator_unittest.py
        no-read-buildbot-config: true
@ -178,6 +178,7 @@ mochitest-webgl:
    instance-size:
        by-test-platform:
            android-4.3-arm7-api-15/opt: default
+            android-4.3-arm7-api-15-gradle/opt: default
            android-4.3-arm7-api-15/debug: xlarge
    mozharness:
        script: mozharness/scripts/android_emulator_unittest.py
@ -196,7 +197,7 @@ reftest:
    chunks:
        by-test-platform:
            android-4.3-arm7-api-15/debug: 48
-            android-4.3-arm7-api-15/opt: 16
+            default: 16
    instance-size: xlarge
    max-run-time: 10800
    loopback-video: true
@ -220,6 +221,7 @@ robocop:
        by-test-platform:
            # android-4.3-arm7-api-15/debug -- not run
            android-4.3-arm7-api-15/opt: 4
+            android-4.3-arm7-api-15-gradle/opt: 4
    loopback-video: true
    e10s: false
    mozharness:
--- a/taskcluster/ci/legacy/tasks/branches/base_job_flags.yml
+++ b/taskcluster/ci/legacy/tasks/branches/base_job_flags.yml
@ -14,6 +14,7 @@ flags:
    - nexus-5l-eng
    - aries-eng
    - android-api-15
+    - android-api-15-gradle
    - android-api-15-frontend
    - android-partner-sample1
    - android-x86
--- a/taskcluster/ci/legacy/tasks/branches/base_jobs.yml
+++ b/taskcluster/ci/legacy/tasks/branches/base_jobs.yml
@ -20,6 +20,12 @@ builds:
    types:
      opt:
        task: tasks/builds/android_x86.yml
+  android-api-15-gradle:
+    platforms:
+      - Android
+    types:
+      opt:
+        task: tasks/builds/android_api_15_gradle.yml
  linux64-mulet:
    platforms:
      - Mulet Linux
--- a/taskcluster/ci/legacy/tasks/builds/android_api_15_gradle.yml
+++ b/taskcluster/ci/legacy/tasks/builds/android_api_15_gradle.yml
@ -0,0 +1,64 @@
+$inherits:
+  from: 'tasks/builds/mobile_base.yml'
+  variables:
+    build_name: 'android-api-15-gradle'
+    build_type: 'opt'
+task:
+  metadata:
+      name: '[TC] Android armv7 API 15+ Gradle'
+      description: 'Android armv7 API 15+ Gradle'
+
+  workerType: android-api-15
+
+  routes:
+    - 'index.buildbot.branches.{{project}}.android-api-15-gradle'
+    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-15-gradle'
+
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-15-gradle-workspace'
+    - 'docker-worker:cache:tooltool-cache'
+    - 'docker-worker:relengapi-proxy:tooltool.download.internal'
+    - 'docker-worker:relengapi-proxy:tooltool.download.public'
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-android-api-15-gradle-workspace: '/home/worker/workspace'
+      tooltool-cache: '/home/worker/tooltool-cache'
+
+    features:
+      relengAPIProxy: true
+
+    env:
+      # inputs to mozharness
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
+      # TODO: make these additional configuration files go away
+      MOZHARNESS_CONFIG: >
+          builds/releng_base_android_64_builds.py
+          disable_signing.py
+          platform_supports_post_upload_to_latest.py
+      MOZHARNESS_ACTIONS: "get-secrets build multi-l10n update"
+      MH_CUSTOM_BUILD_VARIANT_CFG: api-15-gradle
+      MH_BRANCH: {{project}}
+      MH_BUILD_POOL: taskcluster
+
+    command: ["/bin/bash", "bin/build.sh"]
+
+  extra:
+    treeherderEnv:
+      - production
+      - staging
+    treeherder:
+      machine:
+        # see https://github.com/mozilla/treeherder/blob/master/ui/js/values.js
+        platform: android-4-0-armv7-api15
+      groupSymbol: tc
+      groupName: Submitted by taskcluster
+      symbol: B
+      tier: 2
+    # Rather then enforcing particular conventions we require that all build
+    # tasks provide the "build" extra field to specify where the build and tests
+    # files are located.
+    locations:
+      build: 'public/build/target.apk'
+      mozharness: 'public/build/mozharness.zip'
+      test_packages: 'public/build/target.test_packages.json'
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle.py
@ -0,0 +1,8 @@
+config = {
+    'base_name': 'Android armv7 API 15+ %(branch)s Gradle',
+    'stage_platform': 'android-api-15-gradle',
+    'build_type': 'api-15-gradle',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-gradle/nightly',
+    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
+    'multi_locale_config_platform': 'android',
+}
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@ -360,6 +360,7 @@ class BuildOptionParser(object):
        'api-15-gradle-dependencies': 'builds/releng_sub_%s_configs/%s_api_15_gradle_dependencies.py',
        'api-15': 'builds/releng_sub_%s_configs/%s_api_15.py',
        'api-15-debug': 'builds/releng_sub_%s_configs/%s_api_15_debug.py',
+        'api-15-gradle': 'builds/releng_sub_%s_configs/%s_api_15_gradle.py',
        'x86': 'builds/releng_sub_%s_configs/%s_x86.py',
        'api-15-partner-sample1': 'builds/releng_sub_%s_configs/%s_api_15_partner_sample1.py',
        'android-test': 'builds/releng_sub_%s_configs/%s_test.py',