Fix CSITs in Jakarta

Quote the SO password
Extend the PAP timeout

Issue-ID: POLICY-4393
Change-Id: I457d1d3121376350a026c060513194975b7caeec
Signed-off-by: liamfallon <liam.fallon@est.tech>

diff --git a/csit/config/drools-applications/env/base.conf b/csit/config/drools-applications/env/base.conf
index c3cf80f..fc67bf4 100644 (file)
--- a/csit/config/drools-applications/env/base.conf
+++ b/csit/config/drools-applications/env/base.conf
@@ -126,7 +126,7 @@ SO_PORT=6669
 SO_CONTEXT_URI=
 SO_URL=http://message-router:6669/
 SO_USERNAME=InfraPortalClient
-SO_PASSWORD=password1$
+SO_PASSWORD='password1$'
 
 # VFC
 

diff --git a/csit/config/drools-pdp/env/base.conf b/csit/config/drools-pdp/env/base.conf
index 4bd7632..d4087c6 100644 (file)
--- a/csit/config/drools-pdp/env/base.conf
+++ b/csit/config/drools-pdp/env/base.conf
@@ -121,7 +121,7 @@ SO_PORT=8080
 SO_CONTEXT_URI=onap/so/infra/
 SO_URL=http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra
 SO_USERNAME=InfraPortalClient
-SO_PASSWORD=password1$
+SO_PASSWORD='password1$'
 
 # VFC
 

diff --git a/csit/pap/tests/pap-test.robot b/csit/pap/tests/pap-test.robot
index c2ad837..8bf3230 100644 (file)
--- a/csit/pap/tests/pap-test.robot
+++ b/csit/pap/tests/pap-test.robot
@@ -106,7 +106,7 @@ QueryPdpGroupsAfterUndeploy
 
 QueryPolicyAuditAfterUnDeploy
     [Documentation]   Verify policy audit record after undeploy
-    Sleep             60 seconds
+    Sleep             130 seconds
     QueryPolicyAudit  /policy/pap/v1/policies/audit  200  testGroup  pdpTypeA  onap.restart.tca  UNDEPLOYMENT
 
 QueryPolicyAuditWithMetadataSetAfterUnDeploy

diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh
index fd20c6a..6a4a9bb 100755 (executable)
--- a/csit/run-project-csit.sh
+++ b/csit/run-project-csit.sh
@@ -132,7 +132,6 @@ function source_safely() {
 
 if $(docker images | grep -q "onap\/policy-api")
 then
-    echo where
     export CONTAINER_LOCATION=$(
         docker images |
         grep onap/policy-api |