diff options
| author |   waqas.ikram <waqas.ikram@est.tech> | 2019-08-30 18:55:48 +0000 |
|---|---|---|
| committer | Waqas Ikram <waqas.ikram@est.tech> | 2019-08-30 18:56:25 +0000 |
| commit | 8c6cd4fd37d8958a670235751bc57e43ea4e4d63 (patch) | |
| tree | 9bcaf024e69e4e0187c667535f0f62eb120a5386 /plans/so | |
| parent | e21d1a8d8db1e9d17e89e0729238f5529d696be3 (diff) | |
minor update to setup.sh script
Change-Id: Ic429358d94c3bb2f4224584177da857615cdf060
Issue-ID: SO-2239
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
Diffstat (limited to 'plans/so')
| -rwxr-xr-x | plans/so/integration-etsi-testing/setup.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plans/so/integration-etsi-testing/setup.sh b/plans/so/integration-etsi-testing/setup.sh index ee0058ef..440eae9f 100755 --- a/plans/so/integration-etsi-testing/setup.sh +++ b/plans/so/integration-etsi-testing/setup.sh @@ -31,6 +31,7 @@ ENV_FILE=$CONFIG_DIR/env TEMP_DIR_PATH=$SCRIPT_HOME/temp TEST_LAB_DIR_PATH=$TEMP_DIR_PATH/test_lab DOCKER_COMPOSE_FILE_PATH=$SCRIPT_HOME/docker-compose.yml +TEAR_DOWN_SCRIPT=$SCRIPT_HOME/teardown.sh MAVEN_DIR=$TEMP_DIR_PATH/maven INSTALLED_MAVEN_DIR=$MAVEN_DIR/$MAVEN_VERSION_DIR @@ -148,7 +149,7 @@ $WAIT_FOR_WORKAROUND_SCRIPT if [ $? -ne 0 ]; then echo "ERROR: $WAIT_FOR_WORKAROUND_SCRIPT failed" echo "Will stop running docker containers . . ." - docker-compose -f $DOCKER_COMPOSE_FILE_PATH -p $PROJECT_NAME down + $TEAR_DOWN_SCRIPT exit 1 fi @@ -158,7 +159,7 @@ $WAIT_FOR_POPULATE_AAI_SCRIPT if [ $? -ne 0 ]; then echo "ERROR: $WAIT_FOR_POPULATE_AAI_SCRIPT failed" echo "Will stop running docker containers . . ." - docker-compose -f $DOCKER_COMPOSE_FILE_PATH -p $PROJECT_NAME down + $TEAR_DOWN_SCRIPT exit 1 fi @@ -169,7 +170,7 @@ $WAIT_FOR_CONTAINER_SCRIPT -c "$API_INFRA_CONTAINER_NAME" -t "300" -n "$DEFAULT_ if [ $? -ne 0 ]; then echo "ERROR: $WAIT_FOR_CONTAINER_SCRIPT failed" echo "Will stop running docker containers . . ." - docker-compose -f $DOCKER_COMPOSE_FILE_PATH -p $PROJECT_NAME down + $TEAR_DOWN_SCRIPT exit 1 fi |