summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlukegleeson <luke.gleeson@est.tech>2022-08-16 16:52:53 +0100
committerlukegleeson <luke.gleeson@est.tech>2022-08-16 16:52:53 +0100
commitcc43240bdb317de2d0d5c20f1379a62989d160ef (patch)
tree5e87c05cf01fe3dfc65e4742b6229fe36ed7601a
parent060499cb5a89a0fd3d8480132ed82d2e291839dc (diff)
Set Sleep Times as Environment Variable in CSIT
Sleep times for Model and Data sync were being set to 2 seconds in the docker-compose file so that it may be used in CSIT tests This change defaults them to 30 seconds and adds environment variables which are overridden by the test.properties for CSIT tests Issue-ID: CPS-1195 Signed-off-by: lukegleeson <luke.gleeson@est.tech> Change-Id: Id254e3ec82fb4685fd6678d1a345b16f108b2707
-rw-r--r--csit/plans/cps/test.properties5
-rw-r--r--docker-compose/docker-compose.yml4
2 files changed, 6 insertions, 3 deletions
diff --git a/csit/plans/cps/test.properties b/csit/plans/cps/test.properties
index 47bb43b0a1..449aa93816 100644
--- a/csit/plans/cps/test.properties
+++ b/csit/plans/cps/test.properties
@@ -23,4 +23,7 @@ DMI_SERVICE_URL=http://$LOCAL_IP:$DMI_PORT
DOCKER_REPO=nexus3.onap.org:10003
CPS_VERSION=latest
-DMI_VERSION=1.2.0-SNAPSHOT-latest \ No newline at end of file
+DMI_VERSION=1.2.0-SNAPSHOT-latest
+
+ADVISED_MODULES_SYNC_SLEEP_TIME_MS=2000
+CMHANDLE_DATA_SYNC_SLEEP_TIME_MS=2000 \ No newline at end of file
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 8d3a0a3579..ca7795f2f7 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -49,8 +49,8 @@ services:
notification.enabled: 'true'
notification.async.executor.time-out-value-in-ms: 2000
NOTIFICATION_DATASPACE_FILTER_PATTERNS: '.*'
- TIMERS_ADVISED-MODULES-SYNC_SLEEP-TIME-MS: 2000
- TIMERS_CM-HANDLE-DATA-SYNC_SLEEP-TIME-MS: 2000
+ TIMERS_ADVISED-MODULES-SYNC_SLEEP-TIME-MS: ${ADVISED_MODULES_SYNC_SLEEP_TIME_MS:-30000}
+ TIMERS_CM-HANDLE-DATA-SYNC_SLEEP-TIME-MS: ${CMHANDLE_DATA_SYNC_SLEEP_TIME_MS:-30000}
restart: unless-stopped
depends_on:
- dbpostgresql