Updating Distribution S3P configuration.

- fixing the scripts and jmx files after stability long run failures.

Issue-ID: POLICY-3654
Change-Id: I0ff0bf625f226f1b71664c1817cef65fbd5cf5a6
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

6 files changed, 11 insertions, 16 deletions

diff --git a/testsuites/stability/src/main/resources/setup/config/jsonConfigs/papConfigFile.json b/testsuites/stability/src/main/resources/setup/config/jsonConfigs/papConfigFile.json
index 456735be..790a8ea6 100644
--- a/testsuites/stability/src/main/resources/setup/config/jsonConfigs/papConfigFile.json
+++ b/testsuites/stability/src/main/resources/setup/config/jsonConfigs/papConfigFile.json
@@ -10,7 +10,7 @@
         "prometheus": true
     },
     "pdpParameters": {
-        "heartBeatMs": 20000,
+        "heartBeatMs": 300000,
         "updateParameters": {
             "maxRetryCount": 1,
             "maxWaitMs": 30000
diff --git a/testsuites/stability/src/main/resources/setup/config/wait_for_port.sh b/testsuites/stability/src/main/resources/setup/config/wait_for_port.sh
index 63e2a493..56b5a825 100755
--- a/testsuites/stability/src/main/resources/setup/config/wait_for_port.sh
+++ b/testsuites/stability/src/main/resources/setup/config/wait_for_port.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # ============LICENSE_START====================================================
-# Copyright (C) 2020 Nordix Foundation.
+# Copyright (C) 2020-2021 Nordix Foundation.
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/testsuites/stability/src/main/resources/setup/distribution/etc/logback.xml b/testsuites/stability/src/main/resources/setup/distribution/etc/logback.xml
index 2b77efb6..34a40204 100644
--- a/testsuites/stability/src/main/resources/setup/distribution/etc/logback.xml
+++ b/testsuites/stability/src/main/resources/setup/distribution/etc/logback.xml
@@ -21,7 +21,7 @@
 
 <configuration scan="true" scanPeriod="30 seconds" debug="false">
 
-    <property name="logDir" value="/home/policydistribution" />
+    <property name="logDir" value="/home/policydistribution/logs" />
 
     <property name="errorLog" value="error" />
     <property name="debugLog" value="debug" />
@@ -102,7 +102,7 @@
         <appender-ref ref="AsyncNetworkOut" />
     </logger>
 
-    <root level="INFO">
+    <root level="ERROR">
         <appender-ref ref="AsyncDebugOut" />
         <appender-ref ref="AsyncErrorOut" />
     </root>
diff --git a/testsuites/stability/src/main/resources/setup/docker-compose.yml b/testsuites/stability/src/main/resources/setup/docker-compose.yml
index e36a0c8b..fac04fa2 100644
--- a/testsuites/stability/src/main/resources/setup/docker-compose.yml
+++ b/testsuites/stability/src/main/resources/setup/docker-compose.yml
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 Nordix Foundation.
+# Copyright (C) 2021 Nordix Foundation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -66,11 +66,6 @@ services:
       volumes:
          - ./config/wait_for_port.sh:/opt/app/policy/pdp-sim/bin/wait_for_port.sh:ro
          - ./config/jsonConfigs/pdpSimConfig.json:/opt/app/policy/pdp-sim/etc/config/OnapPfConfig.json:ro
-      entrypoint: /opt/app/policy/pdp-sim/bin/wait_for_port.sh
-      command: [
-            '-c', '/opt/app/policy/pdp-sim/bin/pdp-sim.sh',
-            'message-router', '3904',
-      ]
    policy-api:
       image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION}
       container_name: policy-api
diff --git a/testsuites/stability/src/main/resources/setup/start.sh b/testsuites/stability/src/main/resources/setup/start.sh
index 2f72cb04..e163f2b8 100755
--- a/testsuites/stability/src/main/resources/setup/start.sh
+++ b/testsuites/stability/src/main/resources/setup/start.sh
@@ -58,5 +58,5 @@ sudo chmod -R a+trwx /tmp
 docker-compose up --detach
 echo ""
 
-# check if all containers are up
+# check if all containers are up - db-migrator will shutdown after a while
 docker ps
diff --git a/testsuites/stability/src/main/resources/setup/versions.sh b/testsuites/stability/src/main/resources/setup/versions.sh
index 44829d15..ff156b8f 100755
--- a/testsuites/stability/src/main/resources/setup/versions.sh
+++ b/testsuites/stability/src/main/resources/setup/versions.sh
@@ -19,11 +19,11 @@
 
 # update versions here
 export POLICY_MARIADB_VER=10.5.8
-export POLICY_DB_MIGRATOR=2.3.1-SNAPSHOT
-export POLICY_API_VERSION=2.5.1-SNAPSHOT
-export POLICY_PAP_VERSION=2.5.1-SNAPSHOT
-export POLICY_MODELS_SIMULATOR=2.5.1-SNAPSHOT
-export POLICY_DIST_VERSION=2.6.1-SNAPSHOT
+export POLICY_DB_MIGRATOR=2.3.1
+export POLICY_API_VERSION=2.5.1
+export POLICY_PAP_VERSION=2.5.1
+export POLICY_MODELS_SIMULATOR=latest
+export POLICY_DIST_VERSION=2.6.1
 
 echo "                MariaDB Version: ${POLICY_MARIADB_VER}"
 echo "     Policy DB Migrator Version: ${POLICY_DB_MIGRATOR}"