From c4a40a1cefe8644e033abdeb36e4ceb720466e14 Mon Sep 17 00:00:00 2001
From: Ric Evans <ric@evans-jacquez.com>
Date: Thu, 28 Sep 2023 10:25:13 -0500
Subject: [PATCH] update env vars

---
 .github/workflows/tests.yml |  1 +
 tests/env-vars.sh           | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a59792e2c..13045afc1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -23,6 +23,7 @@ env:
   SKYSCAN_CACHE_DIR: /home/runner/work/skymap_scanner/skymap_scanner/cache
   SKYSCAN_OUTPUT_DIR: /home/runner/work/skymap_scanner/skymap_scanner/output
   SKYSCAN_DEBUG_DIR: /home/runner/work/skymap_scanner/skymap_scanner/debug
+  EWMS_PILOT_DUMP_SUBPROC_OUTPUT: False  # get logs in "reco-icetray logs" step instead
   # see source tests/env-vars.sh
 
 
diff --git a/tests/env-vars.sh b/tests/env-vars.sh
index 1fcc9188a..6150b0c99 100755
--- a/tests/env-vars.sh
+++ b/tests/env-vars.sh
@@ -3,18 +3,23 @@ set -ex  # file is sourced so turn off at end
 
 # export SKYSCAN_CACHE_DIR=$PWD/cache-dir -- rely on user value
 # export SKYSCAN_OUTPUT_DIR=$PWD/output-dir -- rely on user value
-export SKYSCAN_BROKER_CLIENT=rabbitmq
+export SKYSCAN_BROKER_CLIENT=${SKYSCAN_BROKER_CLIENT:-"rabbitmq"}
 # note=auth env vars are in job(s)
-export EWMS_PILOT_TASK_TIMEOUT=1800
+
+export EWMS_PILOT_TASK_TIMEOUT=${EWMS_PILOT_TASK_TIMEOUT:-1800}
+export EWMS_PILOT_DUMP_SUBPROC_OUTPUT=${EWMS_PILOT_DUMP_SUBPROC_OUTPUT:-"True"}
+
 # export SKYSCAN_DEBUG_DIR=debug-pkl-dir -- rely on user value
-export SKYSCAN_MQ_TIMEOUT_TO_CLIENTS=5
-export SKYSCAN_MQ_TIMEOUT_FROM_CLIENTS=1800
-# export SKYSCAN_MQ_CLIENT_TIMEOUT_WAIT_FOR_FIRST_MESSAGE=120
-export SKYSCAN_DOCKER_PULL_ALWAYS=0
-export SKYSCAN_DOCKER_IMAGE_TAG=local
-export SKYSCAN_MINI_TEST='yes'
-export SKYSCAN_LOG=DEBUG
-export SKYSCAN_LOG_THIRD_PARTY=INFO
-export CLIENT_STARTER_WAIT_FOR_STARTUP_JSON=120
+export SKYSCAN_MQ_TIMEOUT_TO_CLIENTS=${SKYSCAN_MQ_TIMEOUT_TO_CLIENTS:-5}
+export SKYSCAN_MQ_TIMEOUT_FROM_CLIENTS=${SKYSCAN_MQ_TIMEOUT_FROM_CLIENTS:-1800}
+# export SKYSCAN_MQ_CLIENT_TIMEOUT_WAIT_FOR_FIRST_MESSAGE=0
+
+export SKYSCAN_DOCKER_PULL_ALWAYS=${SKYSCAN_DOCKER_PULL_ALWAYS:-0}
+export SKYSCAN_DOCKER_IMAGE_TAG=${SKYSCAN_DOCKER_IMAGE_TAG:-"local"}
+export SKYSCAN_MINI_TEST=${SKYSCAN_MINI_TEST:-'yes'}
+export SKYSCAN_LOG=${SKYSCAN_LOG:-"DEBUG"}
+export SKYSCAN_LOG_THIRD_PARTY=${SKYSCAN_LOG_THIRD_PARTY:-"INFO"}
+
+export CLIENT_STARTER_WAIT_FOR_STARTUP_JSON=${CLIENT_STARTER_WAIT_FOR_STARTUP_JSON:-12}
 
-set +ex
+set +ex  # file is sourced so turn off
\ No newline at end of file