optimize ci

mulesoft-labs · Apr 16, 2024 · 42e3760 · 42e3760
1 parent 7d0eec3
commit 42e3760
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -54,16 +54,16 @@ jobs:
       #Run regression tests
       - name: Run regression test 2.7
         run: |
-          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.7.0-SNAPSHOT native-cli-integration-tests:test
+          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.7.0-SNAPSHOT -DweaveSuiteVersion=2.7.0-SNAPSHOT native-cli-integration-tests:test
         shell: bash
       #Run regression tests
       - name: Run regression test 2.6
         run: |
-          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.6.1 native-cli-integration-tests:test
+          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.6.1 -DweaveSuiteVersion=2.6.1 native-cli-integration-tests:test
         shell: bash
       - name: Run regression test 2.4
         run: |
-          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.4.0-HF-SNAPSHOT native-cli-integration-tests:test
+          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.4.0-HF-SNAPSHOT -DweaveSuiteVersion=2.4.0-HF-SNAPSHOT native-cli-integration-tests:test
         shell: bash
 
       # Generate distro

diff --git a/native-cli-integration-tests/src/test/scala/org/mule/weave/native/NativeCliRuntimeIT.scala b/native-cli-integration-tests/src/test/scala/org/mule/weave/native/NativeCliRuntimeIT.scala
@@ -58,11 +58,11 @@ class NativeCliRuntimeIT extends AnyFunSpec
   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 versionString: String = DataWeaveVersion(ComponentVersion.weaveSuiteVersion).toString()
+  private val versionString: String = DataWeaveVersion(System.getProperty("weaveSuiteVersion", ComponentVersion.weaveVersion)).toString()
 
   val testSuites = Seq(
-    TestSuite("master", loadTestZipFile(s"weave-suites/runtime-${ComponentVersion.weaveSuiteVersion}-test.zip")),
-    TestSuite("yaml", loadTestZipFile(s"weave-suites/yaml-module-${ComponentVersion.weaveSuiteVersion}-test.zip"))
+    TestSuite("master", loadTestZipFile(s"weave-suites/runtime-$versionString-test.zip")),
+    TestSuite("yaml", loadTestZipFile(s"weave-suites/yaml-module-$versionString-test.zip"))
   )
 
   private def loadTestZipFile(testSuiteExample: String): File = {
@@ -72,6 +72,8 @@ class NativeCliRuntimeIT extends AnyFunSpec
     zipFile
   }
 
+  println(s"********************** Running suite with DW suite version: $versionString **********************")
+
   testSuites.foreach {
     testSuite => {
       val wd = Files.createTempDirectory(testSuite.name).toFile

diff --git a/native-cli/build.gradle b/native-cli/build.gradle
@@ -63,7 +63,6 @@ task genVersions() {
     outputPrinter.println("object ComponentVersion {")
     outputPrinter.println("\tval weaveVersion = \"" + weaveVersion + "\"")
     outputPrinter.println("\tval nativeVersion = \"" + nativeVersion + "\"")
-    outputPrinter.println("\tval weaveSuiteVersion = \"" + weaveTestSuiteVersion + "\"")
     outputPrinter.println("}")
     outputPrinter.close()
 }