Backed out changeset 1b269fb8a704 (bug 1302590) for Gecko Decision Ta…

…sk bustage

--HG--
rename : taskcluster/ci/build-signing/kind.yml => taskcluster/ci/signing/kind.yml
rename : taskcluster/ci/build-signing/android-signing.yml => taskcluster/ci/signing/signing.yml

taskcluster/ci/build/android.yml

@@ -72,34 +72,6 @@ android-api-15/opt:
         custom-build-variant-cfg: api-15
         tooltool-downloads: internal
 
-android-api-15-nightly/opt:
-    description: "Android 4.0 API15+ Nightly"
-    attributes:
-        nightly: true
-    index:
-        product: mobile
-        job-name: android-api-15-nightly-opt
-    treeherder:
-        platform: android-4-0-armv7-api15/opt
-        symbol: tc(N)
-        tier: 2
-    worker-type: aws-provisioner-v1/android-api-15
-    worker:
-        implementation: docker-worker
-        max-run-time: 7200
-    run:
-        using: mozharness
-        actions: [get-secrets build multi-l10n update]
-        config:
-            - builds/releng_base_android_64_builds.py
-            - disable_signing.py
-            - platform_supports_post_upload_to_latest.py
-            - taskcluster_nightly.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        custom-build-variant-cfg: api-15
-        tooltool-downloads: internal
-    run-on-projects: []
-
 android-api-15-gradle/opt:
     description: "Android 4.0 API15+ (Gradle) Opt"
     index:

taskcluster/ci/nightly-fennec/android-api-15-nightly-build.yml

@@ -0,0 +1,66 @@
+$inherits:
+  from: 'mobile_base.yml'
+  variables:
+    build_name: 'android'
+    build_type: 'opt'
+task:
+  metadata:
+      name: '[TC] Android armv7 API 15+'
+      description: 'Android armv7 API 15+'
+
+  workerType: android-api-15
+
+  routes:
+    - 'index.buildbot.branches.{{project}}.android-api-15'
+    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-15'
+
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-15-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-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
+          taskcluster_nightly.py
+      MOZHARNESS_ACTIONS: "get-secrets build multi-l10n update"
+      MH_CUSTOM_BUILD_VARIANT_CFG: api-15
+      MH_BRANCH: {{project}}
+      MH_BUILD_POOL: taskcluster
+      TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
+
+    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'

taskcluster/ci/nightly-fennec/build.yml

@@ -0,0 +1,46 @@
+# This is the "base" task which contains the common values all builds must
+# provide.
+---
+taskId: {{build_slugid}}
+
+task:
+  created:
+    relative-datestamp: "0 seconds"
+  deadline:
+    relative-datestamp: "24 hours"
+  metadata:
+    source: '{{source}}'
+    owner: [email protected]
+
+  tags:
+    createdForUser: {{owner}}
+
+  provisionerId: aws-provisioner-v1
+  schedulerId: task-graph-scheduler
+
+  payload:
+    # Two hours is long but covers edge cases (and matches bb based infra)
+    maxRunTime: 7200
+
+    env:
+      # Common environment variables for checking out gecko
+      GECKO_BASE_REPOSITORY: '{{base_repository}}'
+      GECKO_HEAD_REPOSITORY: '{{head_repository}}'
+      GECKO_HEAD_REV: '{{head_rev}}'
+      GECKO_HEAD_REF: '{{head_ref}}'
+      TOOLTOOL_REPO: 'https://github.com/mozilla/build-tooltool'
+      TOOLTOOL_REV: 'master'
+      MOZ_BUILD_DATE: '{{pushdate}}'
+      MOZ_SCM_LEVEL: '{{level}}'
+
+  extra:
+    build_product: '{{build_product}}'
+    build_name: '{{build_name}}'
+    build_type: '{{build_type}}'
+    index:
+      rank: {{rank}}
+    treeherder:
+      jobKind: build
+      groupSymbol: tc
+      groupName: Submitted by taskcluster
+      symbol: B

taskcluster/ci/nightly-fennec/docker_build.yml

@@ -0,0 +1,27 @@
+$inherits:
+  from: 'build.yml'
+
+
+task:
+  workerType: b2gbuild
+
+  routes:
+    - 'index.gecko.v1.{{project}}.revision.linux.{{head_rev}}.{{build_name}}.{{build_type}}'
+    - 'index.gecko.v1.{{project}}.latest.linux.{{build_name}}.{{build_type}}'
+
+  scopes:
+    # docker build tasks use tc-vcs so include the scope.
+    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
+
+  payload:
+
+    cache:
+      level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
+
+    # All docker builds share a common artifact directory for ease of uploading.
+    artifacts:
+      'public/build':
+        type: directory
+        path: '/home/worker/artifacts/'
+        expires:
+          relative-datestamp: '1 year'

