Merge "CSIT fix vnfsdk"

diff --git a/plans/ccsdk/healthcheck/setup.sh b/plans/ccsdk/healthcheck/setup.sh
index 32f172b..bfc6e96 100644 (file)
--- a/plans/ccsdk/healthcheck/setup.sh
+++ b/plans/ccsdk/healthcheck/setup.sh
@@ -25,7 +25,7 @@ export NEXUS_DOCKER_REPO="nexus3.onap.org:10001"
 export NEXUS_USERNAME=docker
 export NEXUS_PASSWD=docker
 export DMAAP_TOPIC=AUTO
-export CCSDK_DOCKER_IMAGE_VERSION=0.4-STAGING-latest
+export CCSDK_DOCKER_IMAGE_VERSION=0.6-STAGING-latest
 
 if [ "$MTU" == "" ]; then
          export MTU="1450"

diff --git a/plans/portal-sdk/testsuite/.env b/plans/portal-sdk/testsuite/.env
index 27e9aa3..2cd5afa 100644 (file)
--- a/plans/portal-sdk/testsuite/.env
+++ b/plans/portal-sdk/testsuite/.env
@@ -13,15 +13,15 @@ WMS_IMG_NAME=onap/portal-wms
 CLI_IMG_NAME=onap/cli
 
 # Tag all images with this
-DOCKER_IMAGE_VERSION=2.1-STAGING-latest
-CLI_DOCKER_VERSION=1.1-STAGING-latest
+DOCKER_IMAGE_VERSION=2.6-STAGING-latest
+CLI_DOCKER_VERSION=3.0-STAGING-latest
 CDR_IMAGE_VERSION=latest
 ZK_IMAGE_VERSION=3.4
 NEXUS_DOCKER_REPO=nexus3.onap.org:10003
 
 # This is used during builds and in docker-compose;
 # it is never published to the ONAP registry.
-PORTAL_TAG=beijing
+PORTAL_TAG=elalto
 
 # Name of directory in apps container (NOT host)
 WEBAPPS_DIR=/opt/apache-tomcat-8.0.37/webapps
@@ -39,4 +39,3 @@ EXTRA_HOST_NAME=""
 # For example:
 #EXTRA_HOST_IP="-i ${HOST_IP}"
 #EXTRA_HOST_NAME="-n portal.api.simpledemo.openecomp.org"
-

diff --git a/plans/portal/testsuite/.env b/plans/portal/testsuite/.env
index 27e9aa3..2cd5afa 100644 (file)
--- a/plans/portal/testsuite/.env
+++ b/plans/portal/testsuite/.env
@@ -13,15 +13,15 @@ WMS_IMG_NAME=onap/portal-wms
 CLI_IMG_NAME=onap/cli
 
 # Tag all images with this
-DOCKER_IMAGE_VERSION=2.1-STAGING-latest
-CLI_DOCKER_VERSION=1.1-STAGING-latest
+DOCKER_IMAGE_VERSION=2.6-STAGING-latest
+CLI_DOCKER_VERSION=3.0-STAGING-latest
 CDR_IMAGE_VERSION=latest
 ZK_IMAGE_VERSION=3.4
 NEXUS_DOCKER_REPO=nexus3.onap.org:10003
 
 # This is used during builds and in docker-compose;
 # it is never published to the ONAP registry.
-PORTAL_TAG=beijing
+PORTAL_TAG=elalto
 
 # Name of directory in apps container (NOT host)
 WEBAPPS_DIR=/opt/apache-tomcat-8.0.37/webapps
@@ -39,4 +39,3 @@ EXTRA_HOST_NAME=""
 # For example:
 #EXTRA_HOST_IP="-i ${HOST_IP}"
 #EXTRA_HOST_NAME="-n portal.api.simpledemo.openecomp.org"
-

diff --git a/plans/sdnc/healthcheck/setup.sh b/plans/sdnc/healthcheck/setup.sh
index 7a66351..2614bea 100755 (executable)
--- a/plans/sdnc/healthcheck/setup.sh
+++ b/plans/sdnc/healthcheck/setup.sh
@@ -24,8 +24,8 @@ export NEXUS_USERNAME=docker
 export NEXUS_PASSWD=docker
 export NEXUS_DOCKER_REPO=nexus3.onap.org:10001
 export DMAAP_TOPIC=AUTO
-export DOCKER_IMAGE_VERSION=1.5-STAGING-latest
-export CCSDK_DOCKER_IMAGE_VERSION=0.4-STAGING-latest
+export DOCKER_IMAGE_VERSION=1.7-STAGING-latest
+export CCSDK_DOCKER_IMAGE_VERSION=0.6-STAGING-latest
 
 export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 
@@ -133,4 +133,3 @@ sleep 300
 
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
 ROBOT_VARIABLES="-v SCRIPTS:${SCRIPTS}"
-