diff options
| -rw-r--r-- | test/csit/scripts/vid/start_vid_containers.sh | 6 | ||||
| -rw-r--r-- | test/csit/tests/sdc/nightly/test1.robot | 4 | ||||
| -rw-r--r-- | test/csit/tests/sdc/sanity/test1.robot | 4 | ||||
| -rw-r--r-- | test/csit/tests/sdc/uiSanity/test1.robot | 4 | ||||
| -rw-r--r-- | version-manifest/src/main/resources/docker-manifest-staging.csv | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/test/csit/scripts/vid/start_vid_containers.sh b/test/csit/scripts/vid/start_vid_containers.sh index d7f6e38ca..a6a8a6b7a 100644 --- a/test/csit/scripts/vid/start_vid_containers.sh +++ b/test/csit/scripts/vid/start_vid_containers.sh @@ -25,18 +25,18 @@ echo "This is ${WORKSPACE}/test/csit/scripts/vid/start_vid_containers.sh" -RELEASE=vid:1.1-STAGING-latest +RELEASE=vid:latest CONFIG_PATH=${WORKSPACE}/data/clone/vid/lf_config export IP=`ifconfig eth0 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'` -export PREFIX='nexus3.onap.org:10001/openecomp' +export PREFIX='nexus3.onap.org:10001/onap' #start Maria-DB docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -e MYSQL_ROOT_PASSWORD=LF+tp_1WqgSY -v ${CONFIG_PATH}/vid-my.cnf:/etc/mysql/my.cnf -v ${CONFIG_PATH}/vid-pre-init.sql:/docker-entrypoint-initdb.d/vid-pre-init.sql -v /var/lib/mysql -d mariadb:10 #start VID server -docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/openecomp/${RELEASE} +docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/${RELEASE} # WAIT 5 minutes maximum and test every 5 seconds if VID up using HealthCheck API diff --git a/test/csit/tests/sdc/nightly/test1.robot b/test/csit/tests/sdc/nightly/test1.robot index 6d4dc242d..3705d8f5b 100644 --- a/test/csit/tests/sdc/nightly/test1.robot +++ b/test/csit/tests/sdc/nightly/test1.robot @@ -7,9 +7,9 @@ Library json *** Test Cases *** Get Requests health check ok [Tags] get - CreateSession sdc-be http://localhost:8080 + CreateSession sdc-be http://localhost:8181 ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Get Request sdc-be /sdc2/rest/healthCheck headers=&{headers} + ${resp}= Get Request sdc-be /sdc1/rest/healthCheck headers=&{headers} Should Be Equal As Strings ${resp.status_code} 200 @{ITEMS}= Copy List ${resp.json()['componentsInfo']} : FOR ${ELEMENT} IN @{ITEMS} diff --git a/test/csit/tests/sdc/sanity/test1.robot b/test/csit/tests/sdc/sanity/test1.robot index 6d4dc242d..3705d8f5b 100644 --- a/test/csit/tests/sdc/sanity/test1.robot +++ b/test/csit/tests/sdc/sanity/test1.robot @@ -7,9 +7,9 @@ Library json *** Test Cases *** Get Requests health check ok [Tags] get - CreateSession sdc-be http://localhost:8080 + CreateSession sdc-be http://localhost:8181 ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Get Request sdc-be /sdc2/rest/healthCheck headers=&{headers} + ${resp}= Get Request sdc-be /sdc1/rest/healthCheck headers=&{headers} Should Be Equal As Strings ${resp.status_code} 200 @{ITEMS}= Copy List ${resp.json()['componentsInfo']} : FOR ${ELEMENT} IN @{ITEMS} diff --git a/test/csit/tests/sdc/uiSanity/test1.robot b/test/csit/tests/sdc/uiSanity/test1.robot index 6d4dc242d..3705d8f5b 100644 --- a/test/csit/tests/sdc/uiSanity/test1.robot +++ b/test/csit/tests/sdc/uiSanity/test1.robot @@ -7,9 +7,9 @@ Library json *** Test Cases *** Get Requests health check ok [Tags] get - CreateSession sdc-be http://localhost:8080 + CreateSession sdc-be http://localhost:8181 ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Get Request sdc-be /sdc2/rest/healthCheck headers=&{headers} + ${resp}= Get Request sdc-be /sdc1/rest/healthCheck headers=&{headers} Should Be Equal As Strings ${resp.status_code} 200 @{ITEMS}= Copy List ${resp.json()['componentsInfo']} : FOR ${ELEMENT} IN @{ITEMS} diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv index f13ab53e9..475b9acd4 100644 --- a/version-manifest/src/main/resources/docker-manifest-staging.csv +++ b/version-manifest/src/main/resources/docker-manifest-staging.csv @@ -20,7 +20,7 @@ onap/ccsdk-dgbuilder-image,0.3-STAGING-latest onap/ccsdk-odl-image,0.3-STAGING-latest onap/ccsdk-odlsli-image,0.3-STAGING-latest onap/champ,1.2.3 -onap/clamp,2.0.2 +onap/clamp,3.0-STAGING-latest onap/cli,2.0.2 onap/data-router,1.2.2 onap/dmaap/buscontroller,1.0.12 |