2 files changed, 12 insertions, 5 deletions
diff --git a/opendc-experiments/opendc-experiments-base/build.gradle.kts b/opendc-experiments/opendc-experiments-base/build.gradle.kts
index b22e4d41..e71dbbee 100644
--- a/opendc-experiments/opendc-experiments-base/build.gradle.kts
+++ b/opendc-experiments/opendc-experiments-base/build.gradle.kts
@@ -34,7 +34,8 @@ plugins {
 
 jmh {
     resultFormat.set("JSON")
-    includes.add(".*WorkloadNoExportBenchmark.*")
+    val jmhIncludes = findProperty("jmhIncludes") as? String ?: ".*WorkloadNoExportBenchmark.*"
+    includes.add(jmhIncludes)
 }
 
 tasks.named("jmh") {
diff --git a/opendc-experiments/opendc-experiments-base/src/jmh/kotlin/org/opendc/experiments/CIBenchmark.kt b/opendc-experiments/opendc-experiments-base/src/jmh/kotlin/org/opendc/experiments/CIBenchmark.kt
index a719b9f3..c80a62e3 100644
--- a/opendc-experiments/opendc-experiments-base/src/jmh/kotlin/org/opendc/experiments/CIBenchmark.kt
+++ b/opendc-experiments/opendc-experiments-base/src/jmh/kotlin/org/opendc/experiments/CIBenchmark.kt
@@ -43,14 +43,20 @@ import java.util.concurrent.TimeUnit
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 open class CIBenchmark : OpenDCBenchmark() {
     @Benchmark
-    fun benchmark1() {
-        ExperimentCommand().main(arrayOf("--experiment-path", "src/jmh/resources/experiments/experiment_100.json"))
+    fun surfWeekBenchmark() {
+        ExperimentCommand().main(arrayOf("--experiment-path", "src/jmh/resources/experiments/workloadScaling/surf_week.json"))
         File("output").deleteRecursively()
     }
 
     @Benchmark
-    fun benchmark2() {
-        ExperimentCommand().main(arrayOf("--experiment-path", "src/jmh/resources/experiments/experiment_2.json"))
+    fun surfMonthBenchmark() {
+        ExperimentCommand().main(arrayOf("--experiment-path", "src/jmh/resources/experiments/workloadScaling/surf_month.json"))
+        File("output").deleteRecursively()
+    }
+
+    @Benchmark
+    fun surfHalfYearBenchmark() {
+        ExperimentCommand().main(arrayOf("--experiment-path", "src/jmh/resources/experiments/workloadScaling/surf_halfyear.json"))
         File("output").deleteRecursively()
     }
 }