summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwaynedunican <wayne.dunican@est.tech>2023-05-09 09:49:07 +0100
committerwaynedunican <wayne.dunican@est.tech>2023-05-09 10:08:56 +0100
commit9c177aecb35b3d0832959ea057f819998ab2eed3 (patch)
tree6e8f71fb1c498b72b5777b4289982c831dfefd6b
parent65fc37591b2934871e7ca4d2db4a76ad4bba7572 (diff)
Fix Apex-PDP postgres CSIT failures
- Fix APEX_EVENTS_PORT variable - Bring up promethues Issue-ID: POLICY-4645 Change-Id: Ief2627d910f86796b42e9a8a289e12564b8c83a0 Signed-off-by: waynedunican <wayne.dunican@est.tech>
-rw-r--r--compose/start-postgres-tests.sh2
-rwxr-xr-xcsit/resources/scripts/setup-apex-pdp-postgres.sh5
2 files changed, 3 insertions, 4 deletions
diff --git a/compose/start-postgres-tests.sh b/compose/start-postgres-tests.sh
index 112bdce6..1c08600a 100644
--- a/compose/start-postgres-tests.sh
+++ b/compose/start-postgres-tests.sh
@@ -31,6 +31,6 @@ source export-ports.sh > /dev/null 2>&1
source get-versions.sh > /dev/null 2>&1
export REPLICAS=${1}
-docker-compose -f docker-compose.postgres.yml up -d apex-pdp
+docker-compose -f docker-compose.postgres.yml up -d apex-pdp prometheus
cd ${WORKSPACE} \ No newline at end of file
diff --git a/csit/resources/scripts/setup-apex-pdp-postgres.sh b/csit/resources/scripts/setup-apex-pdp-postgres.sh
index 21eb6e63..f088da3c 100755
--- a/csit/resources/scripts/setup-apex-pdp-postgres.sh
+++ b/csit/resources/scripts/setup-apex-pdp-postgres.sh
@@ -17,10 +17,9 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-export PROJECT="apex-pdp"
source "${SCRIPTS}"/node-templates.sh
-source "${WORKSPACE}"/compose/start-postgres-tests.sh
+source "${WORKSPACE}"/compose/start-postgres-tests.sh 1
sleep 10
unset http_proxy https_proxy
@@ -51,4 +50,4 @@ export SUITES="apex-pdp-test.robot"
ROBOT_VARIABLES="-v POLICY_PAP_IP:localhost:${PAP_PORT} -v POLICY_API_IP:localhost:${API_PORT}
-v PROMETHEUS_IP:localhost:${PROMETHEUS_PORT} -v DATA:${DATA} -v NODETEMPLATES:${NODETEMPLATES}
-v APEX_IP:localhost:${APEX_PORT} -v DMAAP_IP:${DMAAP_IP}
--v APEX_EVENTS_IP:localhost:${APEX_PORT}"
+-v APEX_EVENTS_IP:localhost:${APEX_EVENTS_PORT}"