From abb0b2d52e8082a8e24e0d89f11b12477ae8ad96 Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Tue, 16 Jan 2024 11:47:18 +0100
Subject: [PATCH] Fix build
---
.../compose/domismp-wls122-oradb/runCompose.sh | 12 +++---------
.../compose/domismp-wls141-oradb/runCompose.sh | 12 +++---------
2 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/runCompose.sh b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/runCompose.sh
index 2ed15971d..c402ba756 100755
--- a/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/runCompose.sh
+++ b/domismp-tests/domismp-docker/compose/domismp-wls122-oradb/runCompose.sh
@@ -1,15 +1,9 @@
#!/bin/bash
+# init plan variables
WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
-cd "${WORKDIR}" || exit 100
-echo "Working Directory: ${WORKDIR}"
-# project folder
-SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
-#load common functions
-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"
-initializeCommonVariables
+source "${WORKDIR}/../../functions/run-test.functions"
+initializeVariables
SMP_INIT_DATABASE="${SMP_PROJECT_FOLDER}/smp-webapp/src/main/smp-setup/database-scripts/oracle10g.ddl"
#SMP_INIT_DATABASE_DATA="${SMP_PROJECT_FOLDER}/smp-webapp/src/main/smp-setup/database-scripts/oracle10g-data.sql"
diff --git a/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/runCompose.sh b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/runCompose.sh
index 92f85bf8f..720d210de 100755
--- a/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/runCompose.sh
+++ b/domismp-tests/domismp-docker/compose/domismp-wls141-oradb/runCompose.sh
@@ -1,15 +1,9 @@
#!/bin/bash
+# init plan variables
WORKDIR="$(cd -P $(dirname ${BASH_SOURCE[0]} ) && pwd)"
-cd "${WORKDIR}" || exit 100
-echo "Working Directory: ${WORKDIR}"
-# project folder
-SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
-#load common functions
-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"
-initializeCommonVariables
+source "${WORKDIR}/../../functions/run-test.functions"
+initializeVariables
SMP_INIT_DATABASE="${SMP_PROJECT_FOLDER}/smp-webapp/src/main/smp-setup/database-scripts/oracle10g.ddl"
#SMP_INIT_DATABASE_DATA="${SMP_PROJECT_FOLDER}/smp-webapp/src/main/smp-setup/database-scripts/oracle10g-data.sql"
--
GitLab