Move policy-gui CSIT config files

The policy-gui config files for CSIT are in the CLAMp directory, they
should be in their own directory.

Tweaked timings on PAP CSIT to stop it timing out on post undeploy test

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

diff --git a/csit/config/clamp/gui/application.yaml b/csit/config/gui/application.yaml
similarity index 100%
rename from csit/config/clamp/gui/application.yaml
rename to csit/config/gui/application.yaml

diff --git a/csit/docker-compose-gui-smoke.yml b/csit/docker-compose-gui-smoke.yml
index 3ecabc1..8b983fa 100644 (file)
--- a/csit/docker-compose-gui-smoke.yml
+++ b/csit/docker-compose-gui-smoke.yml
@@ -327,7 +327,7 @@ services:
      expose:
      - 2443
      volumes:
-     - ./config/clamp/gui/application.yaml:/opt/app/policy/gui/etc/application.yaml
+     - ./config/gui/application.yaml:/opt/app/policy/gui/etc/application.yaml
      - ./config/policy-truststore:/opt/app/policy/gui/etc/mounted/policy-truststore:ro
      - ./config/ks.jks:/opt/app/policy/gui/etc/mounted/policy-keystore:ro
      - ./wait_for_port.sh:/opt/app/policy/gui/bin/wait_for_port.sh:ro

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

diff --git a/csit/wait_for_port.sh b/csit/wait_for_port.sh
index aec5f22..0eeb1c9 100755 (executable)
--- a/csit/wait_for_port.sh
+++ b/csit/wait_for_port.sh
@@ -17,7 +17,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END======================================================
 
-tmout=120
+tmout=300
 cmd=
 while getopts c:t: opt; do
     case "$opt" in