Unify tasks and complete infra testing

Author: vjovanov

.github/workflows/test-changed-infrastructure.yml

@@ -82,16 +82,13 @@ jobs:
         run: |
           ./gradlew pullAllowedDockerImages -Pcoordinates=${{ matrix.coordinates }}
 
-      - name: "Disable docker networking"
-        run: bash ./.github/workflows/scripts/disable-docker.sh
-
       - name: "🔎 Check metadata files content"
         run: |
           ./gradlew checkMetadataFiles -Pcoordinates=${{ matrix.coordinates }}
 
       - name: "🧪 Run '${{ matrix.coordinates }}' tests"
         run: |
-          ./gradlew test -Pcoordinates=${{ matrix.coordinates }}
+          ./gradlew testInfra -Pcoordinates=${{ matrix.coordinates }} -Pparallelism=1 --stacktrace
 
   all-infrastructure-passed:
     name: "🧪 All build-logic triggered tests have passed"

AGENTS.md

@@ -11,8 +11,8 @@
   - Windows: gradlew.bat <task> [options]
 - Tip: add --stacktrace for debugging
 
-## One command for complete testing (use at the end of the task to verify)
-./gradlew testAllParallel -Pparallelism=4
+## One command for complete infrastructure testing
+./gradlew testAllInfra -Pparallelism=4 --stacktrace
 
 ## Code Style
 - Always try to reuse existing code.

build.gradle

@@ -23,7 +23,7 @@ Tip: When debugging locally, add `--stacktrace` for better error output.
 
 ### End-to-end testing before the commit
 ```console
-./gradlew testAllParallel --stacktrace
+./gradlew testAllInfra --stacktrace
 ```
 
 ### Style and formatting

docs/DEVELOPING.md

@@ -4,7 +4,6 @@
  * You should have received a copy of the CC0 legalcode along with this
  * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
