5 files changed, 15 insertions, 10 deletions
diff --git a/plans/policy/apex-pdp/setup.sh b/plans/policy/apex-pdp/setup.sh
index 377ce4b1..d3c1d629 100644
--- a/plans/policy/apex-pdp/setup.sh
+++ b/plans/policy/apex-pdp/setup.sh
@@ -64,8 +64,8 @@ echo ${POLICY_APEX_PDP_VERSION}
 docker-compose -f ${WORKSPACE}/scripts/policy/policy-apex-pdp/docker-compose-apex.yml run --rm start_dependencies
 
 #Configure the database
-docker exec -it mariadb  chmod +x /docker-entrypoint-initdb.d/db.sh
-docker exec -it mariadb  /docker-entrypoint-initdb.d/db.sh
+docker exec --tty mariadb  chmod +x /docker-entrypoint-initdb.d/db.sh
+docker exec --tty mariadb  /docker-entrypoint-initdb.d/db.sh
 
 # now bring everything else up
 docker-compose -f ${WORKSPACE}/scripts/policy/policy-apex-pdp/docker-compose-apex.yml run --rm start_all
diff --git a/plans/policy/api/setup.sh b/plans/policy/api/setup.sh
index 8bd4b4af..466435d3 100644
--- a/plans/policy/api/setup.sh
+++ b/plans/policy/api/setup.sh
@@ -38,8 +38,8 @@ echo ${POLICY_API_VERSION}
 docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-api.yml run --rm start_dependencies
 
 #Configure the database
-docker exec -it mariadb  chmod +x /docker-entrypoint-initdb.d/db.sh
-docker exec -it mariadb  /docker-entrypoint-initdb.d/db.sh
+docker exec --tty mariadb  chmod +x /docker-entrypoint-initdb.d/db.sh
+docker exec --tty mariadb  /docker-entrypoint-initdb.d/db.sh
 
 # now bring everything else up
 docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-api.yml run --rm start_all
diff --git a/plans/policy/distribution/setup.sh b/plans/policy/distribution/setup.sh
index d1a08632..52573b58 100644
--- a/plans/policy/distribution/setup.sh
+++ b/plans/policy/distribution/setup.sh
@@ -72,8 +72,8 @@ zip -F ${SCRIPT_DIR}/config/distribution/csar/sample_csar_with_apex_policy.csar
 docker-compose -f ${SCRIPT_DIR}/docker-compose-distribution.yml run --rm start_dependencies
 
 #Configure the database
-docker exec -it mariadb  chmod +x /docker-entrypoint-initdb.d/db.sh
-docker exec -it mariadb  /docker-entrypoint-initdb.d/db.sh
+docker exec --tty mariadb  chmod +x /docker-entrypoint-initdb.d/db.sh
+docker exec --tty mariadb  /docker-entrypoint-initdb.d/db.sh
 
 # now bring everything else up
 docker-compose -f ${SCRIPT_DIR}/docker-compose-distribution.yml run --rm start_all
diff --git a/plans/policy/pap/setup.sh b/plans/policy/pap/setup.sh
index a5350b2d..5b060497 100644
--- a/plans/policy/pap/setup.sh
+++ b/plans/policy/pap/setup.sh
@@ -40,8 +40,8 @@ echo ${POLICY_PAP_VERSION}
 docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-pap.yml run --rm start_dependencies
 
 #Configure the database
-docker exec -it mariadb  chmod +x /docker-entrypoint-initdb.d/db.sh
-docker exec -it mariadb  /docker-entrypoint-initdb.d/db.sh
+docker exec --tty mariadb  chmod +x /docker-entrypoint-initdb.d/db.sh
+docker exec --tty mariadb  /docker-entrypoint-initdb.d/db.sh
 
 # now bring everything else up
 docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-pap.yml run --rm start_all
diff --git a/plans/policy/xacml-pdp/setup.sh b/plans/policy/xacml-pdp/setup.sh
index 72d1115e..faf256fa 100644
--- a/plans/policy/xacml-pdp/setup.sh
+++ b/plans/policy/xacml-pdp/setup.sh
@@ -72,11 +72,16 @@ POLICY_PDPX_IP=`get-instance-ip.sh policy-xacml-pdp`
 DMAAP_IP=`get-instance-ip.sh dmaap-simulator`
 POLICY_PAP_IP=`get-instance-ip.sh policy-pap`
 
-
 echo PDP IP IS ${POLICY_PDPX_IP}
 echo API IP IS ${POLICY_API_IP}
 echo PAP IP IS ${POLICY_PAP_IP}
 echo MARIADB IP IS ${MARIADB_IP}
 echo DMAAP_IP IS ${DMAAP_IP}
 
-ROBOT_VARIABLES="-v POLICY_PDPX_IP:${POLICY_PDPX_IP} -v POLICY_API_IP:${POLICY_API_IP} -v POLICY_PAP_IP:${POLICY_PAP_IP}"
+DATA2=${WORKSPACE}/dmaap-sim/models/models-examples/src/main/resources/policies
+
+ROBOT_VARIABLES=""
+ROBOT_VARIABLES="${ROBOT_VARIABLES} -v DATA2:${DATA2}"
+ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_PDPX_IP:${POLICY_PDPX_IP}"
+ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_API_IP:${POLICY_API_IP}"
+ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_PAP_IP:${POLICY_PAP_IP}"