diff options
| -rw-r--r-- | test/csit/plans/ccsdk/healthcheck/health_check.sh | 2 | ||||
| -rw-r--r-- | test/csit/plans/ccsdk/healthcheck/setup.sh | 10 | ||||
| -rw-r--r-- | test/csit/plans/sdnc/healthcheck/setup.sh | 4 | ||||
| -rw-r--r-- | version-manifest/src/main/resources/docker-manifest-staging.csv | 16 | ||||
| -rw-r--r-- | version-manifest/src/main/resources/java-manifest.csv | 62 |
5 files changed, 47 insertions, 47 deletions
diff --git a/test/csit/plans/ccsdk/healthcheck/health_check.sh b/test/csit/plans/ccsdk/healthcheck/health_check.sh index 99f717a20..ffc766fe9 100644 --- a/test/csit/plans/ccsdk/healthcheck/health_check.sh +++ b/test/csit/plans/ccsdk/healthcheck/health_check.sh @@ -19,7 +19,7 @@ echo $SCRIPTS unset http_proxy https_proxy -response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46YWRtaW4=" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-ccsdk" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8383/restconf/operations/SLI-API:healthcheck ) +response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-ccsdk" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8383/restconf/operations/SLI-API:healthcheck ) if [ "$response" == "200" ]; then echo "CCSDK health check passed." diff --git a/test/csit/plans/ccsdk/healthcheck/setup.sh b/test/csit/plans/ccsdk/healthcheck/setup.sh index 2b7424c3b..bdb5b5506 100644 --- a/test/csit/plans/ccsdk/healthcheck/setup.sh +++ b/test/csit/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.2-STAGING-latest +export CCSDK_DOCKER_IMAGE_VERSION=0.3-STAGING-latest if [ "$MTU" == "" ]; then export MTU="1450" @@ -45,13 +45,13 @@ sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="AUTO"/g" docker-compose.yml docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-odl-image:$CCSDK_DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-odl-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-odl-image:0.2-STAGING-latest +docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-odl-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-odl-image:0.3-STAGING-latest docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-dgbuilder-image:0.2-STAGING-latest +docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-dgbuilder-image:0.3-STAGING-latest docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-odlsli-image:$CCSDK_DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-odlsli-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-odlsli-image:0.2-STAGING-latest +docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-odlsli-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-odlsli-image:0.3-STAGING-latest # start CCSDK containers with docker compose and configuration from docker-compose.yml curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > docker-compose @@ -63,7 +63,7 @@ TIME_OUT=500 INTERVAL=30 TIME=0 while [ "$TIME" -lt "$TIME_OUT" ]; do - response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46YWRtaW4=" -X POST -H "X-FromAppId: csit-ccsdk" -H "X-TransactionId: csit-ccsdk" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8383/restconf/operations/SLI-API:healthcheck ); echo $response + response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-ccsdk" -H "X-TransactionId: csit-ccsdk" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8383/restconf/operations/SLI-API:healthcheck ); echo $response if [ "$response" == "200" ]; then echo CCSDK started in $TIME seconds diff --git a/test/csit/plans/sdnc/healthcheck/setup.sh b/test/csit/plans/sdnc/healthcheck/setup.sh index a8119f616..991ba18bf 100644 --- a/test/csit/plans/sdnc/healthcheck/setup.sh +++ b/test/csit/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.3-STAGING-latest -export CCSDK_DOCKER_IMAGE_VERSION=0.2-STAGING-latest +export DOCKER_IMAGE_VERSION=1.4-STAGING-latest +export CCSDK_DOCKER_IMAGE_VERSION=0.3-STAGING-latest export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv index 5769db2a3..f789ee137 100644 --- a/version-manifest/src/main/resources/docker-manifest-staging.csv +++ b/version-manifest/src/main/resources/docker-manifest-staging.csv @@ -12,13 +12,13 @@ onap/aai-resources,1.2.2 onap/aai-traversal,1.2.2 onap/aai/esr-gui,1.1.0 onap/aai/esr-server,1.1.0 -onap/admportal-sdnc-image,1.3.4 +onap/admportal-sdnc-image,1.4-STAGING-latest onap/appc-cdt-image,1.3.0 onap/appc-image,1.3.0 onap/babel,1.2.0 -onap/ccsdk-dgbuilder-image,0.2.4 -onap/ccsdk-odl-image,0.2.4 -onap/ccsdk-odlsli-image,0.2.4 +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/cli,2.0.2 @@ -77,10 +77,10 @@ onap/sdc-onboard-cassandra-init,1.3-STAGING-latest onap/sdc-simulator,1.3-STAGING-latest onap/sdc-ui-tests,1.3-STAGING-latest onap/sdc/sdc-workflow-designer,1.1.0 -onap/sdnc-ansible-server-image,1.3.4 -onap/sdnc-dmaap-listener-image,1.3.4 -onap/sdnc-image,1.3.4 -onap/sdnc-ueb-listener-image,1.3.4 +onap/sdnc-ansible-server-image,1.4-STAGING-latest +onap/sdnc-dmaap-listener-image,1.4-STAGING-latest +onap/sdnc-image,1.4-STAGING-latest +onap/sdnc-ueb-listener-image,1.4-STAGING-latest onap/search-data-service,1.2.1 onap/sniroemulator,1.0.0 onap/sparky-be,1.2.1 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 61e1c07ce..5393b80bb 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -122,34 +122,34 @@ org.onap.appc.client,client-lib,1.3.0 org.onap.appc.client,client-simulator,1.3.0 org.onap.appc.client,code-generator,1.3.0 org.onap.appc.plugins,dg-loader-provider,1.3.0 -org.onap.ccsdk.parent,binding-parent,1.0.4 -org.onap.ccsdk.parent,bundle-parent,1.0.4 -org.onap.ccsdk.parent,feature-repo-parent,1.0.4 -org.onap.ccsdk.parent,karaf4-parent,1.0.4 -org.onap.ccsdk.parent,mdsal-it-parent,1.0.4 -org.onap.ccsdk.parent,odlparent,1.0.4 -org.onap.ccsdk.parent,odlparent-lite,1.0.4 -org.onap.ccsdk.parent,single-feature-parent,1.0.4 -org.onap.ccsdk.sli.adaptors,aai-service-provider,0.2.4 -org.onap.ccsdk.sli.adaptors,mdsal-resource-provider,0.2.4 -org.onap.ccsdk.sli.adaptors,resource-assignment-provider,0.2.4 -org.onap.ccsdk.sli.adaptors,sql-resource-provider,0.2.4 -org.onap.ccsdk.sli.core,dblib-provider,0.2.4 -org.onap.ccsdk.sli.core,filters-provider,0.2.4 -org.onap.ccsdk.sli.core,sli-common,0.2.4 -org.onap.ccsdk.sli.core,sli-provider,0.2.4 -org.onap.ccsdk.sli.core,sli-recording,0.2.4 -org.onap.ccsdk.sli.core,sliPluginUtils-provider,0.2.4 -org.onap.ccsdk.sli.core,sliapi-provider,0.2.4 -org.onap.ccsdk.sli.core,utils-provider,0.2.4 -org.onap.ccsdk.sli.northbound,asdcApi-provider,0.2.4 -org.onap.ccsdk.sli.northbound,dataChange-provider,0.2.4 -org.onap.ccsdk.sli.northbound,dmaap-listener,0.2.4 -org.onap.ccsdk.sli.northbound,lcm-provider,0.2.4 -org.onap.ccsdk.sli.northbound,ueb-listener,0.2.4 -org.onap.ccsdk.sli.plugins,fabric-discovery-plugin-provider,0.2.4 -org.onap.ccsdk.sli.plugins,properties-node-provider,0.2.4 -org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.2.4 +org.onap.ccsdk.parent,binding-parent,1.1.0-SNAPSHOT +org.onap.ccsdk.parent,bundle-parent,1.1.0-SNAPSHOT +org.onap.ccsdk.parent,feature-repo-parent,1.1.0-SNAPSHOT +org.onap.ccsdk.parent,karaf4-parent,1.1.0-SNAPSHOT +org.onap.ccsdk.parent,mdsal-it-parent,1.1.0-SNAPSHOT +org.onap.ccsdk.parent,odlparent,1.1.0-SNAPSHOT +org.onap.ccsdk.parent,odlparent-lite,1.1.0-SNAPSHOT +org.onap.ccsdk.parent,single-feature-parent,1.1.0-SNAPSHOT +org.onap.ccsdk.sli.adaptors,aai-service-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.adaptors,mdsal-resource-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.adaptors,resource-assignment-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.adaptors,sql-resource-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.core,dblib-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.core,filters-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.core,sli-common,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.core,sli-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.core,sli-recording,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.core,sliPluginUtils-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.core,sliapi-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.core,utils-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.northbound,asdcApi-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.northbound,dataChange-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.northbound,dmaap-listener,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.northbound,lcm-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.northbound,ueb-listener,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.plugins,fabric-discovery-plugin-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.plugins,properties-node-provider,0.3.0-SNAPSHOT +org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.3.0-SNAPSHOT org.onap.ccsdk.storage.pgaas,pgaas,1.0.0 org.onap.ccsdk.utils,utils,1.0.0 org.onap.clamp.clds.clamp,clamp,2.0.2 @@ -217,9 +217,9 @@ org.onap.sdc.sdc-distribution-client,sdc-distribution-client,1.3.0 org.onap.sdc.sdc-titan-cassandra,sdc-titan-cassandra,1.2.0 org.onap.sdc.sdc-tosca,sdc-tosca,1.3.5 org.onap.sdc.sdc-workflow-designer,sdc-workflow-designer,1.0.0 -org.onap.sdnc.northbound,generic-resource-api.provider,1.3.4 -org.onap.sdnc.northbound,vnfapi-provider,1.3.4 -org.onap.sdnc.northbound,vnftools-provider,1.3.4 +org.onap.sdnc.northbound,generic-resource-api.provider,1.4.0-SNAPSHOT +org.onap.sdnc.northbound,vnfapi-provider,1.4.0-SNAPSHOT +org.onap.sdnc.northbound,vnftools-provider,1.4.0-SNAPSHOT org.onap.usecase-ui,usecaseui-common,1.1.0 org.onap.usecase-ui.server,usecase-ui-server,1.1.0 org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.1.0 |