Skip to content

Commit

Permalink
use SKYSCAN_EWMS_JSON to configure mq - 3
Browse files Browse the repository at this point in the history
  • Loading branch information
ric-evans committed Feb 5, 2025
1 parent 4536117 commit eaa4e32
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions resources/launch_scripts/local-scan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,11 @@ else
--mount type=bind,source="$CI_SKYSCAN_CACHE_DIR",target=/local/cache \
--mount type=bind,source="$CI_SKYSCAN_OUTPUT_DIR",target=/local/output \
--mount type=bind,source="$(dirname "$CI_SKYSCAN_STARTUP_JSON")",target=/local/startup \
--mount type=bind,source="$(dirname "$_EWMS_JSON_ON_HOST")",target=/local/ewms \
--env PY_COLORS=1 \
$(env | grep -E '^(SKYSCAN_|_SKYSCAN_)' | cut -d'=' -f1 | sed 's/^/--env /') \
$(env | grep -E '^(EWMS_|_EWMS_)' | cut -d'=' -f1 | sed 's/^/--env /') \
--env SKYSCAN_EWMS_JSON="/local/ewms/$(basename "$_EWMS_JSON_ON_HOST")" \
"$CI_DOCKER_IMAGE_TAG" \
python -m skymap_scanner.server \
--reco-algo $_RECO_ALGO \
Expand Down
4 changes: 2 additions & 2 deletions tests/env-vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ set -ex # file is sourced so turn off at end
export SKYSCAN_SKYDRIVER_SCAN_ID=$(uuidgen)

# mq attrs
export SKYSCAN_EWMS_JSON="$PWD/ewms.json"
cat <<EOF > "$SKYSCAN_EWMS_JSON"
export _EWMS_JSON_ON_HOST="$PWD/ewms.json"
cat <<EOF > "$_EWMS_JSON_ON_HOST"
{
"toclient": {
"name": "to-clients-$SKYSCAN_SKYDRIVER_SCAN_ID",
Expand Down

0 comments on commit eaa4e32

Please sign in to comment.