W-23708419: Simplify TCK test runner configuration

.github/actions/build-foundation/action.yml

@@ -29,5 +29,5 @@ runs:
         github-token: ${{ inputs.github-token }}
 
     - name: Run Build
-      run: ./gradlew --stacktrace --no-problems-report -PskipNodeTests=true build ${{ inputs.native-version != '' && format('-PnativeVersion={0}', inputs.native-version) || '' }}
+      run: ./gradlew --stacktrace --no-problems-report -PskipNodeTests=true -PskipTCKTests=true build ${{ inputs.native-version != '' && format('-PnativeVersion={0}', inputs.native-version) || '' }}
       shell: bash

.github/actions/cli/action.yml

@@ -44,14 +44,9 @@ runs:
       run: ./gradlew --stacktrace --no-problems-report native-cli:distro ${{ inputs.native-version != '' && format('-PnativeVersion={0}', inputs.native-version) || '' }}
       shell: bash
 
-    - name: Run regression test 2.12.2-SNAPSHOT
+    - name: Run CLI TCK Conformance
       if: inputs.run-tck == 'true'
-      run: ./gradlew --stacktrace -PweaveTestSuiteVersion=2.12.2-SNAPSHOT -DweaveSuiteVersion=2.12.2-SNAPSHOT native-cli-integration-tests:test
-      shell: bash
-
-    - name: Run regression test 2.13.0-SNAPSHOT
-      if: inputs.run-tck == 'true'
-      run: ./gradlew --stacktrace -PweaveTestSuiteVersion=2.13.0-SNAPSHOT -DweaveSuiteVersion=2.13.0-SNAPSHOT native-cli-integration-tests:test
+      run: ./gradlew --stacktrace native-cli-integration-tests:test
       shell: bash
 
     - name: Stage renamed CLI distro

.github/actions/node/action.yml

@@ -50,17 +50,10 @@ runs:
       run: ./gradlew --stacktrace --no-problems-report native-lib:nodeTest ${{ inputs.native-version != '' && format('-PnativeVersion={0}', inputs.native-version) || '' }}
       shell: bash
 
-    - name: Run Node.js TCK Conformance 2.12.2-SNAPSHOT
+    - name: Run Node.js TCK Conformance
       if: inputs.run-tck == 'true'
       run: |
-        ./gradlew --stacktrace --no-problems-report -PweaveTestSuiteVersion=2.12.2-SNAPSHOT native-lib:stageTckSuites
-        cd native-lib/node && npm run test:tck
-      shell: bash
-
-    - name: Run Node.js TCK Conformance 2.13.0-SNAPSHOT
-      if: inputs.run-tck == 'true'
-      run: |
-        ./gradlew --stacktrace --no-problems-report -PweaveTestSuiteVersion=2.13.0-SNAPSHOT native-lib:stageTckSuites
+        ./gradlew --stacktrace --no-problems-report native-lib:stageTckSuites
         cd native-lib/node && npm run test:tck
       shell: bash
 

gradle.properties

@@ -1,11 +1,9 @@
-weaveVersion=2.13.0-SNAPSHOT
-weaveTestSuiteVersion=2.13.0-SNAPSHOT
+weaveVersion=2.12.2
+weaveTCKVersion=2.13.0-SNAPSHOT
 nativeVersion=100.100.100
 scalaVersion=2.12.18
 ioVersion=2.12.0-20260408
 graalvmVersion=24.0.2
-weaveSuiteVersion=2.13.0-SNAPSHOT
-#Libaries
 scalaTestVersion=3.2.15
 scalaTestPluginVersion=0.33
 

native-cli-integration-tests/build.gradle

