From 68aa82ac95c57a7c75fb2a2788b61fdd0fc70be7 Mon Sep 17 00:00:00 2001 From: highstreetherbert Date: Mon, 20 Mar 2023 19:06:15 +0100 Subject: Update feature version for ODL Chlorine Updated parent pom version to 2.5.4 Updated CSIT tests to use default admin password and RFC-8040 style URLs Updated docs to resolve build issues Issue-ID: SDNC-1786 Signed-off-by: highstreetherbert Change-Id: Ifbbc165d039a15554e276d1aa42f21d8a5332122 Signed-off-by: highstreetherbert Former-commit-id: d401de5971236306c8edd04b652b80fcf06297c8 --- csit/scripts/sdnr/docker-compose/.env | 3 ++- csit/scripts/sdnr/sdnr-teardown.sh | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'csit/scripts') diff --git a/csit/scripts/sdnr/docker-compose/.env b/csit/scripts/sdnr/docker-compose/.env index a2bea441..fbe74215 100644 --- a/csit/scripts/sdnr/docker-compose/.env +++ b/csit/scripts/sdnr/docker-compose/.env @@ -13,7 +13,8 @@ NEXUS_DOCKER_REPO=nexus3.onap.org:10001 NEXUS_DOCKER_IMAGE_NAME=onap/sdnc-image NEXUS_DOCKER_IMAGE_TAG=latest ODL_ADMIN_USERNAME=admin -ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +#ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +ODL_ADMIN_PASSWORD=admin ODL_CERT_DIR=/opt/opendaylight/current/certs SDN_CONTROLLER_PROTOCOL="http" SDNR_IP=172.40.0.21 diff --git a/csit/scripts/sdnr/sdnr-teardown.sh b/csit/scripts/sdnr/sdnr-teardown.sh index 02e8beeb..f01ab338 100755 --- a/csit/scripts/sdnr/sdnr-teardown.sh +++ b/csit/scripts/sdnr/sdnr-teardown.sh @@ -52,6 +52,8 @@ function sdnr_teardown() { docker logs $i >> ${WORKSPACE}/archives/getallinfo/$i.log 2>&1 done docker cp sdnr:/opt/opendaylight/data/log/karaf.log ${WORKSPACE}/archives/getallinfo/sdnr_karaf.log + docker cp sdnr:/opt/opendaylight/data/log/installCerts.log ${WORKSPACE}/archives/getallinfo/sdnr_installCerts.log + docker cp sdnr:/opt/opendaylight/etc/custom.properties ${WORKSPACE}/archives/getallinfo/sdnr_custom_properties.log fi echo "Starting teardown!" # removes sdnrdb, sdnr AND all of the rest of the containers (--remove-orphans) -- cgit 1.2.3-korg