Skip to content

Commit 2e5ff61

Browse files
committed
always run on spiceai-dev-runners, use minio for storage
1 parent 71d8439 commit 2e5ff61

2 files changed

Lines changed: 20 additions & 34 deletions

File tree

.github/workflows/data_generation_run.yml

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,12 @@ on:
3232
required: false
3333
default: '100'
3434
type: string
35-
runner_type:
36-
required: false
37-
default: 'ubuntu-latest'
38-
type: string
3935
secrets:
40-
AWS_ACCESS_KEY_ID:
36+
MINIO_ENDPOINT:
37+
required: true
38+
MINIO_ACCESS_KEY_ID:
4139
required: true
42-
AWS_SECRET_ACCESS_KEY:
40+
MINIO_SECRET_ACCESS_KEY:
4341
required: true
4442
workflow_dispatch:
4543
inputs:
@@ -48,11 +46,6 @@ on:
4846
required: true
4947
default: 'tpch'
5048
type: string
51-
runner_type:
52-
description: 'GitHub runner label to execute on'
53-
required: false
54-
default: 'spiceai-macos'
55-
type: string
5649
scale_factor:
5750
description: 'TPC-H scale factor'
5851
required: true
@@ -87,7 +80,7 @@ on:
8780
jobs:
8881
run-data-generation:
8982
name: Run data generation
90-
runs-on: ${{ inputs.runner_type || github.event.inputs.runner_type || 'ubuntu-latest' }}
83+
runs-on: spiceai-dev-runners
9184
timeout-minutes: 600
9285
steps:
9386
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
@@ -123,8 +116,9 @@ jobs:
123116
PREFIX: ${{ inputs.prefix || github.event.inputs.prefix || 'data-gen' }}
124117
REGION: ${{ inputs.region || github.event.inputs.region || 'us-east-1' }}
125118
NUM_STEPS: ${{ inputs.num_steps || github.event.inputs.num_steps || '25' }}
126-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
127-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
119+
MINIO_ENDPOINT: ${{ secrets.MINIO_ENDPOINT }}
120+
AWS_ACCESS_KEY_ID: ${{ secrets.MINIO_ACCESS_KEY_ID }}
121+
AWS_SECRET_ACCESS_KEY: ${{ secrets.MINIO_SECRET_ACCESS_KEY }}
128122
RUST_LOG: info
129123
run: |
130124
ARGS="--dataset ${SCENARIO}"
@@ -134,6 +128,7 @@ jobs:
134128
ARGS="${ARGS} --prefix ${PREFIX}"
135129
ARGS="${ARGS} --region ${REGION}"
136130
ARGS="${ARGS} --num-steps ${NUM_STEPS}"
131+
ARGS="${ARGS} --endpoint ${MINIO_ENDPOINT}"
137132
138133
echo "Running: data-generation run ${ARGS}"
139134
~/.spice/bin/data-generation run ${ARGS}
@@ -162,8 +157,9 @@ jobs:
162157
PREFIX: ${{ inputs.prefix || github.event.inputs.prefix || 'data-gen' }}
163158
REGION: ${{ inputs.region || github.event.inputs.region || 'us-east-1' }}
164159
CHECKPOINT_INTERVAL_STEPS: ${{ inputs.checkpoint_interval_steps || github.event.inputs.checkpoint_interval_steps || '100' }}
165-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
166-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
160+
MINIO_ENDPOINT: ${{ secrets.MINIO_ENDPOINT }}
161+
AWS_ACCESS_KEY_ID: ${{ secrets.MINIO_ACCESS_KEY_ID }}
162+
AWS_SECRET_ACCESS_KEY: ${{ secrets.MINIO_SECRET_ACCESS_KEY }}
167163
RUST_LOG: info
168164
run: |
169165
VERSION=$(python3 - <<'PY'
@@ -191,6 +187,7 @@ jobs:
191187
fi
192188
193189
ARGS="${ARGS} --checkpoint-interval-steps ${CHECKPOINT_INTERVAL_STEPS}"
190+
ARGS="${ARGS} --endpoint ${MINIO_ENDPOINT}"
194191
195192
echo "Running: checkpointer ${ARGS}"
196193
~/.spice/bin/checkpointer ${ARGS}

.github/workflows/run_spicebench.yml

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,6 @@ on:
5353
required: false
5454
default: false
5555
type: boolean
56-
runner:
57-
description: 'GitHub runner label to use for this workflow run'
58-
required: true
59-
default: ubuntu-latest
60-
type: choice
61-
options:
62-
- ubuntu-latest
63-
- spiceai-dev-runners
6456
scheduler_state_location:
6557
description: 'S3 URI for shared scheduler state (e.g. s3://bucket/scheduler-state/). If empty, scheduler state is not configured.'
6658
required: false
@@ -70,7 +62,7 @@ on:
7062
jobs:
7163
run-spicebench:
7264
name: Run spicebench
73-
runs-on: ${{ github.event.inputs.runner || 'ubuntu-latest' }}
65+
runs-on: spiceai-dev-runners
7466
timeout-minutes: 600
7567
steps:
7668
- uses: actions/checkout@v6
@@ -222,19 +214,15 @@ jobs:
222214
run: |
223215
set -euo pipefail
224216
curl -LsSf https://dbc.columnar.tech/install.sh | sh
225-
if [ "${{ github.event.inputs.runner || 'ubuntu-latest' }}" = "spiceai-dev-runners" ]; then
226-
source "$HOME/.local/bin/env"
227-
fi
217+
source "$HOME/.local/bin/env"
228218
dbc install postgresql
229219
230220
- name: Install ADBC FlightSQL driver
231221
if: ${{ !startsWith(github.event.inputs.system_under_test || 'spice_cloud', 'databricks-') }}
232222
run: |
233223
set -euo pipefail
234224
curl -LsSf https://dbc.columnar.tech/install.sh | sh
235-
if [ "${{ github.event.inputs.runner || 'ubuntu-latest' }}" = "spiceai-dev-runners" ]; then
236-
source "$HOME/.local/bin/env"
237-
fi
225+
source "$HOME/.local/bin/env"
238226
dbc install flightsql
239227
240228
- name: Run spicebench
@@ -261,8 +249,9 @@ jobs:
261249
VALIDATE_CHECKPOINT_RESULTS: ${{ github.event.inputs.validate_checkpoint_results || 'false' }}
262250
ENABLE_MODULE_DEBUG_LOGGING: ${{ github.event.inputs.enable_module_debug_logging || 'false' }}
263251
SPICEAI_BENCHMARK_METRICS_KEY: ${{ secrets.SPICEAI_BENCHMARK_METRICS_KEY }}
264-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
265-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
252+
MINIO_ENDPOINT: ${{ secrets.MINIO_ENDPOINT }}
253+
AWS_ACCESS_KEY_ID: ${{ secrets.MINIO_ACCESS_KEY_ID }}
254+
AWS_SECRET_ACCESS_KEY: ${{ secrets.MINIO_SECRET_ACCESS_KEY }}
266255
LAKEBASE_PG_HOST: ${{ secrets.LAKEBASE_PG_HOST }}
267256
LAKEBASE_PG_USER: ${{ secrets.LAKEBASE_PG_USER }}
268257
LAKEBASE_PG_DB_NAME: ${{ secrets.LAKEBASE_PG_DB_NAME }}
@@ -280,7 +269,7 @@ jobs:
280269
281270
TABLE_FORMAT="parquet"
282271
EXECUTOR_INSTANCE_TYPE="github-hosted-ubuntu-latest"
283-
ETL_ENDPOINT=""
272+
ETL_ENDPOINT="${MINIO_ENDPOINT}"
284273
DATABRICKS_TABLE_FORMAT="${TABLE_FORMAT}"
285274
SYSTEM_UNDER_TEST_PREFIX="${SYSTEM_UNDER_TEST%%-*}"
286275
ETL_ARGS="--etl-bucket ${ETL_BUCKET} --scale-factor ${SCALE_FACTOR}"

0 commit comments

Comments
 (0)