@@ -17,9 +17,9 @@ sourceSets {
 dependencies {
     api(project(":native-cli"))
 
-    weaveSuite "org.mule.weave:runtime:${weaveTestSuiteVersion}:tck@zip"
-    weaveSuite "org.mule.weave:yaml-module:${weaveTestSuiteVersion}:tck@zip"
-    weaveSuite "org.mule.weave:core-modules:${weaveTestSuiteVersion}:tck@zip"
+    weaveSuite "org.mule.weave:runtime:${weaveTCKVersion}:tck@zip"
+    weaveSuite "org.mule.weave:yaml-module:${weaveTCKVersion}:tck@zip"
+    weaveSuite "org.mule.weave:core-modules:${weaveTCKVersion}:tck@zip"
     testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.64.8'
     // https://mvnrepository.com/artifact/org.scalatest/scalatest
     testImplementation group: 'org.scalatest', name: 'scalatest_2.12', version: '3.2.19'
@@ -55,8 +55,11 @@ downloadTestSuites.dependsOn(cleanTestSuites)
 test.dependsOn(downloadTestSuites)
 test.dependsOn(":native-cli:nativeCompile")
 
+// Skip TCKCliTest when -PskipTCKTests=true (matches -PskipNodeTests pattern).
+// CI build-foundation passes this flag on non-master branches so TCK only runs via the explicit
+// "Run CLI TCK Conformance" step (master-only), matching Node TCK behavior. Other IT tests run always.
 test {
-    if (System.getProperty("weaveSuiteVersion") != null) {
-        systemProperty "weaveSuiteVersion", System.getProperty("weaveSuiteVersion")
+    if (project.hasProperty('skipTCKTests') && project.property('skipTCKTests') == 'true') {
+        exclude '**/TCKCliTest.class'
     }
-}
+}

native-cli-integration-tests/src/test/scala/org/mule/weave/clinative/TCKCliTest.scala

@@ -29,15 +29,15 @@ class TCKCliTest extends AnyFunSpec with Matchers
   private val INPUT_FILE_PATTERN = Pattern.compile("in[0-9]+\\.[a-zA-Z]+")
   private val OUTPUT_FILE_PATTERN = Pattern.compile("out\\.[a-zA-Z]+")
 
-
-  private val weaveVersion = System.getProperty("weaveSuiteVersion", ComponentVersion.weaveVersion)
+  private val weaveVersion = ComponentVersion.weaveVersion
   println(s"****** Running with weaveSuiteVersion: $weaveVersion *******")
   private val versionString: String = DataWeaveVersion(weaveVersion).toString()
+  private val weaveTCKVersion = System.getProperty("weaveSuiteVersion", ComponentVersion.weaveTCKVersion)
 
   private val testSuites = Seq(
-    TestSuite("runtime-tck-tests", loadTestZipFile(s"weave-suites/runtime-$weaveVersion-tck.zip")),
-    TestSuite("yaml-tck-tests", loadTestZipFile(s"weave-suites/yaml-module-$weaveVersion-tck.zip")),
-    TestSuite("core-modules-tck-tests", loadTestZipFile(s"weave-suites/core-modules-$weaveVersion-tck.zip"))
+    TestSuite("runtime-tck-tests", loadTestZipFile(s"weave-suites/runtime-$weaveTCKVersion-tck.zip")),
+    TestSuite("yaml-tck-tests", loadTestZipFile(s"weave-suites/yaml-module-$weaveTCKVersion-tck.zip")),
+    TestSuite("core-modules-tck-tests", loadTestZipFile(s"weave-suites/core-modules-$weaveTCKVersion-tck.zip"))
   )
 
   private def loadTestZipFile(testSuiteExample: String): File = {
@@ -48,8 +48,8 @@ class TCKCliTest extends AnyFunSpec with Matchers
     zipFile
   }
 
-
   println("NativeCliRuntimeTest -> " + testSuites.mkString(","))
+
   testSuites.foreach {
     testSuite => {
       val wd = Files.createTempDirectory(testSuite.name).toFile

native-cli/build.gradle

@@ -65,6 +65,7 @@ task genVersions() {
     outputPrinter.println("object ComponentVersion {")
     outputPrinter.println("\tval weaveVersion = \"" + weaveVersion + "\"")
     outputPrinter.println("\tval nativeVersion = \"" + nativeVersion + "\"")
+    outputPrinter.println("\tval weaveTCKVersion = \"" + weaveTCKVersion + "\"")
     outputPrinter.println("}")
     outputPrinter.close()
 }

native-lib/build.gradle

@@ -182,8 +182,8 @@ configurations {
 }
 
 dependencies {
-  weaveTckSuite "org.mule.weave:runtime:${weaveTestSuiteVersion}:tck@zip"
-  weaveTckSuite "org.mule.weave:core-modules:${weaveTestSuiteVersion}:tck@zip"
+  weaveTckSuite "org.mule.weave:runtime:${weaveTCKVersion}:tck@zip"
+  weaveTckSuite "org.mule.weave:core-modules:${weaveTCKVersion}:tck@zip"
 }
 
 def tckSuitesDir = "${projectDir}/node/tests/tck/suites"