Bug 1227355 - Configure b2g-ota branch and add update channel r=wcosta a=b2g-otaneedsthis

--HG-- extra : commitid : LjQCJCv8ZIY extra : source : ad64115a75ca9a2466e432ebe0149797c24c701e
2015-11-30 20:48:01 -06:00 · 2015-11-30 20:48:01 -06:00 · 079fc09f4a
--- a/testing/mozharness/configs/b2g/taskcluster-spark-dogfood.py
+++ b/testing/mozharness/configs/b2g/taskcluster-spark-dogfood.py
@ -15,7 +15,6 @@ config = {
        "B2G_UPDATER": "1",
        "LIGHTSABER": "1",
        "DOGFOOD": "1",
-        "B2G_UPDATE_CHANNEL": "dogfood",
        "BOWER_FLAGS": "--allow-root",
        "B2G_PATH": "%(work_dir)s",
        "GAIA_DISTRIBUTION_DIR": "%(work_dir)s/gaia/distros/spark",
--- a/testing/mozharness/configs/b2g/taskcluster-spark-ota-balrog.py
+++ b/testing/mozharness/configs/b2g/taskcluster-spark-ota-balrog.py
@ -0,0 +1,35 @@
+#!/usr/bin/env python
+import os.path
+config = {
+    "default_vcs": "tc-vcs",
+    "default_actions": [
+        'checkout-sources',
+        'build',
+        'build-symbols',
+        'make-updates',
+        'prep-upload',
+        'submit-to-balrog'
+    ],
+    "balrog_credentials_file": "balrog_credentials",
+    "nightly_build": True,
+    "env": {
+        "GAIA_OPTIMIZE": "1",
+        "B2G_UPDATER": "1",
+        "LIGHTSABER": "1",
+        "BOWER_FLAGS": "--allow-root",
+        "B2G_PATH": "%(work_dir)s",
+        "GAIA_DISTRIBUTION_DIR": "%(work_dir)s/gaia/distros/spark",
+        "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/mozharness/configs/b2g/taskcluster-spark-ota.py
+++ b/testing/mozharness/configs/b2g/taskcluster-spark-ota.py
@ -7,8 +7,7 @@ config = {
        'build',
        'build-symbols',
        'make-updates',
-        'prep-upload',
-        'submit-to-balrog'
+        'prep-upload'
    ],
    "balrog_credentials_file": "balrog_credentials",
    "nightly_build": True,
--- a/testing/taskcluster/mach_commands.py
+++ b/testing/taskcluster/mach_commands.py
@ -34,6 +34,12 @@ DEFAULT_JOB_PATH = os.path.join(
    ROOT, 'tasks', 'branches', 'base_jobs.yml'
 )

+def merge_dicts(*dicts):
+    merged_dict = {}
+    for dictionary in dicts:
+        merged_dict.update(dictionary)
+    return merged_dict
+
 def gaia_info():
    '''
    Fetch details from in tree gaia.json (which links this version of
@ -381,7 +387,7 @@ class Graph(object):

        for build in job_graph:
            interactive = cmdline_interactive or build["interactive"]
-            build_parameters = dict(parameters)
+            build_parameters = merge_dicts(parameters, build['additional-parameters']);
            build_parameters['build_slugid'] = slugid()
            build_task = templates.load(build['task'], build_parameters)

@ -484,7 +490,10 @@ class Graph(object):

            for post_build in build['post-build']:
                # copy over the old parameters to update the template
-                post_parameters = copy.copy(build_parameters)
+                # TODO additional-parameters is currently not an option, only
+                # enabled for build tasks
+                post_parameters = merge_dicts(build_parameters,
+                                              post_build.get('additional-parameters', {}))
                post_task = configure_dependent_task(post_build['task'],
                                                     post_parameters,
                                                     slugid(),
@ -500,6 +509,10 @@ class Graph(object):

            for test in build['dependents']:
                test = test['allowed_build_tasks'][build['task']]
+                # TODO additional-parameters is currently not an option, only
+                # enabled for build tasks
+                test_parameters = merge_dicts(build_parameters,
+                                              test.get('additional-parameters', {}))
                test_parameters = copy.copy(build_parameters)
                if tests_url:
                    test_parameters['tests_url'] = tests_url
--- a/testing/taskcluster/tasks/branches/b2g-ota/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/b2g-ota/job_flags.yml
@ -0,0 +1,76 @@
+---
+# For complete sample of all build and test jobs,
+# see <gecko>/testing/taskcluster/tasks/branches/base_job_flags.yml
+
+$inherits:
+  from: tasks/branches/base_job_flags.yml
+
+builds:
+  aries:
+    platforms:
+      - b2g
+    types:
+      opt:
+        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_eng.yml
+  aries-dogfood:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_aries_spark_dogfood.yml
+        additional-parameters:
+          b2g_update_channel: 'b2g-ota'
+  aries-ota:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_aries_spark_ota_opt.yml
+        additional-parameters:
+          b2g_update_channel: 'b2g-ota'
+      debug:
+        task: tasks/builds/b2g_aries_spark_ota_debug.yml
+        additional-parameters:
+          b2g_update_channel: 'b2g-ota'
+  flame-kk:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_opt.yml
+      debug:
+        task: tasks/builds/b2g_flame_kk_debug.yml
+  flame-kk-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_eng.yml
+  flame-kk-spark-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_spark_eng.yml
+  flame-kk-ota:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_ota_opt.yml
+        additional-parameters:
+          b2g_update_channel: 'b2g-ota'
+      debug:
+        task: tasks/builds/b2g_flame_kk_ota_debug.yml
+        additional-parameters:
+          b2g_update_channel: 'b2g-ota'
+
+tests: []
--- a/testing/taskcluster/tasks/branches/mozilla-b2g44_v2_5/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/mozilla-b2g44_v2_5/job_flags.yml
@ -12,30 +12,32 @@ builds:
    types:
      opt:
        task: tasks/builds/b2g_aries_spark_dogfood.yml
+        additional-parameters:
+          b2g_update_channel: 'nightly-b2g44'
  flame-kk-ota:
    platforms:
      - b2g
    types:
      debug:
        task: tasks/builds/b2g_flame_kk_ota_debug.yml
+        additional-parameters:
+          b2g_update_channel: 'nightly-b2g44'
  nexus-4-kk-ota:
    platforms:
      - b2g
    types:
      debug:
        task: tasks/builds/b2g_nexus_4_kk_ota_debug.yml
+        additional-parameters:
+          b2g_update_channel: 'nightly-b2g44'
  nexus-5l-ota:
    platforms:
      - b2g
    types:
      debug:
        task: tasks/builds/b2g_nexus_5l_ota_debug.yml
+        additional-parameters:
+          b2g_update_channel: 'nightly-b2g44'

 # Just needed for parser sake
-tests:
-  cppunit:
-    allowed_build_tasks:
-      tasks/builds/b2g_emulator_x86_kk_opt.yml:
-        task: tasks/tests/b2g_emulator_cpp_unit.yml
-      tasks/builds/b2g_emulator_x86_kk_debug.yml:
-        task: tasks/tests/b2g_emulator_cpp_unit.yml
+tests: []
--- a/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml
@ -23,22 +23,32 @@ builds:
    types:
      opt:
        task: tasks/builds/b2g_aries_spark_dogfood.yml
+        additional-parameters:
+          b2g_update_channel: 'dogfood'
  aries-ota:
    platforms:
      - b2g
    types:
      opt:
-        task: tasks/builds/b2g_aries_spark_ota_opt.yml
+        task: tasks/builds/b2g_aries_spark_ota_balrog_opt.yml
+        additional-parameters:
+          b2g_update_channel: 'nightly'
      debug:
-        task: tasks/builds/b2g_aries_spark_ota_debug.yml
+        task: tasks/builds/b2g_aries_spark_ota_balrog_debug.yml
+        additional-parameters:
+          b2g_update_channel: 'nightly'
  flame-kk-ota:
    platforms:
      - b2g
    types:
      opt:
        task: tasks/builds/b2g_flame_kk_ota_opt.yml
+        additional-parameters:
+          b2g_update_channel: 'nightly'
      debug:
        task: tasks/builds/b2g_flame_kk_ota_debug.yml
+        additional-parameters:
+          b2g_update_channel: 'nightly'

 post-build:
  simulator:
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml
@ -17,6 +17,7 @@ task:
      VARIANT: userdebug
      DOGFOOD: 1
      MOZHARNESS_CONFIG: b2g/taskcluster-spark-dogfood.py
+      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
  extra:
    treeherderEnv:
      - production
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_debug.yml
@ -0,0 +1,11 @@
+$inherits:
+  from: 'tasks/builds/b2g_aries_spark_ota_debug.yml'
+task:
+  scopes:
+    - 'docker-worker:feature:balrogVPNProxy'
+  payload:
+    features:
+      balrogVPNProxy: true
+    env:
+      MOZHARNESS_CONFIG: b2g/taskcluster-spark-ota-balrog.py
+
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_opt.yml
@ -0,0 +1,10 @@
+$inherits:
+  from: 'tasks/builds/b2g_aries_spark_ota_opt.yml'
+task:
+  scopes:
+    - 'docker-worker:feature:balrogVPNProxy'
+  payload:
+    features:
+      balrogVPNProxy: true
+    env:
+      MOZHARNESS_CONFIG: b2g/taskcluster-spark-ota-balrog.py
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_base.yml
@ -2,16 +2,13 @@ $inherits:
  from: 'tasks/builds/b2g_phone_base.yml'
 task:
  workerType: balrog
-  scopes:
-    - 'docker-worker:feature:balrogVPNProxy'

  payload:
-    features:
-      balrogVPNProxy: true
    env:
      TARGET: 'aries'
      DEBUG: 0
      MOZHARNESS_CONFIG: b2g/taskcluster-spark-ota.py
+      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
    command:
      - >
        checkout-gecko workspace &&
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_base.yml
@ -2,12 +2,7 @@ $inherits:
  from: 'tasks/builds/b2g_phone_base.yml'
 task:
  workerType: balrog
-  scopes:
-    - 'docker-worker:feature:balrogVPNProxy'
-
  payload:
-    features:
-      balrogVPNProxy: true
    env:
      TARGET: 'flame-kk'
      DEBUG: 0
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml
@ -18,6 +18,7 @@ task:
      VARIANT: userdebug
      B2G_DEBUG: 0
      MOZHARNESS_CONFIG: b2g/taskcluster-phone-fota.py
+      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
  extra:
    treeherderEnv:
      - staging
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_opt.yml
@ -17,6 +17,7 @@ task:
    env:
      VARIANT: user
      MOZHARNESS_CONFIG: b2g/taskcluster-phone-fota.py
+      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
  extra:
    treeherderEnv:
      - staging
--- a/testing/taskcluster/tasks/builds/b2g_nexus_4_kk_ota_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus_4_kk_ota_debug.yml
@ -23,6 +23,7 @@ task:
      B2G_DEBUG: 0
      TARGET: 'nexus-4-kk'
      DEBUG: 0
+      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
    command:
      - >
        checkout-gecko workspace &&
--- a/testing/taskcluster/tasks/builds/b2g_nexus_5l_ota_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus_5l_ota_debug.yml
@ -24,6 +24,7 @@ task:
      TARGET: 'nexus-5-l'
      DEBUG: 0
      MOZHARNESS_CONFIG: b2g/taskcluster-phone-fota.py
+      B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
    command:
      - >
        checkout-gecko workspace &&