From 50318d70edf4503dee4598e2091979c2b7cd54ca Mon Sep 17 00:00:00 2001 From: "jlal@mozilla.com" Date: Tue, 31 Mar 2015 01:51:22 -0700 Subject: [PATCH] Bug 1149432 - Add initial indexing to builds r=pmoore --HG-- extra : rebase_source : 75886a7266a3041bea4e067379a0aa52a4f349e3 --- testing/taskcluster/mach_commands.py | 6 ++++++ testing/taskcluster/tasks/build.yml | 5 +++++ testing/taskcluster/tasks/builds/b2g_desktop_debug.yml | 1 + testing/taskcluster/tasks/builds/b2g_desktop_opt.yml | 2 +- testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml | 1 - testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml | 3 +++ testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml | 4 +++- testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml | 4 +++- testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml | 3 +++ testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml | 3 +++ testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml | 4 +++- testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml | 4 +++- testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml | 5 +++-- testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml | 1 - .../taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml | 3 +++ testing/taskcluster/tasks/builds/b2g_emulator_x86_l_opt.yml | 6 +++--- testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml | 3 +++ testing/taskcluster/tasks/builds/b2g_flame_kk_nightly.yml | 4 +++- testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml | 4 +++- testing/taskcluster/tasks/builds/b2g_hamachi_eng.yml | 4 +++- testing/taskcluster/tasks/builds/b2g_hamachi_user.yml | 4 +++- testing/taskcluster/tasks/builds/b2g_helix_user.yml | 4 +++- testing/taskcluster/tasks/builds/b2g_nexus4_eng.yml | 4 +++- testing/taskcluster/tasks/builds/b2g_nexus4_user.yml | 4 +++- testing/taskcluster/tasks/builds/mulet_linux.yml | 3 +++ testing/taskcluster/tasks/decision/branch.yml | 2 +- testing/taskcluster/tasks/decision/try.yml | 2 +- 27 files changed, 72 insertions(+), 21 deletions(-) diff --git a/testing/taskcluster/mach_commands.py b/testing/taskcluster/mach_commands.py index 86e336558839..43de912d2ff4 100644 --- a/testing/taskcluster/mach_commands.py +++ b/testing/taskcluster/mach_commands.py @@ -221,6 +221,10 @@ class Graph(object): @CommandArgument('--project', required=True, help='Project to use for creating task graph. Example: --project=try') + @CommandArgument('--pushlog-id', + dest='pushlog_id', + required=False, + default=0) @CommandArgument('--owner', required=True, help='email address of who owns this graph') @@ -247,6 +251,8 @@ class Graph(object): job_graph = parse_commit(message, jobs) # Template parameters used when expanding the graph parameters = dict(gaia_info().items() + { + 'project': project, + 'pushlog_id': params.get('pushlog_id', 0), 'docker_image': docker_image, 'base_repository': params['base_repository'] or \ params['head_repository'], diff --git a/testing/taskcluster/tasks/build.yml b/testing/taskcluster/tasks/build.yml index f3973f9a3a2b..09006f239ef0 100644 --- a/testing/taskcluster/tasks/build.yml +++ b/testing/taskcluster/tasks/build.yml @@ -17,6 +17,9 @@ task: provisionerId: aws-provisioner schedulerId: task-graph-scheduler + routes: + - 'index.gecko.v1.{{project}}.revision.{{head_rev}}.{{build_name}}.{{build_type}}' + - 'index.gecko.v1.{{project}}.latest.{{build_name}}.{{build_type}}' scopes: # Nearly all of our build tasks use tc-vcs so just include the scope across # the board. @@ -54,6 +57,8 @@ task: MOZHARNESS_REF: '{{mozharness_ref}}' extra: + index: + rank: {{pushlog_id}} treeherder: groupSymbol: tc groupName: Submitted by taskcluster diff --git a/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml b/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml index 46a6d3e3c021..4ac570bad47f 100644 --- a/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml +++ b/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml @@ -1,6 +1,7 @@ $inherits: from: 'tasks/builds/b2g_desktop_base.yml' variables: + build_name: 'b2g-desktop' build_type: 'debug' task: diff --git a/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml b/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml index ffd715035cbf..b1ac478c9822 100644 --- a/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml @@ -1,8 +1,8 @@ $inherits: from: 'tasks/builds/b2g_desktop_base.yml' variables: + build_name: 'b2g-desktop' build_type: 'opt' - task: scopes: - 'docker-worker:cache:workspace-b2g-desktop-objects-opt' diff --git a/testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml b/testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml index 3b0f3475089f..c7b9228a295c 100644 --- a/testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml +++ b/testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml @@ -15,4 +15,3 @@ task: extra: locations: img: 'private/build/dolphin.zip' - diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml b/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml index 79922c6a2c5f..d9cd3628c012 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_emulator_base.yml' + variables: + build_name: 'emulator-ics' + build_type: 'debug' task: workerType: emulator-ics-debug scopes: diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml index 2a7b848bb681..38add4cd8e85 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_emulator_base.yml' + variables: + build_type: 'opt' + build_name: 'emulator-ics' task: workerType: emulator-ics scopes: @@ -18,4 +21,3 @@ task: env: TARGET: 'emulator' - diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml b/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml index b2552df0b02d..a6c255a9c8a8 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_emulator_base.yml' + variables: + build_name: 'emualtor-jb' + build_type: 'debug' task: workerType: emulator-jb-debug scopes: @@ -22,4 +25,3 @@ task: env: TARGET: 'emulator-jb' B2G_DEBUG: 1 - diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml index 8fa8b1c2a583..675d5044262c 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_emulator_base.yml' + variables: + build_name: 'emualtor-jb' + build_type: 'opt' task: workerType: emulator-jb scopes: diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml b/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml index 7a4373b237d3..3e38ba311730 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_emulator_base.yml' + variables: + build_name: 'emualtor-kk' + build_type: 'debug' task: workerType: emulator-kk-debug scopes: diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml index e9fca4c86fff..037e86842eff 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_emulator_base.yml' + variables: + build_name: 'emualtor-kk' + build_type: 'opt' task: workerType: emulator-kk scopes: @@ -22,4 +25,3 @@ task: workspace-emulator-kk-opt: /home/worker/workspace env: TARGET: 'emulator-kk' - diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml b/testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml index b2809d0c5adf..277aed3aacd4 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_emulator_base.yml' + variables: + build_name: 'emualtor-l' + build_type: 'opt' task: workerType: emulator-l-debug scopes: @@ -25,4 +28,3 @@ task: env: TARGET: 'emulator-l' B2G_DEBUG: 1 - diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml index ca9e480e5ce7..03214fb0eb4c 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_emulator_base.yml' + variables: + build_name: 'emualtor-l' + build_type: 'opt' task: workerType: emulator-l scopes: @@ -22,5 +25,3 @@ task: workspace-emulator-l-opt: /home/worker/workspace env: TARGET: 'emulator-l' - - diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml b/testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml index a02597a1c871..b67f55fe9a3d 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml @@ -31,4 +31,3 @@ task: tests: 'public/build/b2g-tests.zip' symbols: 'public/build/b2g-crashreporter-symbols.zip' sources: 'public/build/sources.xml' - diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml index 77a5ddc11439..45bfd64a0682 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_emulator_x86_base.yml' + variables: + build_name: 'emualtor-x86-kk' + build_type: 'opt' task: workerType: emualtor-x86-kk scopes: diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_x86_l_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_x86_l_opt.yml index 01efe5c6b4f0..4c9281244312 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_l_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_x86_l_opt.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_emulator_base.yml' + variables: + build_name: 'emualtor-x86-l' + build_type: 'opt' task: workerType: emulator-l scopes: @@ -29,6 +32,3 @@ task: workspace-emulator-l-x86-opt: /home/worker/workspace env: TARGET: 'emulator-x86-l' - - - diff --git a/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml b/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml index 166ea5d74cab..d8f52a507eef 100644 --- a/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml +++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_phone_base.yml' + variables: + build_name: 'flame-kk-eng' + build_type: 'opt' task: workerType: flame-kk scopes: diff --git a/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly.yml b/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly.yml index 63b4559e70eb..40451b85d971 100644 --- a/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly.yml +++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_phone_base.yml' + variables: + build_name: 'flame-kk-nightly' + build_type: 'opt' task: workerType: flame-kk scopes: @@ -29,4 +32,3 @@ task: locations: img: 'private/build/flame-kk.zip' mar: 'public/build/b2g-flame-gecko-update.mar' - diff --git a/testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml b/testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml index b9ad6fd1343e..a93f3b0c583e 100644 --- a/testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_phone_base.yml' + variables: + build_name: 'flame-kk' + build_type: 'opt' task: workerType: flame-kk scopes: @@ -27,4 +30,3 @@ task: platform: b2g-device-image locations: img: 'private/build/flame-kk.zip' - diff --git a/testing/taskcluster/tasks/builds/b2g_hamachi_eng.yml b/testing/taskcluster/tasks/builds/b2g_hamachi_eng.yml index 5971e9bcff39..b205ac0fce7a 100644 --- a/testing/taskcluster/tasks/builds/b2g_hamachi_eng.yml +++ b/testing/taskcluster/tasks/builds/b2g_hamachi_eng.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_phone_base.yml' + variables: + build_name: 'hamachi-eng' + build_type: 'opt' task: scopes: - 'docker-worker:cache:build-hamachi-eng' @@ -15,4 +18,3 @@ task: extra: locations: img: 'private/build/hamachi.zip' - diff --git a/testing/taskcluster/tasks/builds/b2g_hamachi_user.yml b/testing/taskcluster/tasks/builds/b2g_hamachi_user.yml index b41b91ddb213..08502e99d944 100644 --- a/testing/taskcluster/tasks/builds/b2g_hamachi_user.yml +++ b/testing/taskcluster/tasks/builds/b2g_hamachi_user.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_phone_base.yml' + variables: + build_name: 'hamachi' + build_type: 'opt' task: scopes: - 'docker-worker:cache:build-hamachi-user' @@ -14,4 +17,3 @@ task: extra: locations: img: 'private/build/hamachi.zip' - diff --git a/testing/taskcluster/tasks/builds/b2g_helix_user.yml b/testing/taskcluster/tasks/builds/b2g_helix_user.yml index 8841fd2d2360..89f698af331e 100644 --- a/testing/taskcluster/tasks/builds/b2g_helix_user.yml +++ b/testing/taskcluster/tasks/builds/b2g_helix_user.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_phone_base.yml' + variables: + build_name: 'helix' + build_type: 'opt' task: scopes: - 'docker-worker:cache:build-helix-user' @@ -14,4 +17,3 @@ task: extra: locations: img: 'private/build/helix.zip' - diff --git a/testing/taskcluster/tasks/builds/b2g_nexus4_eng.yml b/testing/taskcluster/tasks/builds/b2g_nexus4_eng.yml index 494d4c587d7b..21d7fe2bf311 100644 --- a/testing/taskcluster/tasks/builds/b2g_nexus4_eng.yml +++ b/testing/taskcluster/tasks/builds/b2g_nexus4_eng.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_phone_base.yml' + variables: + build_name: 'nexus-4-eng' + build_type: 'opt' task: scopes: - 'docker-worker:cache:build-nexus-4-eng' @@ -14,4 +17,3 @@ task: extra: locations: img: 'private/build/nexus-4.zip' - diff --git a/testing/taskcluster/tasks/builds/b2g_nexus4_user.yml b/testing/taskcluster/tasks/builds/b2g_nexus4_user.yml index 2f13f39c8e82..b2a00d5fb4a9 100644 --- a/testing/taskcluster/tasks/builds/b2g_nexus4_user.yml +++ b/testing/taskcluster/tasks/builds/b2g_nexus4_user.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/builds/b2g_phone_base.yml' + variables: + build_name: 'nexus-4-user' + build_type: 'opt' task: scopes: - 'docker-worker:cache:build-nexus-4-user' @@ -21,4 +24,3 @@ task: platform: b2g-device-image locations: img: 'private/build/nexus-4.zip' - diff --git a/testing/taskcluster/tasks/builds/mulet_linux.yml b/testing/taskcluster/tasks/builds/mulet_linux.yml index c753568c753c..b62cbdd867ef 100644 --- a/testing/taskcluster/tasks/builds/mulet_linux.yml +++ b/testing/taskcluster/tasks/builds/mulet_linux.yml @@ -1,5 +1,8 @@ $inherits: from: 'tasks/build.yml' + variables: + build_name: 'mulet' + build_type: 'opt' task: metadata: name: '[TC] Mulet Linux' diff --git a/testing/taskcluster/tasks/decision/branch.yml b/testing/taskcluster/tasks/decision/branch.yml index cf2227d709b7..c83ec4c7a870 100644 --- a/testing/taskcluster/tasks/decision/branch.yml +++ b/testing/taskcluster/tasks/decision/branch.yml @@ -67,6 +67,7 @@ tasks: - > source ./bin/decision.sh && ./mach taskcluster-graph + --pushlog-id='{{pushlog_id}}' --message='{{comment}}' --project='{{project}}' --owner='{{owner}}' @@ -78,4 +79,3 @@ tasks: extra: treeherder: symbol: D - diff --git a/testing/taskcluster/tasks/decision/try.yml b/testing/taskcluster/tasks/decision/try.yml index fc310c3e34b8..241e6c515324 100644 --- a/testing/taskcluster/tasks/decision/try.yml +++ b/testing/taskcluster/tasks/decision/try.yml @@ -73,6 +73,7 @@ tasks: checkout-gecko workspace && cd workspace/gecko && ./mach taskcluster-graph + --pushlog-id='{{pushlog_id}}' --project='{{project}}' --message='{{comment}}' --owner='{{owner}}' @@ -84,4 +85,3 @@ tasks: extra: treeherder: symbol: D -