Skip to content

Commit

Permalink
fix: Wildcards for Distro Scripts (#371)
Browse files Browse the repository at this point in the history
  • Loading branch information
stanbrub authored Oct 22, 2024
1 parent 885b112 commit fec1015
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/distro/benchmark.properties
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ scale.row.count=1000000
# Blank: Overwrite if JUnit launch, timestamp if Benchmark main launch
timestamp.test.results=

# Experimental: Docker compose file (e.g. /mypath/docker-compose.yml
# Experimental: Docker compose file (e.g. /mypath/docker-compose.yml)
# Use blank to disable restarts between test runs (only recommended for smoke tests)
docker.compose.file=./docker-compose.yml

9 changes: 6 additions & 3 deletions .github/distro/benchmark.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand All @@ -11,9 +12,9 @@ set -o nounset
# any previous run and produce results as a set of csv files for each iteration.
#
# Examples:
# - Run Where benchmarks three times: ./benchmark.sh 1 Where
# - Run Where benchmarks three times: ./benchmark.sh 1 "Where"
# - Run Where and AvgBy benchmarks three times: ./benchmark.sh 3 "Where,Avg*"
# - Run all benchmarks one time: ./benchmark.sh 1 *
# - Run all benchmarks one time: ./benchmark.sh 1 "*"
#
# Notes:
# - Docker is a prerequisite, and the Deephaven image will be installed if it's missing
Expand All @@ -39,9 +40,11 @@ sudo rm -f ./data/*.def
sudo rm -f ./data/*.parquet

sudo docker compose up -d
sleep 5
set -f

TEST_REGEX="^.*[.]("
for r in $(echo ${TEST_WILD} | sed 's/\s*,\s*/ /g'); do
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')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
- name: Archive Results
uses: actions/upload-artifact@v4
with:
name: Deephaven Benchmark Release
name: Deephaven Benchmark Release ${{env.VERSION}}
path: |
deephaven-benchmark-${{env.VERSION}}.tar
deephaven-benchmark-${{env.VERSION}}-results.tar
Expand Down

0 comments on commit fec1015

Please sign in to comment.