From daecbb96b9a747a2edaf33a3e9a9784cc71440a8 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Fri, 19 Jul 2024 13:50:04 +0100 Subject: Add CSIT option to run xacml-pdp against postgres database Issue-ID: POLICY-5087 Change-Id: Icfece3dbb9263e09a4d59edbea8acad5a4ea7ce3 Signed-off-by: adheli.tavares --- csit/run-project-csit.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'csit') diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh index aa19b257..36bad1ff 100755 --- a/csit/run-project-csit.sh +++ b/csit/run-project-csit.sh @@ -80,7 +80,7 @@ function setup_apex() { function setup_apex_postgres() { export ROBOT_FILES="apex-pdp-test.robot" - source "${WORKSPACE}"/compose/start-postgres-tests.sh 1 + source "${WORKSPACE}"/compose/start-postgres-tests.sh apex-pdp 1 sleep 10 bash "${SCRIPTS}"/wait_for_rest.sh localhost ${PAP_PORT} bash "${SCRIPTS}"/wait_for_rest.sh localhost ${APEX_PORT} @@ -141,6 +141,13 @@ function setup_xacml_pdp() { bash "${SCRIPTS}"/wait_for_rest.sh localhost "${XACML_PORT}" } +function setup_xacml_pdp_postgres() { + export ROBOT_FILES="xacml-pdp-test.robot" + source "${WORKSPACE}"/compose/start-postgres-tests.sh xacml-pdp 1 + sleep 10 + bash "${SCRIPTS}"/wait_for_rest.sh localhost "${XACML_PORT}" +} + function setup_drools_pdp() { export ROBOT_FILES="drools-pdp-test.robot" source "${WORKSPACE}"/compose/start-compose.sh drools-pdp @@ -197,7 +204,7 @@ function set_project_config() { ;; apex-pdp-postgres | policy-apex-pdp-postgres) - setup_apex + setup_apex_postgres ;; apex-pdp-medium | policy-apex-pdp-medium) @@ -212,6 +219,10 @@ function set_project_config() { setup_xacml_pdp ;; + xacml-pdp-postgres | policy-xacml-pdp-postgres) + setup_xacml_pdp_postgres + ;; + drools-pdp | policy-drools-pdp) setup_drools_pdp ;; @@ -253,6 +264,8 @@ export PROJECT="${1}" export ROBOT_LOG_DIR=${WORKSPACE}/csit/archives/${PROJECT} export SCRIPTS="${WORKSPACE}/csit/resources/scripts" export ROBOT_FILES="" +# always 'docker' if running docker compose +export TEST_ENV="docker" cd "${WORKSPACE}" -- cgit 1.2.3-korg