Skip to content

Commit 00bae62

Browse files
committed
Spicebench SCP debug run - remove custom image and registry args, keep
only inage tag
1 parent 6327983 commit 00bae62

1 file changed

Lines changed: 8 additions & 25 deletions

File tree

.github/workflows/run_spicebench_debug_spice_cloud.yml

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ on:
8181
required: false
8282
default: '16Gi'
8383
type: string
84-
custom_image:
85-
description: 'Custom runtime container image (e.g. ghcr.io/spiceai/spiceai-dev:spicebench-sf10). Overrides the default channel image. Requires the internal update channel on the target SCP environment.'
84+
custom_image_tag:
85+
description: 'Custom runtime container image tag from ghcr.io/spiceai/spiceai-dev (e.g. spicebench-sf10).'
8686
required: false
8787
default: ''
8888
type: string
@@ -178,7 +178,7 @@ jobs:
178178
SPIDAPTER_APP_MEMORY_LIMIT: ${{ github.event.inputs.app_memory_limit || '16Gi' }}
179179
SPIDAPTER_EXECUTOR_MEMORY_LIMIT: ${{ github.event.inputs.executor_memory_limit || '16Gi' }}
180180
SPIDAPTER_ORGANIZATION_TAG: 'spicehq'
181-
CUSTOM_IMAGE: ${{ github.event.inputs.custom_image || '' }}
181+
CUSTOM_IMAGE_TAG: ${{ github.event.inputs.custom_image_tag || '' }}
182182
run: |
183183
set -euo pipefail
184184
if [ "${ENABLE_MODULE_DEBUG_LOGGING}" = "true" ]; then
@@ -228,27 +228,10 @@ jobs:
228228
ADAPTER_DOCKER_OPTS="${ADAPTER_DOCKER_OPTS} -e SPIDAPTER_EXECUTOR_MEMORY_LIMIT=${SPIDAPTER_EXECUTOR_MEMORY_LIMIT}"
229229
ADAPTER_DOCKER_OPTS="${ADAPTER_DOCKER_OPTS} -e SPIDAPTER_ORGANIZATION_TAG"
230230
231-
# Parse custom image into registry, name, and tag for spidapter.
232-
# Expected format: registry/image:tag (e.g. ghcr.io/spiceai/spiceai-dev:spicebench-sf10)
233-
# Parses as: registry=ghcr.io, image=spiceai/spiceai-dev, tag=spicebench-sf10
234-
if [ -n "${CUSTOM_IMAGE}" ]; then
235-
IMAGE_WITH_TAG="${CUSTOM_IMAGE}"
236-
if [[ "${IMAGE_WITH_TAG}" == *":"* ]]; then
237-
SPIDAPTER_IMAGE_TAG="${IMAGE_WITH_TAG##*:}"
238-
IMAGE_WITHOUT_TAG="${IMAGE_WITH_TAG%:*}"
239-
else
240-
SPIDAPTER_IMAGE_TAG=""
241-
IMAGE_WITHOUT_TAG="${IMAGE_WITH_TAG}"
242-
fi
243-
# Registry is the first path component (hostname), image is the rest
244-
SPIDAPTER_IMAGE_REGISTRY="${IMAGE_WITHOUT_TAG%%/*}"
245-
SPIDAPTER_IMAGE_NAME="${IMAGE_WITHOUT_TAG#*/}"
246-
247-
echo "Custom image: registry=${SPIDAPTER_IMAGE_REGISTRY}, name=${SPIDAPTER_IMAGE_NAME}, tag=${SPIDAPTER_IMAGE_TAG}"
248-
ADAPTER_DOCKER_OPTS="${ADAPTER_DOCKER_OPTS} -e SPIDAPTER_IMAGE_REGISTRY=${SPIDAPTER_IMAGE_REGISTRY} -e SPIDAPTER_IMAGE_NAME=${SPIDAPTER_IMAGE_NAME}"
249-
if [ -n "${SPIDAPTER_IMAGE_TAG}" ]; then
250-
ADAPTER_DOCKER_OPTS="${ADAPTER_DOCKER_OPTS} -e SPIDAPTER_IMAGE_TAG=${SPIDAPTER_IMAGE_TAG}"
251-
fi
231+
# Optional custom image from ghcr.io/spiceai/spiceai-dev
232+
if [ -n "${CUSTOM_IMAGE_TAG}" ]; then
233+
echo "Custom image tag: tag=${CUSTOM_IMAGE_TAG}"
234+
ADAPTER_DOCKER_OPTS="${ADAPTER_DOCKER_OPTS} -e SPIDAPTER_IMAGE_TAG=${CUSTOM_IMAGE_TAG}"
252235
fi
253236
254237
if [ "${ENABLE_PVC}" = "true" ]; then
@@ -258,7 +241,7 @@ jobs:
258241
259242
# Use internal channel when a custom image is specified, otherwise nightly.
260243
SPIDAPTER_CHANNEL="nightly"
261-
if [ -n "${CUSTOM_IMAGE}" ]; then
244+
if [ -n "${CUSTOM_IMAGE_TAG}" ]; then
262245
SPIDAPTER_CHANNEL="internal"
263246
fi
264247

0 commit comments

Comments
 (0)