From 60b9ba54207dc6fa135206e516eddc72ed731320 Mon Sep 17 00:00:00 2001 From: Wander Lairson Costa Date: Thu, 28 May 2015 15:21:40 -0300 Subject: [PATCH] Bug 1166745: Reorganize tasks. - Rename nightly -> ota. - Rename lightsaber -> spark. - Add flame kk debug tasks. - Add aries build tasks in treeherder. - Add aries to try. - Add fx-team and inbound tasks. - Only run OTA build on m-c. --HG-- extra : rebase_source : 0eb636e7c168b1c3bd8fce73aaedfd285df4b9e2 --- testing/taskcluster/mach_commands.py | 2 +- ...ld-phone-nightly.sh => build-phone-ota.sh} | 0 ...ghtsaber-nightly.sh => build-spark-ota.sh} | 2 +- .../{build-lightsaber.sh => build-spark.sh} | 2 +- .../scripts/phone-builder/pre-build.sh | 2 +- .../tasks/branches/b2g-inbound/job_flags.yml | 27 +-- .../tasks/branches/base_job_flags.yml | 5 +- .../taskcluster/tasks/branches/base_jobs.yml | 180 ++++++++++++++++++ .../tasks/branches/fx-team/job_flags.yml | 7 + .../branches/mozilla-central/job_flags.yml | 158 +-------------- .../branches/mozilla-inbound/job_flags.yml | 7 + .../tasks/branches/try/job_flags.yml | 16 ++ .../b2g_aries_lightsaber_nightly_debug.yml | 21 -- .../b2g_aries_lightsaber_nightly_opt.yml | 17 -- .../tasks/builds/b2g_aries_spark_debug.yml | 41 ++++ ...tsaber_eng.yml => b2g_aries_spark_eng.yml} | 2 +- .../tasks/builds/b2g_aries_spark_opt.yml | 39 ++++ ..._base.yml => b2g_aries_spark_ota_base.yml} | 8 +- .../builds/b2g_aries_spark_ota_debug.yml | 17 ++ .../tasks/builds/b2g_aries_spark_ota_opt.yml | 16 ++ .../tasks/builds/b2g_flame_kk_debug.yml | 38 ++++ .../tasks/builds/b2g_flame_kk_eng.yml | 3 + .../builds/b2g_flame_kk_nightly_debug.yml | 18 -- .../tasks/builds/b2g_flame_kk_nightly_opt.yml | 17 -- .../tasks/builds/b2g_flame_kk_opt.yml | 3 + ...tly_base.yml => b2g_flame_kk_ota_base.yml} | 5 +- .../tasks/builds/b2g_flame_kk_ota_debug.yml | 17 ++ .../tasks/builds/b2g_flame_kk_ota_opt.yml | 16 ++ 28 files changed, 418 insertions(+), 268 deletions(-) rename testing/taskcluster/scripts/phone-builder/{build-phone-nightly.sh => build-phone-ota.sh} (100%) rename testing/taskcluster/scripts/phone-builder/{build-lightsaber-nightly.sh => build-spark-ota.sh} (99%) rename testing/taskcluster/scripts/phone-builder/{build-lightsaber.sh => build-spark.sh} (98%) create mode 100644 testing/taskcluster/tasks/branches/base_jobs.yml create mode 100644 testing/taskcluster/tasks/branches/fx-team/job_flags.yml create mode 100644 testing/taskcluster/tasks/branches/mozilla-inbound/job_flags.yml delete mode 100644 testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml delete mode 100644 testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml create mode 100644 testing/taskcluster/tasks/builds/b2g_aries_spark_debug.yml rename testing/taskcluster/tasks/builds/{b2g_aries_lightsaber_eng.yml => b2g_aries_spark_eng.yml} (92%) create mode 100644 testing/taskcluster/tasks/builds/b2g_aries_spark_opt.yml rename testing/taskcluster/tasks/builds/{b2g_aries_lightsaber_nightly_base.yml => b2g_aries_spark_ota_base.yml} (72%) create mode 100644 testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml create mode 100644 testing/taskcluster/tasks/builds/b2g_aries_spark_ota_opt.yml create mode 100644 testing/taskcluster/tasks/builds/b2g_flame_kk_debug.yml delete mode 100644 testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_debug.yml delete mode 100644 testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_opt.yml rename testing/taskcluster/tasks/builds/{b2g_flame_kk_nightly_base.yml => b2g_flame_kk_ota_base.yml} (77%) create mode 100644 testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml create mode 100644 testing/taskcluster/tasks/builds/b2g_flame_kk_ota_opt.yml diff --git a/testing/taskcluster/mach_commands.py b/testing/taskcluster/mach_commands.py index f8a3d16af47a..7f6e95404f8d 100644 --- a/testing/taskcluster/mach_commands.py +++ b/testing/taskcluster/mach_commands.py @@ -45,7 +45,7 @@ TREEHERDER_ROUTES = { DEFAULT_TRY = 'try: -b do -p all -u all' DEFAULT_JOB_PATH = os.path.join( - ROOT, 'tasks', 'branches', 'mozilla-central', 'job_flags.yml' + ROOT, 'tasks', 'branches', 'base_jobs.yml' ) def load_mozharness_info(): diff --git a/testing/taskcluster/scripts/phone-builder/build-phone-nightly.sh b/testing/taskcluster/scripts/phone-builder/build-phone-ota.sh similarity index 100% rename from testing/taskcluster/scripts/phone-builder/build-phone-nightly.sh rename to testing/taskcluster/scripts/phone-builder/build-phone-ota.sh diff --git a/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh b/testing/taskcluster/scripts/phone-builder/build-spark-ota.sh similarity index 99% rename from testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh rename to testing/taskcluster/scripts/phone-builder/build-spark-ota.sh index 23d4cd89a996..3dfdc4de13ef 100755 --- a/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh +++ b/testing/taskcluster/scripts/phone-builder/build-spark-ota.sh @@ -1,4 +1,4 @@ -#! /bin/bash -vex +#!/bin/bash -vex . pre-build.sh diff --git a/testing/taskcluster/scripts/phone-builder/build-lightsaber.sh b/testing/taskcluster/scripts/phone-builder/build-spark.sh similarity index 98% rename from testing/taskcluster/scripts/phone-builder/build-lightsaber.sh rename to testing/taskcluster/scripts/phone-builder/build-spark.sh index ec010778eaee..861e5147a876 100755 --- a/testing/taskcluster/scripts/phone-builder/build-lightsaber.sh +++ b/testing/taskcluster/scripts/phone-builder/build-spark.sh @@ -1,4 +1,4 @@ -#! /bin/bash -vex +#!/bin/bash -vex . pre-build.sh diff --git a/testing/taskcluster/scripts/phone-builder/pre-build.sh b/testing/taskcluster/scripts/phone-builder/pre-build.sh index 8699953a6495..b1125fb0321b 100755 --- a/testing/taskcluster/scripts/phone-builder/pre-build.sh +++ b/testing/taskcluster/scripts/phone-builder/pre-build.sh @@ -1,4 +1,4 @@ -#! /bin/bash -vex +#!/bin/bash -vex # Ensure all the scripts in this dir are on the path.... DIRNAME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) diff --git a/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml b/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml index 98d886caefe3..daab36aad14b 100644 --- a/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml +++ b/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml @@ -3,30 +3,5 @@ # see /testing/taskcluster/tasks/job_flags.yml $inherits: - from: tasks/branches/mozilla-central/job_flags.yml + from: tasks/branches/base_jobs.yml -builds: - flame-kk: - platforms: - - b2g - types: - opt: - task: tasks/builds/b2g_flame_kk_opt.yml - -tests: - gaia-ui-test-sanity: - allowed_build_tasks: - tasks/builds/b2g_flame_kk_eng.yml: - task: tasks/tests/flame_kk_gaia_ui_test_sanity.yml - gaia-ui-test-functional: - allowed_build_tasks: - tasks/builds/b2g_flame_kk_eng.yml: - task: tasks/tests/flame_kk_gaia_ui_test_functional.yml - gaia-ui-test-functional-dsds: - allowed_build_tasks: - tasks/builds/b2g_flame_kk_eng.yml: - task: tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml - gaia-ui-test-unit: - allowed_build_tasks: - tasks/builds/b2g_flame_kk_eng.yml: - task: tasks/tests/flame_kk_gaia_ui_test_unit.yml diff --git a/testing/taskcluster/tasks/branches/base_job_flags.yml b/testing/taskcluster/tasks/branches/base_job_flags.yml index 643886b65995..f08738d64a4f 100644 --- a/testing/taskcluster/tasks/branches/base_job_flags.yml +++ b/testing/taskcluster/tasks/branches/base_job_flags.yml @@ -16,14 +16,15 @@ flags: - linux64-mulet # Firefox desktop - b2g gecko linux 64 bit - macosx64_gecko # b2g desktop osx 64 bit - win32_gecko # b2g desktop win 32 bit - - flame-kk-nightly + - flame-kk-ota - flame-kk # b2g flame kitkat - flame-kk-eng # b2g flame eng build - dolphin - dolphin-eng - dolphin-512 - dolphin-512-eng - - aries-nightly + - aries + - aries-ota - aries-eng - android-api-11 diff --git a/testing/taskcluster/tasks/branches/base_jobs.yml b/testing/taskcluster/tasks/branches/base_jobs.yml new file mode 100644 index 000000000000..7d983dc6ee90 --- /dev/null +++ b/testing/taskcluster/tasks/branches/base_jobs.yml @@ -0,0 +1,180 @@ +--- +# For complete sample of all build and test jobs, +# see /testing/taskcluster/tasks/job_flags.yml + +$inherits: + from: tasks/branches/base_job_flags.yml + +builds: + linux64_gecko: + platforms: + - b2g + types: + opt: + task: tasks/builds/b2g_desktop_opt.yml + debug: + task: tasks/builds/b2g_desktop_debug.yml + linux64-mulet: + platforms: + - Mulet Linux + types: + opt: + task: tasks/builds/mulet_linux.yml + emulator-kk: + platfoms: + - b2g + types: + opt: + task: tasks/builds/b2g_emulator_kk_opt.yml + debug: + task: tasks/builds/b2g_emulator_kk_debug.yml + emulator-l: + platfoms: + - b2g + types: + opt: + task: tasks/builds/b2g_emulator_l_opt.yml + debug: + task: tasks/builds/b2g_emulator_l_debug.yml + emulator-jb: + platfoms: + - b2g + types: + opt: + task: tasks/builds/b2g_emulator_jb_opt.yml + debug: + task: tasks/builds/b2g_emulator_jb_debug.yml + emulator: + platfoms: + - b2g + types: + opt: + task: tasks/builds/b2g_emulator_ics_opt.yml + debug: + task: tasks/builds/b2g_emulator_ics_debug.yml + 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_spark_eng.yml + 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 + +tests: + cppunit: + allowed_build_tasks: + tasks/builds/b2g_emulator_ics_opt.yml: + task: tasks/tests/b2g_emulator_cpp_unit.yml + tasks/builds/b2g_emulator_ics_debug.yml: + task: tasks/tests/b2g_emulator_cpp_unit.yml + crashtest: + allowed_build_tasks: + tasks/builds/b2g_emulator_ics_opt.yml: + task: tasks/tests/b2g_emulator_crashtest.yml + gaia-build: + allowed_build_tasks: + tasks/builds/b2g_desktop_opt.yml: + task: tasks/tests/b2g_build_test.yml + gaia-build-unit: + allowed_build_tasks: + tasks/builds/b2g_desktop_opt.yml: + task: tasks/tests/b2g_build_unit.yml + gaia-js-integration: + allowed_build_tasks: + tasks/builds/b2g_desktop_opt.yml: + task: tasks/tests/b2g_gaia_js_integration_tests.yml + gaia-linter: + allowed_build_tasks: + tasks/builds/b2g_desktop_opt.yml: + task: tasks/tests/b2g_linter.yml + gaia-ui-test-accessibility: + allowed_build_tasks: + tasks/builds/b2g_desktop_opt.yml: + task: tasks/tests/b2g_gaia_ui_test_accessibility.yml + tasks/builds/b2g_desktop_debug.yml: + task: tasks/tests/b2g_gaia_ui_test_accessibility.yml + gaia-ui-test-functional: + allowed_build_tasks: + tasks/builds/b2g_desktop_opt.yml: + task: tasks/tests/b2g_gaia_ui_test_functional.yml + tasks/builds/b2g_desktop_debug.yml: + task: tasks/tests/b2g_gaia_ui_test_functional.yml + tasks/builds/b2g_flame_kk_eng.yml: + task: tasks/tests/flame_kk_gaia_ui_test_functional.yml + gaia-ui-test-functional-dsds: + allowed_build_tasks: + tasks/builds/b2g_flame_kk_eng.yml: + task: tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml + gaia-ui-test-sanity: + allowed_build_tasks: + tasks/builds/b2g_flame_kk_eng.yml: + task: tasks/tests/flame_kk_gaia_ui_test_sanity.yml + gaia-ui-test-unit: + allowed_build_tasks: + tasks/builds/b2g_desktop_opt.yml: + task: tasks/tests/b2g_gaia_ui_test_unit.yml + tasks/builds/b2g_desktop_debug.yml: + task: tasks/tests/b2g_gaia_ui_test_unit.yml + tasks/builds/b2g_flame_kk_eng.yml: + task: tasks/tests/flame_kk_gaia_ui_test_unit.yml + gaia-unit: + allowed_build_tasks: + tasks/builds/b2g_desktop_opt.yml: + task: tasks/tests/b2g_gaia_unit.yml + marionette: + allowed_build_tasks: + tasks/builds/b2g_emulator_ics_opt.yml: + task: tasks/tests/b2g_emulator_marionette.yml + marionette-webapi: + allowed_build_tasks: + tasks/builds/b2g_emulator_ics_opt.yml: + task: tasks/tests/b2g_emulator_marionette_webapi.yml + mochitest: + allowed_build_tasks: + tasks/builds/b2g_emulator_ics_opt.yml: + task: tasks/tests/b2g_emulator_mochitest.yml + tasks/builds/b2g_emulator_ics_debug.yml: + task: tasks/tests/b2g_emulator_mochitest.yml + tasks/builds/mulet_linux.yml: + task: tasks/tests/mulet_mochitests.yml + mochitest-oop: + allowed_build_tasks: + tasks/builds/b2g_desktop_opt.yml: + task: tasks/tests/b2g_mochitest_oop.yml + reftest: + allowed_build_tasks: + tasks/builds/mulet_linux.yml: + task: tasks/tests/mulet_reftests.yml + tasks/builds/b2g_emulator_ics_opt.yml: + task: tasks/tests/b2g_emulator_reftest.yml + reftest-sanity-oop: + allowed_build_tasks: + tasks/builds/b2g_desktop_opt.yml: + task: tasks/tests/b2g_reftests_sanity_oop.yml + xpcshell: + allowed_build_tasks: + tasks/builds/b2g_emulator_ics_opt.yml: + task: tasks/tests/b2g_emulator_xpcshell_chunked.yml + tasks/builds/b2g_emulator_ics_debug.yml: + task: tasks/tests/b2g_emulator_xpcshell_chunked.yml diff --git a/testing/taskcluster/tasks/branches/fx-team/job_flags.yml b/testing/taskcluster/tasks/branches/fx-team/job_flags.yml new file mode 100644 index 000000000000..daab36aad14b --- /dev/null +++ b/testing/taskcluster/tasks/branches/fx-team/job_flags.yml @@ -0,0 +1,7 @@ +--- +# For complete sample of all build and test jobs, +# see /testing/taskcluster/tasks/job_flags.yml + +$inherits: + from: tasks/branches/base_jobs.yml + diff --git a/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml b/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml index 8604eb41219a..f97fa9351553 100644 --- a/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml +++ b/testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml @@ -3,166 +3,22 @@ # see /testing/taskcluster/tasks/job_flags.yml $inherits: - from: tasks/branches/base_job_flags.yml + from: tasks/branches/base_jobs.yml builds: - linux64_gecko: + aries-ota: platforms: - b2g types: opt: - task: tasks/builds/b2g_desktop_opt.yml + task: tasks/builds/b2g_aries_spark_ota_opt.yml debug: - task: tasks/builds/b2g_desktop_debug.yml - linux64-mulet: - platforms: - - Mulet Linux - types: - opt: - task: tasks/builds/mulet_linux.yml - emulator-kk: - platfoms: - - b2g - types: - opt: - task: tasks/builds/b2g_emulator_kk_opt.yml - debug: - task: tasks/builds/b2g_emulator_kk_debug.yml - emulator-l: - platfoms: - - b2g - types: - opt: - task: tasks/builds/b2g_emulator_l_opt.yml - debug: - task: tasks/builds/b2g_emulator_l_debug.yml - emulator-jb: - platfoms: - - b2g - types: - opt: - task: tasks/builds/b2g_emulator_jb_opt.yml - debug: - task: tasks/builds/b2g_emulator_jb_debug.yml - emulator: - platfoms: - - b2g - types: - opt: - task: tasks/builds/b2g_emulator_ics_opt.yml - debug: - task: tasks/builds/b2g_emulator_ics_debug.yml - aries-nightly: + task: tasks/builds/b2g_aries_spark_ota_debug.yml + flame-kk-ota: platforms: - b2g types: opt: - task: tasks/builds/b2g_aries_lightsaber_nightly_opt.yml + task: tasks/builds/b2g_flame_kk_ota_opt.yml debug: - task: tasks/builds/b2g_aries_lightsaber_nightly_debug.yml - aries-eng: - platforms: - - b2g - types: - opt: - task: tasks/builds/b2g_aries_lightsaber_eng.yml - flame-kk-nightly: - platforms: - - b2g - types: - opt: - task: tasks/builds/b2g_flame_kk_nightly_opt.yml - debug: - task: tasks/builds/b2g_flame_kk_nightly_debug.yml - flame-kk-eng: - platforms: - - b2g - types: - opt: - task: tasks/builds/b2g_flame_kk_eng.yml - -tests: - cppunit: - allowed_build_tasks: - tasks/builds/b2g_emulator_ics_opt.yml: - task: tasks/tests/b2g_emulator_cpp_unit.yml - tasks/builds/b2g_emulator_ics_debug.yml: - task: tasks/tests/b2g_emulator_cpp_unit.yml - crashtest: - allowed_build_tasks: - tasks/builds/b2g_emulator_ics_opt.yml: - task: tasks/tests/b2g_emulator_crashtest.yml - gaia-build: - allowed_build_tasks: - tasks/builds/b2g_desktop_opt.yml: - task: tasks/tests/b2g_build_test.yml - gaia-build-unit: - allowed_build_tasks: - tasks/builds/b2g_desktop_opt.yml: - task: tasks/tests/b2g_build_unit.yml - gaia-js-integration: - allowed_build_tasks: - tasks/builds/b2g_desktop_opt.yml: - task: tasks/tests/b2g_gaia_js_integration_tests.yml - gaia-linter: - allowed_build_tasks: - tasks/builds/b2g_desktop_opt.yml: - task: tasks/tests/b2g_linter.yml - gaia-ui-test-accessibility: - allowed_build_tasks: - tasks/builds/b2g_desktop_opt.yml: - task: tasks/tests/b2g_gaia_ui_test_accessibility.yml - tasks/builds/b2g_desktop_debug.yml: - task: tasks/tests/b2g_gaia_ui_test_accessibility.yml - gaia-ui-test-functional: - allowed_build_tasks: - tasks/builds/b2g_desktop_opt.yml: - task: tasks/tests/b2g_gaia_ui_test_functional.yml - tasks/builds/b2g_desktop_debug.yml: - task: tasks/tests/b2g_gaia_ui_test_functional.yml - gaia-ui-test-unit: - allowed_build_tasks: - tasks/builds/b2g_desktop_opt.yml: - task: tasks/tests/b2g_gaia_ui_test_unit.yml - tasks/builds/b2g_desktop_debug.yml: - task: tasks/tests/b2g_gaia_ui_test_unit.yml - gaia-unit: - allowed_build_tasks: - tasks/builds/b2g_desktop_opt.yml: - task: tasks/tests/b2g_gaia_unit.yml - marionette: - allowed_build_tasks: - tasks/builds/b2g_emulator_ics_opt.yml: - task: tasks/tests/b2g_emulator_marionette.yml - marionette-webapi: - allowed_build_tasks: - tasks/builds/b2g_emulator_ics_opt.yml: - task: tasks/tests/b2g_emulator_marionette_webapi.yml - mochitest: - allowed_build_tasks: - tasks/builds/b2g_emulator_ics_opt.yml: - task: tasks/tests/b2g_emulator_mochitest.yml - tasks/builds/b2g_emulator_ics_debug.yml: - task: tasks/tests/b2g_emulator_mochitest.yml - tasks/builds/mulet_linux.yml: - task: tasks/tests/mulet_mochitests.yml - mochitest-oop: - allowed_build_tasks: - tasks/builds/b2g_desktop_opt.yml: - task: tasks/tests/b2g_mochitest_oop.yml - reftest: - allowed_build_tasks: - tasks/builds/mulet_linux.yml: - task: tasks/tests/mulet_reftests.yml - tasks/builds/b2g_emulator_ics_opt.yml: - task: tasks/tests/b2g_emulator_reftest.yml - reftest-sanity-oop: - allowed_build_tasks: - tasks/builds/b2g_desktop_opt.yml: - task: tasks/tests/b2g_reftests_sanity_oop.yml - xpcshell: - allowed_build_tasks: - tasks/builds/b2g_emulator_ics_opt.yml: - task: tasks/tests/b2g_emulator_xpcshell_chunked.yml - tasks/builds/b2g_emulator_ics_debug.yml: - task: tasks/tests/b2g_emulator_xpcshell_chunked.yml + task: tasks/builds/b2g_flame_kk_ota_debug.yml diff --git a/testing/taskcluster/tasks/branches/mozilla-inbound/job_flags.yml b/testing/taskcluster/tasks/branches/mozilla-inbound/job_flags.yml new file mode 100644 index 000000000000..daab36aad14b --- /dev/null +++ b/testing/taskcluster/tasks/branches/mozilla-inbound/job_flags.yml @@ -0,0 +1,7 @@ +--- +# For complete sample of all build and test jobs, +# see /testing/taskcluster/tasks/job_flags.yml + +$inherits: + from: tasks/branches/base_jobs.yml + diff --git a/testing/taskcluster/tasks/branches/try/job_flags.yml b/testing/taskcluster/tasks/branches/try/job_flags.yml index c886c926698b..686431667569 100644 --- a/testing/taskcluster/tasks/branches/try/job_flags.yml +++ b/testing/taskcluster/tasks/branches/try/job_flags.yml @@ -64,12 +64,28 @@ builds: task: tasks/builds/b2g_emulator_ics_opt.yml debug: task: tasks/builds/b2g_emulator_ics_debug.yml + 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_spark_eng.yml 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 diff --git a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml deleted file mode 100644 index 32684836b046..000000000000 --- a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml +++ /dev/null @@ -1,21 +0,0 @@ -$inherits: - from: 'tasks/builds/b2g_aries_lightsaber_nightly_base.yml' - variables: - build_name: 'aries' - build_type: 'debug' -task: - metadata: - name: '[TC] B2G Aries Nightly (userdebug)' - scopes: - - 'docker-worker:cache:build-aries-lightsaber-nightly-debug' - extra: - treeherder: - collection: - debug: true - payload: - cache: - build-aries-lightsaber-nightly-debug: /home/worker/workspace - env: - VARIANT: userdebug - B2G_DEBUG: 0 - diff --git a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml deleted file mode 100644 index 83643874da5f..000000000000 --- a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml +++ /dev/null @@ -1,17 +0,0 @@ -$inherits: - from: 'tasks/builds/b2g_aries_lightsaber_nightly_base.yml' - variables: - build_name: 'aries' - build_type: 'opt' -task: - metadata: - name: '[TC] B2G Aries Nightly (user)' - scopes: - - 'docker-worker:cache:build-aries-lightsaber-nightly-user' - - payload: - cache: - build-aries-lightsaber-nightly-user: /home/worker/workspace - env: - VARIANT: user - diff --git a/testing/taskcluster/tasks/builds/b2g_aries_spark_debug.yml b/testing/taskcluster/tasks/builds/b2g_aries_spark_debug.yml new file mode 100644 index 000000000000..3327b5744d41 --- /dev/null +++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_debug.yml @@ -0,0 +1,41 @@ +$inherits: + from: 'tasks/builds/b2g_phone_base.yml' + variables: + build_name: 'aries' + build_type: 'debug' +task: + workerType: flame-kk + scopes: + - 'docker-worker:cache:build-aries-debug' + metadata: + name: '[TC] B2G Aries Debug' + + payload: + cache: + build-aries-debug: /home/worker/workspace + env: + TARGET: 'aries' + DEBUG: 0 + VARIANT: userdebug + GAIA_OPTIMIZE: '1' + B2G_SYSTEM_APPS: '1' + MOZHARNESS_CONFIG: b2g/taskcluster-spark.py + command: + - > + checkout-gecko workspace && + cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder && + buildbot_step 'Build' ./build-phone.sh $HOME/workspace + extra: + treeherderEnv: + - production + - staging + treeherder: + symbol: B + groupSymbol: Aries + groupName: Aries Device Image + machine: + platform: b2g-device-image + collection: + debug: true + locations: + img: 'private/build/aries.zip' diff --git a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml b/testing/taskcluster/tasks/builds/b2g_aries_spark_eng.yml similarity index 92% rename from testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml rename to testing/taskcluster/tasks/builds/b2g_aries_spark_eng.yml index 4297c2625a08..e42443b33fc5 100644 --- a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml +++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_eng.yml @@ -23,7 +23,7 @@ task: - > checkout-gecko workspace && cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder && - buildbot_step 'Build' ./build-lightsaber.sh $HOME/workspace + buildbot_step 'Build' ./build-spark.sh $HOME/workspace extra: treeherderEnv: - production diff --git a/testing/taskcluster/tasks/builds/b2g_aries_spark_opt.yml b/testing/taskcluster/tasks/builds/b2g_aries_spark_opt.yml new file mode 100644 index 000000000000..41dfa34d9ea1 --- /dev/null +++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_opt.yml @@ -0,0 +1,39 @@ +$inherits: + from: 'tasks/builds/b2g_phone_base.yml' + variables: + build_name: 'aries' + build_type: 'opt' +task: + workerType: flame-kk + scopes: + - 'docker-worker:cache:build-aries-opt' + metadata: + name: '[TC] B2G Aries Opt' + + payload: + cache: + build-aries-opt: /home/worker/workspace + env: + TARGET: 'aries' + DEBUG: 0 + VARIANT: user + GAIA_OPTIMIZE: '1' + B2G_SYSTEM_APPS: '1' + MOZHARNESS_CONFIG: b2g/taskcluster-spark.py + command: + - > + checkout-gecko workspace && + cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder && + buildbot_step 'Build' ./build-phone.sh $HOME/workspace + extra: + treeherderEnv: + - production + - staging + treeherder: + symbol: B + groupSymbol: Aries + groupName: Aries Device Image + machine: + platform: b2g-device-image + locations: + img: 'private/build/aries.zip' diff --git a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_base.yml similarity index 72% rename from testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml rename to testing/taskcluster/tasks/builds/b2g_aries_spark_ota_base.yml index 40f95ecee2c2..6f4d9fc98598 100644 --- a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml +++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_base.yml @@ -15,16 +15,10 @@ task: - > checkout-gecko workspace && cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder && - buildbot_step 'Build' ./build-lightsaber-nightly.sh $HOME/workspace + buildbot_step 'Build' ./build-spark-ota.sh $HOME/workspace extra: - treeherderEnv: - - production - - staging treeherder: - symbol: B - groupSymbol: Aries - groupName: Aries Device Image machine: platform: b2g-device-image locations: diff --git a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml new file mode 100644 index 000000000000..67aabfeda99a --- /dev/null +++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml @@ -0,0 +1,17 @@ +$inherits: + from: 'tasks/builds/b2g_aries_spark_ota_base.yml' + variables: + build_name: 'aries' + build_type: 'debug' +task: + metadata: + name: '[TC] B2G Aries OTA (userdebug)' + scopes: + - 'docker-worker:cache:build-aries-spark-ota-debug' + payload: + cache: + build-aries-spark-ota-debug: /home/worker/workspace + env: + VARIANT: userdebug + B2G_DEBUG: 0 + diff --git a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_opt.yml b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_opt.yml new file mode 100644 index 000000000000..5f36d339031d --- /dev/null +++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_opt.yml @@ -0,0 +1,16 @@ +$inherits: + from: 'tasks/builds/b2g_aries_spark_ota_base.yml' + variables: + build_name: 'aries' + build_type: 'opt' +task: + metadata: + name: '[TC] B2G Aries OTA (user)' + scopes: + - 'docker-worker:cache:build-aries-spark-ota-user' + payload: + cache: + build-aries-spark-ota-user: /home/worker/workspace + env: + VARIANT: user + diff --git a/testing/taskcluster/tasks/builds/b2g_flame_kk_debug.yml b/testing/taskcluster/tasks/builds/b2g_flame_kk_debug.yml new file mode 100644 index 000000000000..1aa6c45e2c4a --- /dev/null +++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_debug.yml @@ -0,0 +1,38 @@ +$inherits: + from: 'tasks/builds/b2g_phone_base.yml' + variables: + build_name: 'flame-kk' + build_type: 'debug' +task: + workerType: flame-kk + scopes: + - 'docker-worker:cache:build-flame-kk-debug' + metadata: + name: '[TC] B2G Flame KK Debug' + + payload: + cache: + build-flame-kk-debug: /home/worker/workspace + env: + TARGET: 'flame-kk' + DEBUG: 0 + VARIANT: userdebug + command: + - > + checkout-gecko workspace && + cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder && + buildbot_step 'Build' ./build-phone.sh $HOME/workspace + extra: + treeherderEnv: + - production + - staging + treeherder: + symbol: B + groupSymbol: Flame-KK + groupName: Flame KitKat Device Image + machine: + platform: b2g-device-image + collection: + debug: true + locations: + img: 'private/build/flame-kk.zip' diff --git a/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml b/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml index 36c3128bcaff..62dda858ceb9 100644 --- a/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml +++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml @@ -25,6 +25,9 @@ task: cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder && buildbot_step 'Build' ./build-phone.sh $HOME/workspace extra: + treeherderEnv: + - production + - staging treeherder: symbol: Be groupSymbol: Flame-KK diff --git a/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_debug.yml b/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_debug.yml deleted file mode 100644 index 22fb194501e7..000000000000 --- a/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_debug.yml +++ /dev/null @@ -1,18 +0,0 @@ -$inherits: - from: 'tasks/builds/b2g_flame_kk_nightly_base.yml' - variables: - build_name: 'flame-kk' - build_type: 'debug' -task: - metadata: - name: '[TC] B2G Flame KK Nightly (userdebug)' - workerType: balrog - scopes: - - 'docker-worker:cache:build-flame-kk-nightly-debug' - - payload: - cache: - build-flame-kk-nightly-debug: /home/worker/workspace - env: - VARIANT: userdebug - B2G_DEBUG: 0 diff --git a/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_opt.yml b/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_opt.yml deleted file mode 100644 index 65ed41d7e60d..000000000000 --- a/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_opt.yml +++ /dev/null @@ -1,17 +0,0 @@ -$inherits: - from: 'tasks/builds/b2g_flame_kk_nightly_base.yml' - variables: - build_name: 'flame-kk' - build_type: 'opt' -task: - metadata: - name: '[TC] B2G Flame KK Nightly (user)' - workerType: balrog - scopes: - - 'docker-worker:cache:build-flame-kk-nightly-user' - - payload: - cache: - build-flame-kk-nightly-user: /home/worker/workspace - env: - VARIANT: user diff --git a/testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml b/testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml index a93f3b0c583e..f85bb9bfac78 100644 --- a/testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml @@ -22,6 +22,9 @@ task: cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder && buildbot_step 'Build' ./build-phone.sh $HOME/workspace extra: + treeherderEnv: + - production + - staging treeherder: symbol: B groupSymbol: Flame-KK diff --git a/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_base.yml b/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_base.yml similarity index 77% rename from testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_base.yml rename to testing/taskcluster/tasks/builds/b2g_flame_kk_ota_base.yml index c7746472ef8a..d02ae07dac94 100644 --- a/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_base.yml +++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_base.yml @@ -15,13 +15,10 @@ task: - > checkout-gecko workspace && cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder && - buildbot_step 'Build' ./build-phone-nightly.sh $HOME/workspace + buildbot_step 'Build' ./build-phone-ota.sh $HOME/workspace extra: treeherder: - symbol: B - groupSymbol: Flame-KK - groupName: Flame KitKat Device Image machine: platform: b2g-device-image locations: diff --git a/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml b/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml new file mode 100644 index 000000000000..74ed2ad9ed65 --- /dev/null +++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml @@ -0,0 +1,17 @@ +$inherits: + from: 'tasks/builds/b2g_flame_kk_ota_base.yml' + variables: + build_name: 'flame-kk' + build_type: 'debug' +task: + metadata: + name: '[TC] B2G Flame KK OTA (userdebug)' + scopes: + - 'docker-worker:cache:build-flame-kk-ota-debug' + + payload: + cache: + build-flame-kk-ota-debug: /home/worker/workspace + env: + VARIANT: userdebug + B2G_DEBUG: 0 diff --git a/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_opt.yml b/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_opt.yml new file mode 100644 index 000000000000..7d809bb206e1 --- /dev/null +++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_opt.yml @@ -0,0 +1,16 @@ +$inherits: + from: 'tasks/builds/b2g_flame_kk_ota_base.yml' + variables: + build_name: 'flame-kk' + build_type: 'opt' +task: + metadata: + name: '[TC] B2G Flame KK OTA (user)' + scopes: + - 'docker-worker:cache:build-flame-kk-ota-user' + + payload: + cache: + build-flame-kk-ota-user: /home/worker/workspace + env: + VARIANT: user