Fix test selection logic with coverage

The way we called jacoco tasks for gradle will trigger tests outside
those selected by `:baseTests` at al. Remove explicit calls to these
tasks from CI, and use a `-PcheckCoverage` property instead. When combined
with `:baseTests` et al., it will run jacoco tasks only for the selected
tests.

Remove legacy properties `-PskipInstTests`, `-PskipSmokeTests`, etc.
These are now obsolete, and together with the above fix, they do not
serve any purpose in CI anymore.

Author: smola

.circleci/config.continue.yml.j2

@@ -1057,7 +1057,7 @@ build_test_jobs: &build_test_jobs
       name: z_test_<< matrix.testJvm >>_base
       triggeredBy: *core_modules
       gradleTarget: ":baseTest"
-      gradleParameters: "-PskipFlakyTests -PskipInstTests -PskipSmokeTests -PskipProfilingTests -PskipDebuggerTests"
+      gradleParameters: "-PskipFlakyTests"
       stage: core
       cacheType: base
       parallelism: 4
@@ -1070,8 +1070,8 @@ build_test_jobs: &build_test_jobs
         - ok_to_test
       name: z_test_8_base
       triggeredBy: *core_modules
-      gradleTarget: :baseTest jacocoTestReport jacocoTestCoverageVerification
-      gradleParameters: "-PskipFlakyTests -PskipInstTests -PskipSmokeTests -PskipProfilingTests -PskipDebuggerTests"
+      gradleTarget: :baseTest
+      gradleParameters: "-PskipFlakyTests -PcheckCoverage"
       stage: core
       cacheType: base
       parallelism: 4
@@ -1209,7 +1209,7 @@ build_test_jobs: &build_test_jobs
       name: test_<< matrix.testJvm >>_debugger
       maxWorkers: 4
       gradleTarget: ":debuggerTest"
-      gradleParameters: "-PskipFlakyTests"
+      gradleParameters: "-PskipFlakyTests -PcheckCoverage"
       triggeredBy: *debugger_modules
       stage: debugger
       cacheType: base

build.gradle

@@ -165,8 +165,9 @@ allprojects { project ->
 }
 
 
-def testAggregate(String baseTaskName, includePrefixes, excludePrefixes, boolean coverage = false) {
+def testAggregate(String baseTaskName, includePrefixes, excludePrefixes) {
   def createRootTask = { rootTaskName, subProjTaskName ->
+    def coverage = rootProject.hasProperty("checkCoverage")? rootProject.checkCoverage : false
     tasks.register(rootTaskName) { aggTest ->
       subprojects { subproject ->
         if (subproject.property("activePartition") && includePrefixes.any { subproject.path.startsWith(it) } && !excludePrefixes.any { subproject.path.startsWith(it) }) {
@@ -197,7 +198,7 @@ def testAggregate(String baseTaskName, includePrefixes, excludePrefixes, boolean
 testAggregate("smoke", [":dd-smoke-tests"], [])
 testAggregate("instrumentation", [":dd-java-agent:instrumentation"], [])
 testAggregate("profiling", [":dd-java-agent:agent-profiling"], [])
-testAggregate("debugger", [":dd-java-agent:agent-debugger"], [], true)
+testAggregate("debugger", [":dd-java-agent:agent-debugger"], [])
 testAggregate("base", [":"], [
   ":dd-java-agent:instrumentation",
   ":dd-smoke-tests",

dd-java-agent/agent-debugger/build.gradle

@@ -73,15 +73,6 @@ jar {
   from sourceSets.main.output
 }
 
-tasks.withType(Test).configureEach {
-  onlyIf { !project.rootProject.hasProperty("skipDebuggerTests") }
-}
-
 // we want to test with no special reflective access (no --add-opens)
 ext.allowReflectiveAccessToJdk = false
 
-subprojects { Project subProj ->
-  subProj.tasks.withType(Test).configureEach { subTask ->
-    onlyIf { !project.rootProject.hasProperty("skipDebuggerTests") }
-  }
-}

dd-java-agent/agent-profiling/build.gradle

@@ -30,12 +30,6 @@ dependencies {
   testImplementation libs.bundles.mockito
 }
 
-subprojects { Project subProj ->
-  subProj.tasks.withType(Test).configureEach { subTask ->
-    onlyIf { !project.rootProject.hasProperty("skipProfilingTests") }
-  }
-}
-
 configurations {
   // exclude bootstrap dependencies from shadowJar
   runtime {

dd-java-agent/instrumentation/build.gradle

@@ -97,8 +97,6 @@ subprojects { Project subProj ->
         useJUnit()
       }
 
-      onlyIf { !project.rootProject.hasProperty("skipInstTests") }
-
       if (subTask.name in ['latestDepTest', 'latestDepForkedTest']) {
         subTask.jvmArgs '-Dtest.dd.latestDepTest=true'
       }

dd-smoke-tests/build.gradle

@@ -19,8 +19,6 @@ subprojects { Project subProj ->
   subProj.tasks.withType(Test).configureEach { subTask ->
     dependsOn project(':dd-java-agent').tasks.named("shadowJar")
 
-    onlyIf { !project.rootProject.hasProperty("skipSmokeTests") }
-
     // Tests depend on this to know where to run things and what agent jar to use
     jvmArgs "-Ddatadog.smoketest.builddir=${buildDir}"
     jvmArgs "-Ddatadog.smoketest.agent.shadowJar.path=${project(':dd-java-agent').tasks.shadowJar.archiveFile.get()}"