From 974f731a591a11cb71d6c1e5d4af87f028232723 Mon Sep 17 00:00:00 2001 From: Joel Maher Date: Wed, 5 Oct 2016 08:57:50 -0400 Subject: [PATCH] Bug 1300074 - adjust taskcluster task names to match buildbot. r=dustin. MozReview-Commit-ID: BV9stGRhhZG --HG-- extra : rebase_source : 39b630a75acd571555a983c3d6f9dcbf1170d96d --- taskcluster/ci/desktop-test/test-sets.yml | 4 ++-- taskcluster/ci/desktop-test/tests.yml | 2 +- taskcluster/taskgraph/test/test_try_option_syntax.py | 2 +- taskcluster/taskgraph/try_option_syntax.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/taskcluster/ci/desktop-test/test-sets.yml b/taskcluster/ci/desktop-test/test-sets.yml index f5470d25a840..d8ea65e7b966 100644 --- a/taskcluster/ci/desktop-test/test-sets.yml +++ b/taskcluster/ci/desktop-test/test-sets.yml @@ -16,7 +16,7 @@ all-tests: - firefox-ui-functional-local - firefox-ui-functional-remote - gtest - - jittests + - jittest - jsreftest - marionette - mochitest @@ -42,7 +42,7 @@ asan-tests: - firefox-ui-functional-local - firefox-ui-functional-remote - gtest - - jittests + - jittest - jsreftest - marionette - mochitest diff --git a/taskcluster/ci/desktop-test/tests.yml b/taskcluster/ci/desktop-test/tests.yml index caa468ad4fec..f5584aca44dd 100644 --- a/taskcluster/ci/desktop-test/tests.yml +++ b/taskcluster/ci/desktop-test/tests.yml @@ -103,7 +103,7 @@ gtest: extra-options: - --gtest-suite=gtest -jittests: +jittest: description: "JIT Test run" suite: jittest/jittest-chunked treeherder-symbol: tc(Jit) diff --git a/taskcluster/taskgraph/test/test_try_option_syntax.py b/taskcluster/taskgraph/test/test_try_option_syntax.py index d61af6b54412..29aa2d5a909e 100644 --- a/taskcluster/taskgraph/test/test_try_option_syntax.py +++ b/taskcluster/taskgraph/test/test_try_option_syntax.py @@ -33,7 +33,7 @@ def talos_task(n, tp): tasks = {k: v for k, v in [ unittest_task('mochitest-browser-chrome', 'linux'), - unittest_task('mochitest-browser-chrome-e10s', 'linux64'), + unittest_task('mochitest-e10s-browser-chrome', 'linux64'), unittest_task('mochitest-chrome', 'linux'), unittest_task('mochitest-webgl', 'linux'), unittest_task('crashtest-e10s', 'linux'), diff --git a/taskcluster/taskgraph/try_option_syntax.py b/taskcluster/taskgraph/try_option_syntax.py index 411918710cc9..e8d6924872a1 100644 --- a/taskcluster/taskgraph/try_option_syntax.py +++ b/taskcluster/taskgraph/try_option_syntax.py @@ -89,12 +89,12 @@ UNITTEST_ALIASES = { 'mochitest-debug': alias_prefix('mochitest-debug-'), 'mochitest-a11y': alias_contains('mochitest-a11y'), 'mochitest-bc': alias_prefix('mochitest-browser-chrome'), - 'mochitest-bc-e10s': alias_prefix('mochitest-browser-chrome-e10s'), + 'mochitest-e10s-bc': alias_prefix('mochitest-e10s-browser-chrome'), 'mochitest-browser-chrome': alias_prefix('mochitest-browser-chrome'), - 'mochitest-browser-chrome-e10s': alias_prefix('mochitest-browser-chrome-e10s'), + 'mochitest-e10s-browser-chrome': alias_prefix('mochitest-e10s-browser-chrome'), 'mochitest-chrome': alias_contains('mochitest-chrome'), 'mochitest-dt': alias_prefix('mochitest-devtools-chrome'), - 'mochitest-dt-e10s': alias_prefix('mochitest-devtools-chrome-e10s'), + 'mochitest-e10s-dt': alias_prefix('mochitest-e10s-devtools-chrome'), 'mochitest-gl': alias_prefix('mochitest-webgl'), 'mochitest-gl-e10s': alias_prefix('mochitest-webgl-e10s'), 'mochitest-gpu': alias_prefix('mochitest-gpu'),