diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-06-06 14:00:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-06-06 14:00:17 +0000 |
| commit | ad8b3c85cdb63f1acd757c93dc53a1b02b7af02d (patch) | |
| tree | e7472a2789490f126cdcfb263ca085c5763db4e9 | |
| parent | d66f63d14c8dc651d8a759d0ae126e3c9a9d171c (diff) | |
| parent | d287f079b7fe1e7579f48f6fa3b7fe6683031011 (diff) | |
Merge "Update the docker manifest file and artifacts" into beijing
4 files changed, 12 insertions, 12 deletions
diff --git a/test/csit/plans/multicloud-ocata/functionality1/setup.sh b/test/csit/plans/multicloud-ocata/functionality1/setup.sh index b674fa61d..3cba68136 100644 --- a/test/csit/plans/multicloud-ocata/functionality1/setup.sh +++ b/test/csit/plans/multicloud-ocata/functionality1/setup.sh @@ -14,7 +14,7 @@ pushd ${SCRIPTS} # start multicloud-ocata -./run-instance.sh nexus3.onap.org:10001/onap/multicloud/openstack-ocata:latest multicloud-ocata +./run-instance.sh nexus3.onap.org:10001/onap/multicloud/openstack/openstack-ocata:latest multicloud-ocata SERVICE_IP=$(./get-instance-ip.sh multicloud-ocata) SERVICE_PORT=9006 popd diff --git a/test/csit/plans/multicloud-ocata/hpa-discovery/setup.sh b/test/csit/plans/multicloud-ocata/hpa-discovery/setup.sh index b98e2de8a..d17bec124 100644 --- a/test/csit/plans/multicloud-ocata/hpa-discovery/setup.sh +++ b/test/csit/plans/multicloud-ocata/hpa-discovery/setup.sh @@ -43,7 +43,7 @@ start_simulator keystone 5000 start_simulator aai 8443 # start multicloud-ocata -./run-instance.sh nexus3.onap.org:10001/onap/multicloud/openstack-ocata multicloud-ocata "-t -e AAI_SERVICE_URL=http://aai:8080/aai -e no_proxy=$no_proxy -p 9006:9006" +./run-instance.sh nexus3.onap.org:10001/onap/multicloud/openstack/openstack-ocata multicloud-ocata "-t -e AAI_SERVICE_URL=http://aai:8080/aai -e no_proxy=$no_proxy -p 9006:9006" SERVICE_IP=$(./get-instance-ip.sh multicloud-ocata) SERVICE_PORT=9006 diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 6ed006c4c..de1c0059d 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -32,11 +32,11 @@ onap/holmes/rule-management,1.1.0 onap/model-loader,1.2.1 onap/msb/msb_apigateway,1.1.0 onap/msb/msb_discovery,1.1.0 -onap/multicloud/framework,1.1.2-STAGING -onap/multicloud/openstack-newton,1.1.2-SNAPSHOT -onap/multicloud/openstack-ocata,1.1.2-SNAPSHOT -onap/multicloud/openstack-windriver,1.1.2-SNAPSHOT -onap/multicloud/vio,1.1.2-STAGING +onap/multicloud/framework,1.1.2 +onap/multicloud/openstack-newton,1.1.2 +onap/multicloud/openstack-windriver,1.1.2 +onap/multicloud/openstack/openstack-ocata,1.1.2 +onap/multicloud/vio,1.1.2 onap/multicloud/vio-vesagent,1.0.0 onap/music/cassandra_music,3.0.0 onap/music/music,latest diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 2a79b1bcd..361c512b0 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -194,12 +194,12 @@ org.onap.modeling.toscaparsers,kwalify,1.0.0 org.onap.modeling.toscaparsers.nfvparser,modeling-toscaparsers-nfvparser,1.0.0 org.onap.msb.java-sdk,msb-java-sdk,1.1.1 org.onap.msb.swagger-sdk,swagger-sdk,1.1.0 -org.onap.multicloud.framework,multivimbroker,1.0.0 -org.onap.multicloud.openstack,newton,1.0.0 -org.onap.multicloud.openstack,ocata,1.0.0 -org.onap.multicloud.openstack,windriver,1.0.0 +org.onap.multicloud.framework,multivimbroker,1.1.2 +org.onap.multicloud.openstack,newton,1.1.2 +org.onap.multicloud.openstack,ocata,1.1.2 +org.onap.multicloud.openstack,windriver,1.1.2 org.onap.multicloud.openstack.vmware,vesagent,1.0.0 -org.onap.multicloud.openstack.vmware,vio,1.0.0 +org.onap.multicloud.openstack.vmware,vio,1.1.2 org.onap.oparent,oparent,1.1.1 org.onap.policy.common,common-modules,1.2.3 org.onap.policy.drools-applications,drools-pdp-apps,1.2.3 |