From a660edad49ed1200c05206b4c38f80b657628c8e Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 14 Jul 2022 13:29:58 +0100 Subject: [PATCH] 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 --- csit/config/{clamp => }/gui/application.yaml | 0 csit/docker-compose-gui-smoke.yml | 2 +- csit/pap/tests/pap-test.robot | 3 ++- csit/wait_for_port.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename csit/config/{clamp => }/gui/application.yaml (100%) 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 3ecabc17..8b983fac 100644 --- 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 b6c9a502..c2ad8370 100644 --- 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 aec5f222..0eeb1c9b 100755 --- 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 -- 2.16.6