diff --git a/taskcluster/ci/test/tests.yml b/taskcluster/ci/test/tests.yml index 04451c976e57..ed2a63e3e887 100644 --- a/taskcluster/ci/test/tests.yml +++ b/taskcluster/ci/test/tests.yml @@ -116,7 +116,7 @@ crashtest: external-media-tests-base: description: "External Media Test run" suite: external-media-tests - unittest-try-name: 'media-tests' + try-name: 'media-tests' treeherder-symbol: tc-VP(b-m) e10s: false tier: 2 @@ -140,7 +140,7 @@ external-media-tests-twitch: description: "External Media Test Twitch run" suite: external-media-tests/twitch treeherder-symbol: tc-VP(b-t) - unittest-try-name: media-twitch-tests + try-name: media-twitch-tests e10s: false instance-size: by-test-platform: @@ -167,7 +167,7 @@ external-media-tests-twitch: external-media-tests-youtube: description: "External Media Test Youtube run" suite: external-media-tests/youtube - unittest-try-name: media-youtube-tests + try-name: media-youtube-tests treeherder-symbol: tc-VP(b-y) e10s: false tier: 2 @@ -1180,7 +1180,7 @@ robocop: talos-chrome: description: "Talos chrome" suite: talos - talos-try-name: chromez + try-name: chromez treeherder-symbol: tc-T(c) run-on-projects: by-test-platform: @@ -1207,7 +1207,7 @@ talos-chrome: talos-dromaeojs: description: "Talos dromaeojs" suite: talos - talos-try-name: dromaeojs + try-name: dromaeojs treeherder-symbol: tc-T(d) run-on-projects: by-test-platform: @@ -1234,7 +1234,7 @@ talos-dromaeojs: talos-g1: description: "Talos g1" suite: talos - talos-try-name: g1 + try-name: g1 treeherder-symbol: tc-T(g1) run-on-projects: by-test-platform: @@ -1261,7 +1261,7 @@ talos-g1: talos-g2: description: "Talos g2" suite: talos - talos-try-name: g2 + try-name: g2 treeherder-symbol: tc-T(g2) max-run-time: 3600 run-on-projects: @@ -1288,7 +1288,7 @@ talos-g2: talos-g3: description: "Talos g3" suite: talos - talos-try-name: g3 + try-name: g3 treeherder-symbol: tc-T(g3) run-on-projects: by-test-platform: @@ -1315,7 +1315,7 @@ talos-g3: talos-g4: description: "Talos g4" suite: talos - talos-try-name: g4 + try-name: g4 treeherder-symbol: tc-T(g4) run-on-projects: by-test-platform: @@ -1342,7 +1342,7 @@ talos-g4: talos-other: description: "Talos other" suite: talos - talos-try-name: other + try-name: other treeherder-symbol: tc-T(o) run-on-projects: by-test-platform: @@ -1369,7 +1369,7 @@ talos-other: talos-perf-reftest: description: "Talos perf-reftest" suite: talos - talos-try-name: perf-reftest + try-name: perf-reftest treeherder-symbol: tc-T(p) run-on-projects: by-test-platform: @@ -1391,7 +1391,7 @@ talos-perf-reftest: talos-svgr: description: "Talos svgr" suite: talos - talos-try-name: svgr + try-name: svgr treeherder-symbol: tc-T(s) run-on-projects: by-test-platform: @@ -1418,7 +1418,7 @@ talos-svgr: talos-tp5o: description: "Talos tp5o" suite: talos - talos-try-name: tp5o + try-name: tp5o treeherder-symbol: tc-T(tp) run-on-projects: by-test-platform: diff --git a/taskcluster/taskgraph/transforms/job/mozharness_test.py b/taskcluster/taskgraph/transforms/job/mozharness_test.py index 90ab6a35f875..ae2504265d46 100644 --- a/taskcluster/taskgraph/transforms/job/mozharness_test.py +++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py @@ -383,7 +383,7 @@ def mozharness_test_buildbot_bridge(config, job, taskdesc): branch = config.params['project'] platform, build_type = test['build-platform'].split('/') - test_name = test.get('talos-try-name', test['test-name']) + test_name = test.get('try-name', test['test-name']) mozharness = test['mozharness'] # mochitest e10s follows the pattern mochitest-e10s- @@ -395,13 +395,7 @@ def mozharness_test_buildbot_bridge(config, job, taskdesc): 'mochitest-gpu', 'mochitest-e10s', ] - test_name = test.get( - 'talos-try-name', - test.get( - 'unittest-try-name', - test['test-name'] - ) - ) + test_name = test.get('try-name', test['test-name']) if test['e10s'] and 'e10s' not in test_name: test_name += '-e10s' diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py index fcbc48950bd8..9e9624cf3244 100644 --- a/taskcluster/taskgraph/transforms/tests.py +++ b/taskcluster/taskgraph/transforms/tests.py @@ -76,11 +76,9 @@ test_description_schema = Schema({ basestring), # the name by which this test suite is addressed in try syntax; defaults to - # the test-name - Optional('unittest-try-name'): basestring, - - # the name by which this talos test is addressed in try syntax - Optional('talos-try-name'): basestring, + # the test-name. This will translate to the `unittest_try_name` or + # `talos_try_name` attribute. + Optional('try-name'): basestring, # additional tags to mark up this type of test Optional('tags'): {basestring: object}, @@ -345,6 +343,8 @@ def set_defaults(config, tests): else: test.setdefault('webrender', False) + test.setdefault('try-name', test['test-name']) + test.setdefault('os-groups', []) test.setdefault('chunks', 1) test.setdefault('run-on-projects', 'built-projects') @@ -543,6 +543,7 @@ def split_e10s(config, tests): e10s = True if e10s: test['test-name'] += '-e10s' + test['try-name'] += '-e10s' test['e10s'] = True test['attributes']['e10s'] = True group, symbol = split_symbol(test['treeherder-symbol']) @@ -732,11 +733,10 @@ def make_job_description(config, tests): build_label = test['build-label'] - if 'talos-try-name' in test: - try_name = test['talos-try-name'] + try_name = test['try-name'] + if test['suite'] == 'talos': attr_try_name = 'talos_try_name' else: - try_name = test.get('unittest-try-name', test['test-name']) attr_try_name = 'unittest_try_name' attr_build_platform, attr_build_type = test['build-platform'].split('/', 1)