diff --git a/configs/docker/run/runDockerEWS.sh b/configs/docker/run/runDockerEWS.sh index c293d67226e635d20f2c19cdcd81090324f2abb7..ac418845e2426d45c620dbc0f95124dcc3940d06 100755 --- a/configs/docker/run/runDockerEWS.sh +++ b/configs/docker/run/runDockerEWS.sh @@ -1,10 +1,12 @@ #!/bin/bash set -e +upload='' +islive='' +clearup='' component='not_set' config='/storage/app/EWS_prod/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json' # default rundate=$(date '+%Y%m%d') # default today -optionalArgs="" SHORT=p:c:s:h @@ -29,15 +31,15 @@ do shift 2 ;; --noupload ) - optionalArgs="$optionalArgs --noupload" + upload="--noupload" shift 2; ;; --islive ) - optionalArgs="$optionalArgs --islive" + islive="--islive" shift 2; ;; --clearup ) - optionalArgs="$optionalArgs --clearup" + clearup="--clearup" shift 2; ;; -h | --help) @@ -58,7 +60,7 @@ done function run_coordinator() { printf "component: %s\nconfig: %s\nrundate: %s\n" "$component" "$config" "$rundate" - printf "optional args:\n%s\n" "$optionalArgs" + printf "optional args:\n%s\n" "$upload $islive $clearup" docker container ls; docker exec \ ews_runner \ @@ -66,7 +68,9 @@ function run_coordinator() { -p "$component" \ -c "$config" \ -s "$rundate" \ - "$optionalArgs" + $upload \ + $islive \ + $clearup } run_coordinator diff --git a/tests/integration/full/run_tests.sh b/tests/integration/full/run_tests.sh index dcba288c5644df0e066e7cd6af20915c64e2e0f9..818284fe442568cc0d3af21869101596263a8765 100755 --- a/tests/integration/full/run_tests.sh +++ b/tests/integration/full/run_tests.sh @@ -4,7 +4,8 @@ source /storage/app/miniconda3/bin/activate /storage/app/EWS_prod/envs/conda/py3EWS/ -PACKAGES_DIR="../../../../" # assumes run from the tests/integration/partial dir +# assumes run from the tests/integration/full dir, and that all necessary packages are checked out alongside +PACKAGES_DIR="../../../../" flagdir=$PACKAGES_DIR/flagdir epimodel=$PACKAGES_DIR/epimodel diff --git a/tests/integration/partial/run_test_suite.sh b/tests/integration/partial/run_test_suite.sh index 4c57e09c0b0b853b6691516cb84dafbedb12ecd1..a735b55cd52223f2caae42c2cbbfa56ba2db5fe9 100755 --- a/tests/integration/partial/run_test_suite.sh +++ b/tests/integration/partial/run_test_suite.sh @@ -4,7 +4,8 @@ source /storage/app/miniconda3/bin/activate /storage/app/EWS_prod/envs/conda/py3EWS/ -PACKAGES_DIR="../../../../" # assumes run from the tests/integration/partial dir +# assumes run from the tests/integration/partial dir, and that all necessary packages are checked out alongside +PACKAGES_DIR="../../../../" flagdir=$PACKAGES_DIR/flagdir epimodel=$PACKAGES_DIR/epimodel @@ -22,8 +23,3 @@ export PYTHONPATH=$PYTHONPATH:$flagdir:$epimodel:$advisory:$met_processing:$met_ echo $PYTHONPATH python3 -m coverage run run_test_suite.py -#python3 -m unittest test_advisory.py -#python3 -m unittest test_deposition.py -#python3 -m unittest test_env_suit.py -#python3 -m unittest test_epi.py -#python3 -m unittest test_survey.py