diff --git a/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/stopClearCompose.sh b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/stopClearCompose.sh index 904ded4d5879e2fe550f499f31262667107dd494..2a2f4abce435c63e4eff0d9847a25cf5c0896d12 100755 --- a/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/stopClearCompose.sh +++ b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/stopClearCompose.sh @@ -1,13 +1,9 @@ #!/bin/bash -WORKDIR="$(dirname $0)" -SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..") -source "${SMP_PROJECT_FOLDER}/smp-docker/functions/common.functions" -source "${SMP_PROJECT_FOLDER}/smp-docker/functions/run-test.functions" -[ -f "${WORKDIR}/.env" ] && source "${WORKDIR}/.env" -cd "${WORKDIR}" || exit 100 -initializeCommonVariables -discoverApplicationVersion +# init plan variables +WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)" +source "${WORKDIR}/../../functions/run-test.functions" +initializeVariables echo "Clear old containers" stopAndClearTestContainers diff --git a/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/stopClearCompose.sh b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/stopClearCompose.sh index 904ded4d5879e2fe550f499f31262667107dd494..2a2f4abce435c63e4eff0d9847a25cf5c0896d12 100755 --- a/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/stopClearCompose.sh +++ b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/stopClearCompose.sh @@ -1,13 +1,9 @@ #!/bin/bash -WORKDIR="$(dirname $0)" -SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..") -source "${SMP_PROJECT_FOLDER}/smp-docker/functions/common.functions" -source "${SMP_PROJECT_FOLDER}/smp-docker/functions/run-test.functions" -[ -f "${WORKDIR}/.env" ] && source "${WORKDIR}/.env" -cd "${WORKDIR}" || exit 100 -initializeCommonVariables -discoverApplicationVersion +# init plan variables +WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)" +source "${WORKDIR}/../../functions/run-test.functions" +initializeVariables echo "Clear old containers" stopAndClearTestContainers