From cc43240bdb317de2d0d5c20f1379a62989d160ef Mon Sep 17 00:00:00 2001 From: lukegleeson Date: Tue, 16 Aug 2022 16:52:53 +0100 Subject: 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 Change-Id: Id254e3ec82fb4685fd6678d1a345b16f108b2707 --- csit/plans/cps/test.properties | 5 ++++- docker-compose/docker-compose.yml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/csit/plans/cps/test.properties b/csit/plans/cps/test.properties index 47bb43b0a..449aa9381 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 8d3a0a357..ca7795f2f 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 -- cgit 1.2.3-korg