ci: fix JMH and Turtle tests

TimefoldAI · Mar 14, 2024 · 39f112b · 39f112b
1 parent f025690
commit 39f112b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -63,4 +63,4 @@ jobs:
       - name: Build and test timefold-solver-benchmarks
         working-directory: ./timefold-solver-benchmarks
         shell: bash
-        run: mvn -B clean verify
+        run: mvn -B -DskipJMH clean verify
diff --git a/.github/workflows/turtle.yml b/.github/workflows/turtle.yml
@@ -57,4 +57,4 @@ jobs:
 
       - name: Run the test per example
         working-directory: ./timefold-solver-benchmarks/examples
-        run: mvn -B -Dai.timefold.solver.benchmarks.examples.turtle=${{matrix.example}} -Dai.timefold.solver.benchmarks.examples.turtle.runTimeLimitMinutes=300 test
+        run: mvn -B -DskipJMH -Dai.timefold.solver.benchmarks.examples.turtle=${{matrix.example}} -Dai.timefold.solver.benchmarks.examples.turtle.runTimeLimitMinutes=300 test
diff --git a/pom.xml b/pom.xml
@@ -54,13 +54,6 @@
             <version>${jmh.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>tools.profiler</groupId>
-            <artifactId>async-profiler-converter</artifactId>
-            <version>${version.tools.profiler}</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/${async.profiler.directory}/lib/converter.jar</systemPath>
-        </dependency>
         <dependency>
             <groupId>ai.timefold.solver.enterprise</groupId>
             <artifactId>timefold-solver-enterprise-core</artifactId>
@@ -246,4 +239,24 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>jmh</id>
+            <activation>
+                <property>
+                    <name>!skipJMH</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>tools.profiler</groupId>
+                    <artifactId>async-profiler-converter</artifactId>
+                    <version>${version.tools.profiler}</version>
+                    <scope>system</scope>
+                    <systemPath>${project.basedir}/${async.profiler.directory}/lib/converter.jar</systemPath>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/common/TestSystemProperties.java b/src/test/java/ai/timefold/solver/benchmarks/examples/common/TestSystemProperties.java
@@ -7,8 +7,8 @@ public final class TestSystemProperties {
      * Use name of the example (eg. "cloudbalancing") or "all" to run all turtle tests.
      * Not providing this property will skip turtle tests.
      */
-    public static final String TURTLE_TEST_SELECTION = "ai.timefold.solver.examples.turtle";
-    public static final String TURTLE_TEST_RUN_TIME_LIMIT = "ai.timefold.solver.examples.turtle.runTimeLimitMinutes";
+    public static final String TURTLE_TEST_SELECTION = "ai.timefold.solver.benchmarks.examples.turtle";
+    public static final String TURTLE_TEST_RUN_TIME_LIMIT = "ai.timefold.solver.benchmarks.examples.turtle.runTimeLimitMinutes";
     public static final String MOVE_THREAD_COUNT = "moveThreadCount";
 
     private TestSystemProperties() {