-
 plugins {
     id 'groovy-gradle-plugin'
     id 'maven-publish'

tests/tck-build-logic/build.gradle

@@ -4,7 +4,6 @@
  * You should have received a copy of the CC0 legalcode along with this
  * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
-
 pluginManagement {
     repositories {
         mavenCentral()

tests/tck-build-logic/settings.gradle

@@ -1,3 +1,9 @@
+/*
+ * Copyright and related rights waived via CC0
+ *
+ * You should have received a copy of the CC0 legalcode along with this
+ * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
 import org.graalvm.internal.tck.harness.TckExtension
 
 TckExtension testUtils = project.extensions.create("tck", TckExtension, project)

tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck-base.gradle

@@ -4,7 +4,6 @@
  * You should have received a copy of the CC0 legalcode along with this
  * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
-
 plugins {
     id 'org.graalvm.internal.tck-base'
 }
@@ -29,6 +28,7 @@ import org.graalvm.internal.tck.harness.tasks.NativeTestCompileInvocationTask
 import org.graalvm.internal.tck.harness.tasks.FetchExistingLibrariesWithNewerVersionsTask
 import org.gradle.util.internal.VersionNumber
 import org.graalvm.internal.tck.harness.tasks.ComputeAndPullAllowedDockerImagesTask
+import org.graalvm.internal.tck.harness.tasks.CheckMetadataFilesAllTask
 import org.graalvm.internal.tck.utils.CoordinateUtils
 import org.graalvm.internal.tck.utils.MetadataGenerationUtils
 
@@ -63,83 +63,66 @@ if (CoordinateUtils.isFractionalBatch(coordinateFilter)) {
 matchingCoordinates = matchingCoordinates.findAll { !it.startsWith("samples:") }
 
 
-// gradle checkstyle -Pcoordinates=<maven-coordinates>
-Provider<Task> checkstyle = tasks.register("checkstyle") { task ->
+ // gradle checkstyle -Pcoordinates=<maven-coordinates>
+tasks.register("checkstyle", CheckstyleInvocationTask.class) { task ->
     task.setDescription("Runs checkstyle on all subprojects")
     task.setGroup(JavaBasePlugin.VERIFICATION_GROUP)
-} as Provider<Task>
+}
 
  // gradle compileTestJava -Pcoordinates=<maven-coordinates>
-Provider<Task> compileTestJava = tasks.register("compileTestJava") { task ->
+tasks.register("compileTestJava", CompileTestJavaInvocationTask.class) { task ->
     task.setDescription("Compiles sources (javac) for all subprojects")
     task.setGroup(LifecycleBasePlugin.BUILD_GROUP)
-} as Provider<Task>
+}
 
-// gradle javaTest -Pcoordinates=<maven-coordinates>
-Provider<Task> javaTest = tasks.register("javaTest") { task ->
+ // gradle javaTest -Pcoordinates=<maven-coordinates>
+tasks.register("javaTest", JavaTestInvocationTask.class) { task ->
     task.setDescription("Runs JVM tests (Gradle 'test') for all subprojects")
     task.setGroup(JavaBasePlugin.VERIFICATION_GROUP)
-} as Provider<Task>
+}
 
  // gradle nativeTestCompile -Pcoordinates=<maven-coordinates>
-Provider<Task> nativeTestCompile = tasks.register("nativeTestCompile") { task ->
+tasks.register("nativeTestCompile", NativeTestCompileInvocationTask.class) { task ->
     task.setDescription("Compiles native tests (nativeTestCompile) for all subprojects")
     task.setGroup(LifecycleBasePlugin.BUILD_GROUP)
-} as Provider<Task>
-
-// gradle checkMetadataFiles -Pcoordinates=<maven-coordinates>
-Provider<Task> checkMetadataFiles = tasks.register("checkMetadataFiles") { task ->
-    task.setDescription("Checks content of metadata files for matching coordinates")
-    task.setGroup(METADATA_GROUP)
-} as Provider<Task>
-
-tasks.named("check").configure {
-    dependsOn(checkstyle)
 }
 
-
- // Here we want to configure all test and checkstyle tasks for all filtered subprojects
-// Extracted helper to register per-coordinate tasks and wire them to aggregate tasks.
-def registerPerCoordinateTask = { String coordinates, Object aggregate, String baseName, Class taskClass, boolean passCtorArg = true, Closure customConfigure = null ->
-    String taskName = generateTaskName(baseName, coordinates)
-    if ((!tasks.getNames().contains(taskName))) {
-        if (passCtorArg) {
-            tasks.register(taskName, taskClass, coordinates)
-        } else {
-            tasks.register(taskName, taskClass) { t ->
-                if (customConfigure != null) {
-                    customConfigure.call(t)
-                }
-            }
-        }
+ // gradle clean -Pcoordinates=<maven-coordinates>
+if (tasks.findByName("clean") == null) {
+    tasks.register("clean", CleanInvocationTask.class) { t ->
+        t.setDescription("Cleans all matching subprojects")
+        t.setGroup(LifecycleBasePlugin.BUILD_GROUP)
     }
-    if (aggregate != null) {
-        if (aggregate instanceof org.gradle.api.provider.Provider) {
-            aggregate.configure {
-                dependsOn(taskName)
-            }
-        } else {
-            tasks.named(aggregate.toString()).configure {
-                dependsOn(taskName)
-            }
-        }
+} else {
+    tasks.register("tckClean", CleanInvocationTask.class) { t ->
+        t.setDescription("Cleans all matching subprojects (TCK)")
+        t.setGroup(LifecycleBasePlugin.BUILD_GROUP)
     }
+    tasks.named("clean").configure { it.dependsOn("tckClean") }
 }
 
-for (String coordinates in matchingCoordinates) {
-    registerPerCoordinateTask(coordinates, checkstyle, "checkstyle", CheckstyleInvocationTask, true)
-    registerPerCoordinateTask(coordinates, "clean", "clean", CleanInvocationTask, true)
-    registerPerCoordinateTask(coordinates, compileTestJava, "compileTestJava", CompileTestJavaInvocationTask, true)
-    registerPerCoordinateTask(coordinates, javaTest, "javaTest", JavaTestInvocationTask, true)
-    registerPerCoordinateTask(coordinates, nativeTestCompile, "nativeTestCompile", NativeTestCompileInvocationTask, true)
-    // No aggregate wiring for per-coordinate docker pulls; they are invoked by dedicated workflows.
-    registerPerCoordinateTask(coordinates, null, "pullAllowedDockerImages", DockerTask.class, false) { t ->
-        t.setCoordinates(coordinates)
+ // gradle test -Pcoordinates=<maven-coordinates>
+if (tasks.findByName("test") == null) {
+    tasks.register("test", TestInvocationTask.class) { t ->
+        t.setDescription("Runs Native Image tests for all matching coordinates")
+        t.setGroup(JavaBasePlugin.VERIFICATION_GROUP)
     }
-    registerPerCoordinateTask(coordinates, checkMetadataFiles, "checkMetadataFiles", MetadataFilesCheckerTask.class, false) { t ->
-        t.setCoordinates(coordinates)
+} else {
+    tasks.register("tckTest", TestInvocationTask.class) { t ->
+        t.setDescription("Runs Native Image tests for all matching coordinates (TCK)")
+        t.setGroup(JavaBasePlugin.VERIFICATION_GROUP)
     }
-    registerPerCoordinateTask(coordinates, "test", "test", TestInvocationTask, true)
+    tasks.named("test").configure { it.dependsOn("tckTest") }
+}
+
+ // gradle checkMetadataFiles -Pcoordinates=<maven-coordinates>
+tasks.register("checkMetadataFiles", CheckMetadataFilesAllTask.class) { task ->
+    task.setDescription("Checks content of metadata files for matching coordinates")
+    task.setGroup(METADATA_GROUP)
+}
+
+tasks.named("check").configure {
+    dependsOn("checkstyle")
 }
 
 // gradle diff -PbaseCommit=<base-commit> -PnewCommit=<new-commit>
@@ -158,15 +141,12 @@ List<String> diffCoordinates = new ArrayList<>()
 if (project.hasProperty("baseCommit")) {
     String baseCommit = project.findProperty("baseCommit")
     String newCommit = Objects.requireNonNullElse(project.findProperty("newCommit"), "HEAD")
-    for (def coordinates in tck.diffCoordinates(baseCommit, newCommit)) {
-        diffCoordinates.add(coordinates)
-        String taskTaskName = generateTaskName("test", coordinates)
-        if ((!tasks.getNames().contains(taskTaskName))) {
-            tasks.register(taskTaskName, TestInvocationTask, coordinates)
-        }
-        diff.configure {
-            dependsOn(taskTaskName)
-        }
+    diffCoordinates.addAll(tck.diffCoordinates(baseCommit, newCommit))
+    tasks.register("testDiff", TestInvocationTask.class) { t ->
+        t.setCoordinatesOverride(diffCoordinates)
+    }
+    diff.configure {
+        dependsOn("testDiff")
     }
 }
 
@@ -251,7 +231,7 @@ Provider<Task> generateInfrastructureChangedCoordinatesMatrix = tasks.register("
         List<String> selected = []
         boolean infraChanged = true
         // Pre-selected modules; keep stable for infra verification
-        List<String> preselectedModules = [
+        List<String> preselectedCoordinates = [
                 'ch.qos.logback:logback-classic',
                 'org.bouncycastle:bcpkix-jdk18on',
                 'io.netty:netty-common',
@@ -263,7 +243,7 @@ Provider<Task> generateInfrastructureChangedCoordinatesMatrix = tasks.register("
                 'io.undertow:undertow-core',
                 'com.hazelcast:hazelcast'
         ]
-        preselectedModules.each { module ->
+        preselectedCoordinates.each { module ->
             List<String> matches = tck.getMatchingCoordinates(module)
             if (!matches.isEmpty()) {
                 def withVersions = matches.collect { c ->

tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck-harness.gradle

@@ -4,7 +4,6 @@
  * You should have received a copy of the CC0 legalcode along with this
  * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
-
 pluginManagement {
     repositories {
         mavenCentral()

tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck-settings.settings.gradle

@@ -4,8 +4,6 @@
  * You should have received a copy of the CC0 legalcode along with this
  * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
-
-
 import groovy.json.JsonSlurper
 
 plugins {