From bbca0cfd42e21990c229cee5f9baf9fbd0b540d5 Mon Sep 17 00:00:00 2001
From: kishore <kk707x@att.com>
Date: Mon, 9 Oct 2017 16:59:38 -0500
Subject: Add updated portal test scripts

Issue-ID:PORTAL-53
Change-Id: Ib9a2b6b4b11b8497a8b9eb17b558eb28178580cc
Signed-off-by: kishore <kk707x@att.com>
---
 test/csit/plans/portal/testsuite/.env     |  9 ++++-----
 test/csit/plans/portal/testsuite/setup.sh | 26 ++++++++++----------------
 2 files changed, 14 insertions(+), 21 deletions(-)

(limited to 'test/csit/plans/portal')

diff --git a/test/csit/plans/portal/testsuite/.env b/test/csit/plans/portal/testsuite/.env
index 8fb2357b6..1e882a0b3 100644
--- a/test/csit/plans/portal/testsuite/.env
+++ b/test/csit/plans/portal/testsuite/.env
@@ -1,6 +1,5 @@
 # Environment settings
 # used by docker-compose AND by other shell scripts
-
 # Host directory with config files
 
 LOGS_DIR=./logs
@@ -11,13 +10,13 @@ PROPS_DIR=./properties
 WEBAPPS_DIR=/opt/apache-tomcat-8.0.37/webapps
 
 # Following are ALSO used in demo/boot/portal_vm_init.sh
-EP_IMG_NAME=portal-apps
-DB_IMG_NAME=portal-db
-WMS_IMG_NAME=portal-wms
+EP_IMG_NAME=onap/portal-apps
+DB_IMG_NAME=onap/portal-db
+WMS_IMG_NAME=onap/portal-wms
 CLI_IMG_NAME=onap/cli
 
 # Tag all images with this
 PORTAL_TAG=1.3.0
 DOCKER_IMAGE_VERSION=1.3-STAGING-latest
 CLI_DOCKER_VERSION=1.1-STAGING-latest
-NEXUS_REPO=nexus3.onap.org:10003
+NEXUS_DOCKER_REPO=nexus3.onap.org:10003
diff --git a/test/csit/plans/portal/testsuite/setup.sh b/test/csit/plans/portal/testsuite/setup.sh
index c3e9e5160..71d110521 100644
--- a/test/csit/plans/portal/testsuite/setup.sh
+++ b/test/csit/plans/portal/testsuite/setup.sh
@@ -33,12 +33,6 @@ ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP} -v IP:${IP}  -v DOCKER_IP:${DOCKER_IP}"
 export DOCKER_IP=${DOCKER_IP}
 
 
-
-
-
-
-
-
 # be verbose
 set -x
 
@@ -76,22 +70,22 @@ mkdir -p $LOGS_DIR
 
 # Refresh images
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/${DB_IMG_NAME}:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/${EP_IMG_NAME}:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/${WMS_IMG_NAME}:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/${DB_IMG_NAME}:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/${EP_IMG_NAME}:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/${WMS_IMG_NAME}:$DOCKER_IMAGE_VERSION
 docker pull $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION
 
 # Tag them as expected by docker-compose file
-docker tag $NEXUS_DOCKER_REPO/onap/${DB_IMG_NAME}:$DOCKER_IMAGE_VERSION $DB_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/onap/${EP_IMG_NAME}:$DOCKER_IMAGE_VERSION $EP_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/onap/${WMS_IMG_NAME}:$DOCKER_IMAGE_VERSION $WMS_IMG_NAME:$PORTAL_TAG
+docker tag $NEXUS_DOCKER_REPO/${DB_IMG_NAME}:$DOCKER_IMAGE_VERSION $DB_IMG_NAME:$PORTAL_TAG
+docker tag $NEXUS_DOCKER_REPO/${EP_IMG_NAME}:$DOCKER_IMAGE_VERSION $EP_IMG_NAME:$PORTAL_TAG
+docker tag $NEXUS_DOCKER_REPO/${WMS_IMG_NAME}:$DOCKER_IMAGE_VERSION $WMS_IMG_NAME:$PORTAL_TAG
 docker tag $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION $CLI_IMG_NAME:$PORTAL_TAG
 
+
 # compose is not in /usr/bin
 docker-compose down
 docker-compose up -d
 
-
 #${HOSTNAME}="portal.api.simpledemo.openecomp.org"
 #echo "$HOST_IP ${HOSTNAME}" >> /etc/hosts
 
@@ -124,10 +118,10 @@ echo "Adding new hosts entry."
 echo "$host_entry" | sudo tee -a /etc/hosts > /dev/null
 fi
 
-
+sleep 3m
 
 # WAIT 5 minutes maximum and test every 5 seconds if Portal up using HealthCheck API
-TIME_OUT=460
+TIME_OUT=500
 INTERVAL=20
 TIME=0
 while [ "$TIME" -lt "$TIME_OUT" ]; do
@@ -163,7 +157,7 @@ fi
 HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}')
 export HOST_IP=${HOST_IP}
 
-
+docker logs deliveries_portal-db_1
 docker logs deliveries_portal-apps_1
 docker logs deliveries_portal-wms_1
 
-- 
cgit 1.2.3-korg