From: Gary Wu Date: Thu, 8 Nov 2018 00:52:53 +0000 (+0000) Subject: Merge "update sdc and work flow versions." X-Git-Tag: 3.0.0~79 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4ee737cff74c52411b1d2f1455e15055f176b7ab;hp=d6828d3949bebf518e85219f2414cf46dca8a597;p=integration.git Merge "update sdc and work flow versions." --- diff --git a/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json index 1323630a3..27259546b 100644 --- a/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json @@ -105,7 +105,11 @@ }, { "vnf-parameter-name": "mr_ip_addr", - "vnf-parameter-value": "10.0.11.1" + "vnf-parameter-value": "10.12.5.239" + }, + { + "vnf-parameter-name": "mr_ip_port", + "vnf-parameter-value": "30227" }, { "vnf-parameter-name": "vaaa_name_0", @@ -149,7 +153,7 @@ }, { "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "1.2.0" + "vnf-parameter-value": "1.3.0" }, { "vnf-parameter-name": "install_script_version", diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv index d72577a7a..8e82303c1 100644 --- a/version-manifest/src/main/resources/docker-manifest-staging.csv +++ b/version-manifest/src/main/resources/docker-manifest-staging.csv @@ -37,13 +37,13 @@ onap/data-router,1.3-STAGING-latest onap/dmaap/buscontroller,1.0.23 onap/dmaap/datarouter-node,latest onap/dmaap/datarouter-prov,latest -onap/dmaap/dmaap-mr,1.1.8 +onap/dmaap/dmaap-mr,1.1.9 onap/dmaap/kafka01101,0.0.1 onap/externalapi/nbi,3.0.0-latest onap/fproxy,2.1-STAGING-latest onap/gizmo,1.3-STAGING-latest onap/holmes/engine-management,1.2.2-STAGING-latest -onap/holmes/rule-management,1.2.2-STAGING-latest +onap/holmes/rule-management,1.2.3-STAGING-latest onap/model-loader,1.3-STAGING-latest onap/msb/msb_apigateway,1.2.2-STAGING-latest onap/msb/msb_discovery,1.2.2-STAGING-latest @@ -62,9 +62,11 @@ onap/music/music,3.0.23 onap/music/prom,1.0.5-latest onap/network-discovery,latest onap/oom/kube2msb,1.1.0 +onap/optf-cmso-dbinit,1.0.1 +onap/optf-cmso-service,1.0.1 onap/optf-has,1.2.4 onap/optf-osdf,1.2.4 -onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.3 +onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.4 onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.0 onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0 onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1 @@ -146,7 +148,7 @@ onap/vfc/wfengine-activiti,1.2.0-STAGING-latest onap/vfc/wfengine-mgrservice,1.2.0-STAGING-latest onap/vfc/ztesdncdriver,1.2.0-STAGING-latest onap/vfc/ztevnfmdriver,1.2.0 -onap/vid,3.1-STAGING-latest +onap/vid,3.2-STAGING-latest onap/vnfsdk/ice,1.1.0 onap/vnfsdk/refrepo,1.2.0 onap/vnfsdk/refrepo/postgres,1.2.0 diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 77d94f130..ab313abf4 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -37,12 +37,12 @@ onap/data-router,1.3.0 onap/dmaap/buscontroller,1.0.23 onap/dmaap/datarouter-node,1.0.3 onap/dmaap/datarouter-prov,1.0.3 -onap/dmaap/dmaap-mr,1.1.7 +onap/dmaap/dmaap-mr,1.1.8 onap/dmaap/kafka01101,0.0.1 onap/externalapi/nbi,3.0.1 onap/gizmo,1.3.0 -onap/holmes/engine-management,1.2.1 -onap/holmes/rule-management,1.2.1 +onap/holmes/engine-management,1.2.2 +onap/holmes/rule-management,1.2.3 onap/model-loader,1.3.0 onap/msb/msb_apigateway,1.2.1 onap/msb/msb_discovery,1.2.1 @@ -58,9 +58,11 @@ onap/music/cassandra_3_11,3.0.23 onap/music/cassandra_job,3.0.23 onap/music/music,3.0.23 onap/oom/kube2msb,1.1.0 +onap/optf-cmso-dbinit,1.0.1 +onap/optf-cmso-service,1.0.1 onap/optf-has,1.2.4 onap/optf-osdf,1.2.4 -onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.3 +onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.4 onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.0 onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0 onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1 @@ -137,7 +139,7 @@ onap/vfc/wfengine-activiti,1.2.0 onap/vfc/wfengine-mgrservice,1.2.0 onap/vfc/ztesdncdriver,1.2.0 onap/vfc/ztevnfmdriver,1.2.0 -onap/vid,3.0.0 +onap/vid,3.2.0 onap/vnfsdk/ice,1.1.0 onap/vnfsdk/refrepo,1.2.0 onap/vnfsdk/refrepo/postgres,1.2.0