From a345ce4f533cc7869ea8095fd2bb4c55cf3f84d9 Mon Sep 17 00:00:00 2001 From: Jackie Date: Mon, 4 Jun 2018 13:39:39 -0400 Subject: [PATCH] fix render-local-env script for using local UI (#403) --- automation/render-local-env.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/automation/render-local-env.sh b/automation/render-local-env.sh index c95625f2150..6a287e52f9e 100755 --- a/automation/render-local-env.sh +++ b/automation/render-local-env.sh @@ -12,6 +12,11 @@ ENV=dev SERVICE=leonardo LOCAL_UI=${LOCAL_UI:-false} # local ui defaults to false unless set in the env +FC_INSTANCE=fiab +if [ $LOCAL_UI = "true" ]; then + FC_INSTANCE=local +fi + # Parameters FIRECLOUD_AUTOMATED_TESTING_BRANCH=${1:-$FIRECLOUD_AUTOMATED_TESTING_BRANCH} VAULT_TOKEN=${2:-$VAULT_TOKEN} @@ -59,13 +64,13 @@ render_configs() { docker pull broadinstitute/dsde-toolbox:dev docker run -it --rm -e VAULT_TOKEN=${VAULT_TOKEN} \ -e ENVIRONMENT=${ENV} -e ROOT_DIR=${WORKING_DIR} -v $PWD/firecloud-automated-testing/configs:/input -v $PWD/$SCRIPT_ROOT:/output \ - -e OUT_PATH=/output/src/test/resources -e INPUT_PATH=/input -e LOCAL_UI=$LOCAL_UI \ + -e OUT_PATH=/output/src/test/resources -e INPUT_PATH=/input -e LOCAL_UI=$LOCAL_UI -e FC_INSTANCE=$FC_INSTANCE \ broadinstitute/dsde-toolbox:dev render-templates.sh # pull service-specific application.conf docker run -it --rm -e VAULT_TOKEN=${VAULT_TOKEN} \ -e ENVIRONMENT=${ENV} -e ROOT_DIR=${WORKING_DIR} -v $PWD/firecloud-automated-testing/configs/$SERVICE:/input -v $PWD/$SCRIPT_ROOT:/output \ - -e OUT_PATH=/output/src/test/resources -e INPUT_PATH=/input -e LOCAL_UI=$LOCAL_UI \ + -e OUT_PATH=/output/src/test/resources -e INPUT_PATH=/input -e LOCAL_UI=$LOCAL_UI -e FC_INSTANCE=$FC_INSTANCE \ broadinstitute/dsde-toolbox:dev render-templates.sh cd $original_dir }