taskcluster/ci/nightly-fennec/kind.yml

@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+implementation: 'taskgraph.task.nightly_fennec:NightlyFennecTask'
+nightly_fennec_path: '.'
+

taskcluster/ci/nightly-fennec/mobile_base.yml

@@ -0,0 +1,13 @@
+$inherits:
+  from: 'docker_build.yml'
+  variables:
+    build_product: 'mobile'
+docker-image: desktop-build
+task:
+  payload:
+    image:
+      type: 'task-image'
+      path: 'public/image.tar'
+      taskId:
+        task-reference: "<docker-image>"
+

taskcluster/ci/nightly-fennec/routes.json

@@ -0,0 +1,18 @@
+{
+    "routes": [
+        "{index}.gecko.v2.{project}.revision.{head_rev}.{build_product}.{build_name}-{build_type}",
+        "{index}.gecko.v2.{project}.pushdate.{year}.{month}.{day}.{pushdate}.{build_product}.{build_name}-{build_type}",
+        "{index}.gecko.v2.{project}.latest.{build_product}.{build_name}-{build_type}"
+    ],
+    "nightly": [
+        "{index}.gecko.v2.{project}.nightly.{year}.{month}.{day}.revision.{head_rev}.{build_product}.{build_name}-{build_type}",
+        "{index}.gecko.v2.{project}.nightly.{year}.{month}.{day}.latest.{build_product}.{build_name}-{build_type}",
+        "{index}.gecko.v2.{project}.nightly.revision.{head_rev}.{build_product}.{build_name}-{build_type}",
+        "{index}.gecko.v2.{project}.nightly.latest.{build_product}.{build_name}-{build_type}"
+    ],
+    "l10n": [
+        "{index}.gecko.v2.{project}.revision.{head_rev}.{build_product}-l10n.{build_name}-{build_type}.{locale}",
+        "{index}.gecko.v2.{project}.pushdate.{year}.{month}.{day}.{pushdate}.{build_product}-l10n.{build_name}-{build_type}.{locale}",
+        "{index}.gecko.v2.{project}.latest.{build_product}-l10n.{build_name}-{build_type}.{locale}"
+    ]
+}

taskcluster/ci/build-signing/kind.yml → taskcluster/ci/signing/kind.yml

@@ -3,9 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 implementation: 'taskgraph.task.signing:SigningTask'
-
-jobs-from:
-  - android-signing.yml
-
+signing_path: '.'
 kind-dependencies:
-  - build
+  - nightly-fennec

taskcluster/ci/signing/signing.yml

@@ -0,0 +1,18 @@
+task:
+  provisionerId: "scriptworker-prov-v1"
+  workerType: "signing-linux-v1"
+  scopes:
+    - "project:releng:signing:cert:dep-signing"
+    - "project:releng:signing:format:jar"
+  created:
+    relative-datestamp: "0 seconds"
+  deadline:
+    relative-datestamp: "24 hours"
+  payload:
+    unsignedArtifacts: []
+    maxRunTime: 600
+  metadata:
+    name: "Signing Scriptworker Task"
+    description: "Testing the signing scriptworker"
+    owner: "[email protected]"
+    source: "https://tools.taskcluster.net/task-creator/"

taskcluster/docs/attributes.rst

@@ -116,9 +116,3 @@ image_name
 ==========
 
 For the ``docker_image`` kind, this attribute contains the docker image name.
-
-nightly
-=======
-
-Signals whether the task is part of a nightly graph. Useful when filtering
-out nightly tasks from full task set at target stage.

taskcluster/taskgraph/target_tasks.py

@@ -106,6 +106,5 @@ def target_tasks_nightly(full_task_graph, parameters):
     """Select the set of tasks required for a nightly build of fennec. The
     nightly build process involves a pipeline of builds, signing,
     and, eventually, uploading the tasks to balrog."""
-    def filter(task):
-        return task.attributes.get('nightly', False)
-    return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
+    return [t.label for t in full_task_graph.tasks.itervalues()
+            if t.attributes.get('kind') in ['nightly-fennec', 'signing']]