From 3c5a93bf0f9edf77f1f17841d236e16ebf55bd30 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Fri, 1 Jun 2018 17:54:25 +0200 Subject: [PATCH] Bug 1466077 - Make all ccov test suites inherit the run-on-projects from their ccov build. r=jmaher --- taskcluster/ci/build/linux.yml | 6 +++--- taskcluster/ci/build/windows.yml | 2 +- taskcluster/ci/test/misc.yml | 9 +++++---- taskcluster/ci/test/web-platform.yml | 6 +++--- taskcluster/taskgraph/transforms/tests.py | 18 +++++++++--------- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml index 82964ef4cdf0..bd7f32af1dd8 100644 --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -813,7 +813,7 @@ linux64-jsdcov/opt: platform: linux64-jsdcov/opt symbol: B tier: 2 - run-on-projects: [] + run-on-projects: ['mozilla-central', 'try'] worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 @@ -842,7 +842,7 @@ linux64-ccov/debug: platform: linux64-ccov/debug symbol: B tier: 2 - run-on-projects: [] + run-on-projects: ['mozilla-central', 'try'] worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 @@ -871,7 +871,7 @@ linux64-ccov/opt: platform: linux64-ccov/opt symbol: B tier: 2 - run-on-projects: [] + run-on-projects: ['try'] worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: max-run-time: 36000 diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml index 5c83b822b5bf..9d3b4791ee08 100755 --- a/taskcluster/ci/build/windows.yml +++ b/taskcluster/ci/build/windows.yml @@ -562,7 +562,7 @@ win64-ccov/debug: - builds/taskcluster_base_windows.py - builds/taskcluster_base_win64.py - builds/taskcluster_sub_win64/ccov_debug.py - run-on-projects: [] + run-on-projects: ['mozilla-central', 'try'] toolchains: - win64-clang-cl - win64-rust diff --git a/taskcluster/ci/test/misc.yml b/taskcluster/ci/test/misc.yml index b86c5ffb8d6e..477a80125d62 100644 --- a/taskcluster/ci/test/misc.yml +++ b/taskcluster/ci/test/misc.yml @@ -98,8 +98,9 @@ test-verify: allow-software-gl-layers: false run-on-projects: by-test-platform: - # do not run on ccov; see also the enable_code_coverage transform + # do not run on ccov or jsdcov .*-ccov/.*: [] + .*-jsdcov/.*: [] # do not run on beta or release: usually just confirms earlier results default: ['trunk', 'try'] tier: 2 @@ -137,8 +138,9 @@ test-verify-gpu: allow-software-gl-layers: false run-on-projects: by-test-platform: - # do not run on ccov; see also the enable_code_coverage transform + # do not run on ccov or jsdcov .*-ccov/.*: [] + .*-jsdcov/.*: [] # do not run on beta or release: usually just confirms earlier results default: ['trunk', 'try'] tier: 2 @@ -173,8 +175,7 @@ test-coverage: allow-software-gl-layers: false run-on-projects: by-test-platform: - # only run on mozilla-central and try. - .*-ccov/.*: ['mozilla-central', 'try'] + .*-ccov/.*: built-projects default: [] tier: 2 mozharness: diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml index 7e45a1325b2d..6d3f6f5ec5ca 100644 --- a/taskcluster/ci/test/web-platform.yml +++ b/taskcluster/ci/test/web-platform.yml @@ -141,8 +141,9 @@ test-verify-wpt: max-run-time: 10800 run-on-projects: by-test-platform: - # do not run on ccov; see also the enable_code_coverage transform + # do not run on ccov or jsdcov .*-ccov/.*: [] + .*-jsdcov/.*: [] # do not run on beta or release: usually just confirms earlier results default: ['trunk', 'try'] tier: 2 @@ -157,8 +158,7 @@ test-coverage-wpt: max-run-time: 10800 run-on-projects: by-test-platform: - # only run on mozilla-central and try. - .*-ccov/.*: ['mozilla-central', 'try'] + .*-ccov/.*: built-projects default: [] tier: 2 mozharness: diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py index 43b08f4fc6fc..b9679bd5598a 100644 --- a/taskcluster/taskgraph/transforms/tests.py +++ b/taskcluster/taskgraph/transforms/tests.py @@ -704,13 +704,13 @@ def handle_suite_category(config, tests): def enable_code_coverage(config, tests): """Enable code coverage for the ccov and jsdcov build-platforms""" for test in tests: - if 'ccov' in test['build-platform'] and not test['test-name'].startswith('test-verify'): + if 'ccov' in test['build-platform']: test['mozharness'].setdefault('extra-options', []).append('--code-coverage') test['instance-size'] = 'xlarge' - # Ensure we don't run on inbound/autoland/beta, but if the test is try only, ignore it - if 'mozilla-central' in test['run-on-projects'] or \ - test['run-on-projects'] == 'built-projects': - test['run-on-projects'] = ['mozilla-central', 'try'] + # Ensure we always run on the projects defined by the build, unless the test + # is try only or shouldn't run at all. + if test['run-on-projects'] not in [[], ['try']]: + test['run-on-projects'] = 'built-projects' # Ensure we don't optimize test suites out. # We always want to run all test suites for coverage purposes. @@ -735,10 +735,10 @@ def enable_code_coverage(config, tests): if 'linux' in test['build-platform']: test['docker-image'] = {"in-tree": "desktop1604-test"} elif test['build-platform'] == 'linux64-jsdcov/opt': - # Ensure we don't run on inbound/autoland/beta, but if the test is try only, ignore it - if 'mozilla-central' in test['run-on-projects'] or \ - test['run-on-projects'] == 'built-projects': - test['run-on-projects'] = ['mozilla-central', 'try'] + # Ensure we always run on the projects defined by the build, unless the test + # is try only or shouldn't run at all. + if test['run-on-projects'] not in [[], ['try']]: + test['run-on-projects'] = 'built-projects' test['mozharness'].setdefault('extra-options', []).append('--jsd-code-coverage') yield test