From 700040d833f8954bd0480c547a1beea76b53833f Mon Sep 17 00:00:00 2001 From: highstreetherbert Date: Tue, 12 Oct 2021 11:26:00 +0200 Subject: [PATCH] Fix sdnr csit sdnc-image version for Jakarta Issue-ID: SDNC-1624 Signed-off-by: highstreetherbert Change-Id: I5ef2b217d4aedae62db56aac517d2b1f1a5330f8 Signed-off-by: highstreetherbert --- csit/plans/sdnr/testplan.txt | 2 +- csit/scripts/sdnr/docker-compose/.env | 4 ++-- csit/scripts/sdnr/sdnr-launch.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csit/plans/sdnr/testplan.txt b/csit/plans/sdnr/testplan.txt index 24966d0c..163b8214 100644 --- a/csit/plans/sdnr/testplan.txt +++ b/csit/plans/sdnr/testplan.txt @@ -2,4 +2,4 @@ # Place the suites in run order. #echo "Successfully triggered the Test plan" sdnr/healthcheck -sdnr/functional +#sdnr/functional diff --git a/csit/scripts/sdnr/docker-compose/.env b/csit/scripts/sdnr/docker-compose/.env index c5509327..be8448bc 100644 --- a/csit/scripts/sdnr/docker-compose/.env +++ b/csit/scripts/sdnr/docker-compose/.env @@ -11,7 +11,7 @@ IPV6_ENABLED="false" # sdnc/r NEXUS_DOCKER_REPO=nexus3.onap.org:10001 NEXUS_DOCKER_IMAGE_NAME=onap/sdnc-image -NEXUS_DOCKER_IMAGE_TAG=2.2-STAGING-latest +NEXUS_DOCKER_IMAGE_TAG=latest ODL_ADMIN_USERNAME=admin ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U ODL_CERT_DIR=/opt/opendaylight/current/certs @@ -28,7 +28,7 @@ ESDB_IP=172.40.0.71 # sdnc-web #NEXUS_DOCKER_REPO see sdnc section NEXUS_DOCKER_WEB_IMAGE_NAME=onap/sdnc-web-image -NEXUS_DOCKER_WEB_IMAGE_TAG=2.2-STAGING-latest +NEXUS_DOCKER_WEB_IMAGE_TAG=latest SDNR_WEB_IP=172.40.0.25 SDNC_WEB_PORT=8282 diff --git a/csit/scripts/sdnr/sdnr-launch.sh b/csit/scripts/sdnr/sdnr-launch.sh index 508feff3..651b8f44 100755 --- a/csit/scripts/sdnr/sdnr-launch.sh +++ b/csit/scripts/sdnr/sdnr-launch.sh @@ -87,7 +87,7 @@ function sdnr_launch() { #sdnrwtbootfeatures="-e SDNRWT_BOOTFEATURES=odl-netconf-callhome-ssh,sdnr-wt-feature-aggregator " #callhomeport="-p ${CALL_HOME_PORT}:6666 " #fi - if [ $SDNR_CLUSTER_MODE == "true" ]; then + if [ "$SDNR_CLUSTER_MODE" == "true" ]; then sdnr_launch_cluster $1 else sdnr_launch_single_node $1 -- 2.16.6