deephaven · stanbrub · Oct 1, 2025 · Sep 16, 2025 · Sep 16, 2025 · Sep 16, 2025
diff --git a/.github/distro/benchmark.sh b/.github/distro/benchmark.sh
@@ -29,7 +29,7 @@ if [[ $# != 2 ]]; then
 fi
 
 ITERATIONS=$1
-TEST_WILD=$2
+TEST_WILD="$2"
 BENCH_MAIN="io.deephaven.benchmark.run.BenchmarkMain"
 TEST_PACKAGE="io.deephaven.benchmark.tests.standard"
 
@@ -43,19 +43,12 @@ sudo docker compose up -d
 sleep 5
 set -f
 
-TEST_REGEX="^.*[.]("
-for r in $(echo "${TEST_WILD}" | sed 's/\s*,\s*/ /g'); do
-  TEST_REGEX="${TEST_REGEX}"$(echo "(${r}Test)|" | sed 's/\*/.*/g')
-done
-TEST_REGEX=$(echo ${TEST_REGEX} | sed -E 's/\|+$//g')
-TEST_REGEX="${TEST_REGEX})$"
-
 for i in `seq 1 ${ITERATIONS}`
 do
 
 echo "*** Starting Iteration: $i ***"
 
-java -Dbenchmark.profile=benchmark.properties -cp "libs/*" ${BENCH_MAIN} -p ${TEST_PACKAGE} -n "${TEST_REGEX}" 
+java -Dbenchmark.profile=benchmark.properties -cp "libs/*" ${BENCH_MAIN} -p ${TEST_PACKAGE} -n "${TEST_WILD}" 
 
 done
 

diff --git a/.github/resources/adhoc-benchmark-docker-compose.yml b/.github/resources/adhoc-benchmark-docker-compose.yml
@@ -25,15 +25,15 @@ services:
     - PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092
     - --pandaproxy-addr 0.0.0.0:8082
     - --advertise-pandaproxy-addr redpanda:8082
-    image: redpandadata/redpanda:v25.1.2
+    image: redpandadata/redpanda:v25.2.5
     ports:
     - 8081:8081
     - 8082:8082
     - 9092:9092
     - 29092:29092
 
   minio-server:
-    image: minio/minio:RELEASE.2025-04-22T22-12-26Z
+    image: minio/minio:RELEASE.2025-09-07T16-13-09Z
     command: server /minio --console-address ":9001"
     hostname: minio
     environment:
@@ -59,7 +59,7 @@ services:
     - ./minio:/minio
 
   minio-bucket:
-    image: minio/mc:RELEASE.2025-04-16T18-13-26Z
+    image: minio/mc:RELEASE.2025-08-13T08-35-41Z
     depends_on:
       - minio-server
     entrypoint: >

diff --git a/.github/resources/compare-benchmark-docker-compose.yml b/.github/resources/compare-benchmark-docker-compose.yml
@@ -24,7 +24,7 @@ services:
     - PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092
     - --pandaproxy-addr 0.0.0.0:8082
     - --advertise-pandaproxy-addr redpanda:8082
-    image: redpandadata/redpanda:v25.1.2
+    image: redpandadata/redpanda:v25.2.5
     ports:
     - 8081:8081
     - 8082:8082

diff --git a/.github/resources/integration-docker-compose.yml b/.github/resources/integration-docker-compose.yml
@@ -24,7 +24,7 @@ services:
     - PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092
     - --pandaproxy-addr 0.0.0.0:8082
     - --advertise-pandaproxy-addr redpanda:8082
-    image: redpandadata/redpanda:v25.1.2
+    image: redpandadata/redpanda:v25.2.5
     ports:
     - 8081:8081
     - 8082:8082

diff --git a/.github/resources/nightly-benchmark-docker-compose.yml b/.github/resources/nightly-benchmark-docker-compose.yml
@@ -25,15 +25,15 @@ services:
     - PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092
     - --pandaproxy-addr 0.0.0.0:8082
     - --advertise-pandaproxy-addr redpanda:8082
-    image: redpandadata/redpanda:v25.1.2
+    image: redpandadata/redpanda:v25.2.5
     ports:
     - 8081:8081
     - 8082:8082
     - 9092:9092
     - 29092:29092
 
   minio-server:
-    image: minio/minio:RELEASE.2025-04-22T22-12-26Z
+    image: minio/minio:RELEASE.2025-09-07T16-13-09Z
     command: server /minio --console-address ":9001"
     hostname: minio
     environment:
@@ -59,7 +59,7 @@ services:
     - ./minio:/minio
 
   minio-bucket:
-    image: minio/mc:RELEASE.2025-04-16T18-13-26Z
+    image: minio/mc:RELEASE.2025-08-13T08-35-41Z
     depends_on:
       - minio-server
     entrypoint: >

diff --git a/.github/resources/release-benchmark-docker-compose.yml b/.github/resources/release-benchmark-docker-compose.yml
@@ -25,15 +25,15 @@ services:
     - PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092
     - --pandaproxy-addr 0.0.0.0:8082
     - --advertise-pandaproxy-addr redpanda:8082
-    image: redpandadata/redpanda:v25.1.2
+    image: redpandadata/redpanda:v25.2.5
     ports:
     - 8081:8081
     - 8082:8082
     - 9092:9092
     - 29092:29092
 
   minio-server:
-    image: minio/minio:RELEASE.2025-04-22T22-12-26Z
+    image: minio/minio:RELEASE.2025-09-07T16-13-09Z
     command: server /minio --console-address ":9001"
     hostname: minio
     environment:
@@ -59,7 +59,7 @@ services:
     - ./minio:/minio
 
   minio-bucket:
-    image: minio/mc:RELEASE.2025-04-16T18-13-26Z
+    image: minio/mc:RELEASE.2025-08-13T08-35-41Z
     depends_on:
       - minio-server
     entrypoint: >

diff --git a/.github/scripts/adhoc.sh b/.github/scripts/adhoc.sh
@@ -57,22 +57,6 @@ if [[ ${ACTION} == "make-labels" ]]; then
   echo "SET_LABEL_2=${LABEL2}" | tee -a ${OUTPUT_NAME}
 fi
 
-# Make a regex from a list of wilcarded test class names
-if [[ ${ACTION} == "make-test-regex" ]]; then
-  WILDCARDS=$2
-  echo "Making Test Regex: ${WILDCARDS}"
-
-  TEST_REGEX="^.*[.]("
-  for r in $(echo ${WILDCARDS} | sed 's/\s*,\s*/ /g'); do 
-    TEST_REGEX="${TEST_REGEX}"$(echo "(${r}Test)|" | sed 's/\*/.*/g')
-  done
-  TEST_REGEX=$(echo ${TEST_REGEX} | sed -E 's/\|+$//g')
-  TEST_REGEX="${TEST_REGEX})$"
-
-  echo "WILDCARDS=${WILDCARDS}" | tee -a ${OUTPUT_NAME}
-  echo "TEST_CLASS_REGEX=${TEST_REGEX}" | tee -a ${OUTPUT_NAME}
-fi
-
 # Format some number used for scaling the tests
 if [[ ${ACTION} == "scale-nums" ]]; then
   INPUT_ROW_COUNT=$2

diff --git a/.github/scripts/run-benchmarks-remote.sh b/.github/scripts/run-benchmarks-remote.sh
@@ -3,6 +3,7 @@
 set -o errexit
 set -o pipefail
 set -o nounset
+set -f
 
 # Copyright (c) 2023-2024 Deephaven Data Labs and Patent Pending
 
@@ -13,7 +14,7 @@ set -o nounset
 # Note: Assumes the deephaven-benchmark-*.jar artifact has been built and placed
 
 if [[ $# != 6 ]]; then
-  echo "$0: Missing run type, test package, test regex, row count, distribution, or tag name"
+  echo "$0: Missing run type, test package, test classes, row count, distribution, or tag name"
   exit 1
 fi
 
@@ -39,9 +40,11 @@ title "- Running Remote Benchmark Artifact on ${HOST} -"
 cd ${DEEPHAVEN_DIR};
 
 title "-- Running Benchmarks --"
+set +f
 cd ${RUN_DIR}
 cat ${RUN_TYPE}-scale-benchmark.properties | sed 's|${baseRowCount}|'"${ROW_COUNT}|g" | sed 's|${baseDistrib}|'"${DISTRIB}|g" > scale-benchmark.properties
-JAVA_OPTS="-Dbenchmark.profile=scale-benchmark.properties -jar deephaven-benchmark-*-standalone.jar -cp standard-tests.jar"
+JAVA_OPTS=$(echo -Dbenchmark.profile=scale-benchmark.properties -jar deephaven-benchmark-*-standalone.jar -cp standard-tests.jar)
+set -f
 
 if [ "${TAG_NAME}" = "Any" ]; then
   java ${JAVA_OPTS} -p ${TEST_PACKAGE} -n "${TEST_PATTERN}"

diff --git a/.github/scripts/run-ssh-local.sh b/.github/scripts/run-ssh-local.sh
@@ -3,6 +3,7 @@
 set -o errexit
 set -o pipefail
 set -o nounset
+set -f
 
 # Copyright (c) 2023-2024 Deephaven Data Labs and Patent Pending
 
@@ -11,8 +12,8 @@ set -o nounset
 # remote scripts in single-quotes to avoid syntax errors.
 
 if [[ $# -lt 4 ]]; then
-	echo "$0: Missing host, user, script dir, or script name argument"
-	exit 1
+  echo "$0: Missing host, user, script dir, or script name argument"
+  exit 1
 fi
 
 HOST=$1
@@ -25,4 +26,4 @@ for i in ${@:5}; do
   args+=("'"$i"'")
 done
 
-ssh -o 'ServerAliveInterval 60' ${USER}@${HOST} 'bash -s' "${args[*]}" < ${SCRIPT_DIR}/${SCRIPT_NAME}.sh |& tee logs/${SCRIPT_NAME}.log
+ssh -o 'ServerAliveInterval 60' ${USER}@${HOST} 'bash -s' -- "${args[@]}" < ${SCRIPT_DIR}/${SCRIPT_NAME}.sh |& tee logs/${SCRIPT_NAME}.log
diff --git a/.github/workflows/adhoc-auto-remote-benchmarks.yml b/.github/workflows/adhoc-auto-remote-benchmarks.yml
@@ -58,7 +58,6 @@ jobs:
     outputs:
       set_label_1: ${{ steps.make-labels.outputs.SET_LABEL_1 }}
       set_label_2: ${{ steps.make-labels.outputs.SET_LABEL_2 }}
-      test_class_regex: "${{ steps.make-test-regex.outputs.TEST_CLASS_REGEX }}"
       metal_device_id: ${{ steps.deploy-metal.outputs.DEVICE_ID }}
       metal_device_name: ${{ steps.deploy-metal.outputs.DEVICE_NAME }}
       metal_ip_addr: ${{ steps.deploy-metal.outputs.DEVICE_ADDR }}
@@ -80,12 +79,6 @@ jobs:
         ${SD}/adhoc.sh make-labels ${{ inputs.set_label_prefix }} ${{ inputs.docker_image_1 }} ${{ inputs.docker_image_2 }}
         cat adhoc-make-labels.out >> "$GITHUB_OUTPUT"
 
-    - name: Make Wildcard Regex
-      id: make-test-regex 
-      run: |
-        ${SD}/adhoc.sh make-test-regex "${{ inputs.test_class_list }}"
-        cat adhoc-make-test-regex.out >> "$GITHUB_OUTPUT"
-
     - name: Scale Input Numbers
       id: scale-nums
       run: |
@@ -114,7 +107,7 @@ jobs:
       docker_image: ${{ inputs.docker_image_1 }}
       run_label: ${{ needs.setup-benchmark-system.outputs.set_label_1 }}
       test_package: "io.deephaven.benchmark.tests.standard"
-      test_class_regex: "${{ needs.setup-benchmark-system.outputs.test_class_regex }}"
+      test_class_list: "${{ inputs.test_class_list }}"
       test_iterations: ${{ needs.setup-benchmark-system.outputs.test_iterations }}
       scale_row_count: ${{ needs.setup-benchmark-system.outputs.test_row_count }}
       distribution: ${{ inputs.distribution }}
@@ -130,7 +123,7 @@ jobs:
       docker_image: ${{ inputs.docker_image_2 }}
       run_label: ${{ needs.setup-benchmark-system.outputs.set_label_2 }}
       test_package: "io.deephaven.benchmark.tests.standard"
-      test_class_regex: "${{ needs.setup-benchmark-system.outputs.test_class_regex }}"
+      test_class_list: "${{ inputs.test_class_list }}" 
       test_iterations: ${{ needs.setup-benchmark-system.outputs.test_iterations }}
       scale_row_count: ${{ needs.setup-benchmark-system.outputs.test_row_count }}
       distribution: ${{ inputs.distribution }}

diff --git a/.github/workflows/adhoc-exist-remote-benchmarks.yml b/.github/workflows/adhoc-exist-remote-benchmarks.yml
@@ -58,20 +58,13 @@ jobs:
   setup-benchmark-system:
     runs-on: ubuntu-22.04
     outputs:
-      test_class_regex: "${{ steps.make-test-regex.outputs.TEST_CLASS_REGEX }}"
       test_row_count: ${{ steps.scale-nums.outputs.TEST_ROW_COUNT }}
       test_iterations: ${{ steps.scale-nums.outputs.TEST_ITERATIONS }}
     env:
       SD: .github/scripts
 
     steps:
     - uses: actions/checkout@v4
-    - name: Make Wildcard Regex
-      id: make-test-regex 
-      run: |
-        ${SD}/adhoc.sh make-test-regex "${{ inputs.test_class_list }}"
-        cat adhoc-make-test-regex.out >> "$GITHUB_OUTPUT"
-
     - name: Scale Input Numbers
       id: scale-nums
       run: |
@@ -86,7 +79,7 @@ jobs:
       docker_image: ${{ inputs.docker_image }}
       run_label: ${{ inputs.run_label }}
       test_package: ${{ inputs.test_package }}
-      test_class_regex: "${{ needs.setup-benchmark-system.outputs.test_class_regex }}"
+      test_class_list: "${{ inputs.test_class_list }}"
       test_iterations: ${{ needs.setup-benchmark-system.outputs.test_iterations }}
       scale_row_count: ${{ needs.setup-benchmark-system.outputs.test_row_count }}
       distribution: ${{ inputs.distribution }}

diff --git a/.github/workflows/compare-remote-benchmarks.yml b/.github/workflows/compare-remote-benchmarks.yml
@@ -24,7 +24,7 @@ jobs:
       docker_image: ${{ inputs.docker_image }}
       run_label: "<version>"
       test_package: "io.deephaven.benchmark.tests.compare"
-      test_class_regex: "^(Test.*|.+[.$]Test.*|.*Tests?)$"
+      test_class_list: "*"
       test_iterations: 5
       scale_row_count: 70000000
       distribution: random

diff --git a/.github/workflows/nightly-remote-benchmarks.yml b/.github/workflows/nightly-remote-benchmarks.yml
@@ -18,7 +18,7 @@ jobs:
       docker_image: edge
       run_label: "<date>"
       test_package: "io.deephaven.benchmark.tests.standard"
-      test_class_regex: "^(Test.*|.+[.$]Test.*|.*Tests?)$"
+      test_class_list: "*"
       test_iterations: 5
       scale_row_count: 10000000
       distribution: random

diff --git a/.github/workflows/release-remote-benchmarks.yml b/.github/workflows/release-remote-benchmarks.yml
@@ -23,7 +23,7 @@ jobs:
       docker_image: ${{ inputs.docker_image }}
       run_label: "<version>"
       test_package: "io.deephaven.benchmark.tests.standard"
-      test_class_regex: "^(Test.*|.+[.$]Test.*|.*Tests?)$"
+      test_class_list: "*"
       test_iterations: 5
       scale_row_count: 10000000
       distribution: random

diff --git a/.github/workflows/remote-benchmarks.yml b/.github/workflows/remote-benchmarks.yml
@@ -22,7 +22,7 @@ on:
       test_package:
         required: true
         type: string
-      test_class_regex:
+      test_class_list:
         required: true
         type: string
       test_iterations:
@@ -115,7 +115,7 @@ jobs:
       USER: ${{secrets.BENCHMARK_USER}}
       RUN_TYPE: ${{inputs.run_type}}
       TEST_PKG: ${{inputs.test_package}}
-      TEST_RGX: "${{inputs.test_class_regex}}"
+      TEST_CLS: "${{inputs.test_class_list}}"
       ROW_CNT: ${{inputs.scale_row_count}}
       DISTRIB: ${{inputs.distribution}}
 
@@ -129,7 +129,7 @@ jobs:
 
     - name: Run Remote Benchmarks
       run: |
-        ${SD}/run-ssh-local.sh ${HOST} ${USER} ${SD} run-benchmarks-remote ${RUN_TYPE} "${TEST_PKG}" "${TEST_RGX}" ${ROW_CNT} ${DISTRIB} ${{ matrix.tag }}
+        ${SD}/run-ssh-local.sh ${HOST} ${USER} ${SD} run-benchmarks-remote ${RUN_TYPE} "${TEST_PKG}" "'"${TEST_CLS}"'" ${ROW_CNT} ${DISTRIB} ${{ matrix.tag }}
 
   report-benchmarks:
     needs: run-benchmarks