Merge "Converge staging manifest with release" into casablanca

2 files changed, 105 insertions, 102 deletions

diff --git a/.gitreview b/.gitreview
index 6e77300ea..69549b90b 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=gerrit.onap.org
 port=29418
 project=integration.git
+defaultbranch=casablanca
diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index b0dc91268..4fdf78843 100644
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -1,65 +1,67 @@
 image,tag
-onap/aaf/aaf_agent,2.1.9-SNAPSHOT
-onap/aaf/aaf_cass,2.1.9-SNAPSHOT
-onap/aaf/aaf_cm,2.1.9-SNAPSHOT
-onap/aaf/aaf_config,2.1.9-SNAPSHOT
-onap/aaf/aaf_fs,2.1.9-SNAPSHOT
-onap/aaf/aaf_gui,2.1.9-SNAPSHOT
-onap/aaf/aaf_hello,2.1.9-SNAPSHOT
-onap/aaf/aaf_locate,2.1.9-SNAPSHOT
-onap/aaf/aaf_oauth,2.1.9-SNAPSHOT
-onap/aaf/aaf_service,2.1.9-SNAPSHOT
-onap/aaf/abrmd,3.0.0-SNAPSHOT-latest
-onap/aaf/distcenter,3.0.0-SNAPSHOT-latest
-onap/aaf/sms,3.0.1-SNAPSHOT-latest
-onap/aaf/smsquorumclient,3.0.1-SNAPSHOT-latest
-onap/aaf/testcaservice,3.0.0-SNAPSHOT-latest
-onap/aai-graphadmin,1.0-STAGING-latest
-onap/aai-resources,1.3-STAGING-latest
-onap/aai-traversal,1.3-STAGING-latest
-onap/aai/esr-gui,1.2.2-STAGING-latest
-onap/aai/esr-server,1.2.2-STAGING-latest
-onap/admportal-sdnc-image,1.4-STAGING-latest
+onap/aaf/aaf_agent,2.1.8
+onap/aaf/aaf_cass,2.1.8
+onap/aaf/aaf_cm,2.1.8
+onap/aaf/aaf_config,2.1.8
+onap/aaf/aaf_fs,2.1.8
+onap/aaf/aaf_gui,2.1.8
+onap/aaf/aaf_hello,2.1.8
+onap/aaf/aaf_locate,2.1.8
+onap/aaf/aaf_oauth,2.1.8
+onap/aaf/aaf_service,2.1.8
+onap/aaf/abrmd,3.0.0
+onap/aaf/distcenter,3.0.0
+onap/aaf/sms,3.0.1
+onap/aaf/smsquorumclient,3.0.1
+onap/aaf/testcaservice,3.0.0
+onap/aai-cacher,1.0.0
+onap/aai-graphadmin,1.0.0
+onap/aai-resources,1.3.3
+onap/aai-traversal,1.3.2
+onap/aai/esr-gui,1.2.1
+onap/aai/esr-server,1.2.1
+onap/admportal-sdnc-image,1.4.2
 onap/appc-cdt-image,1.4.1-SNAPSHOT-latest
 onap/appc-image,1.4.1-SNAPSHOT-latest
-onap/babel,1.3-STAGING-latest
-onap/ccsdk-apps-ms-neng,0.3-STAGING-latest
-onap/ccsdk-controllerblueprints,0.3-STAGING-latest
-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/ccsdk-ubuntu-image,0.3-STAGING-latest
-onap/champ,1.3-STAGING-latest
-onap/clamp,3.0-STAGING-latest
-onap/clamp-dashboard-kibana,3.0-STAGING-latest
-onap/clamp-dashboard-logstash,3.0-STAGING-latest
+onap/babel,1.3.2
+onap/ccsdk-ansible-server-image,0.3.2
+onap/ccsdk-apps-ms-neng,0.3.2
+onap/ccsdk-controllerblueprints,0.3.2
+onap/ccsdk-dgbuilder-image,0.3.2
+onap/ccsdk-odl-oxygen-image,0.3.2
+onap/ccsdk-odlsli-image,0.3.2
+onap/ccsdk-ubuntu-image,0.3.2
+onap/champ,1.3.0
+onap/clamp,3.0.3
+onap/clamp-dashboard-kibana,3.0.3
+onap/clamp-dashboard-logstash,3.0.3
 onap/cli,2.0.4
-onap/data-router,1.3-STAGING-latest
-onap/dcae-be,1.3-STAGING-latest
-onap/dcae-dt,1.2-STAGING-latest
-onap/dcae-fe,1.3-STAGING-latest
+onap/data-router,1.3.0
+onap/dcae-be,1.3.0
+onap/dcae-dt,1.2.0
+onap/dcae-fe,1.3.0
 onap/dcae-tools,1.3-STAGING-latest
-onap/dcae-tosca-app,1.3-STAGING-latest
+onap/dcae-tosca-app,1.3.0
 onap/dmaap/buscontroller,1.0.23
-onap/dmaap/datarouter-node,latest
-onap/dmaap/datarouter-prov,latest
-onap/dmaap/dmaap-mr,1.1.9
+onap/dmaap/datarouter-node,1.0.3
+onap/dmaap/datarouter-prov,1.0.3
+onap/dmaap/dmaap-mr,1.1.8
 onap/dmaap/kafka01101,0.0.1
-onap/externalapi/nbi,3.0.0-latest
+onap/externalapi/nbi,3.0.1
 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.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
-onap/multicloud/azure,1.2.2-SNAPSHOT
-onap/multicloud/framework,1.2.2-STAGING
-onap/multicloud/openstack-newton,1.2.2-STAGING
-onap/multicloud/openstack-ocata,1.2.2-STAGING
-onap/multicloud/openstack-pike,1.2.2-STAGING
-onap/multicloud/openstack-windriver,1.2.2-STAGING
-onap/multicloud/vio,1.2.2-STAGING
+onap/gizmo,1.3.0
+onap/holmes/engine-management,1.2.2
+onap/holmes/rule-management,1.2.3
+onap/model-loader,1.3.1
+onap/msb/msb_apigateway,1.2.1
+onap/msb/msb_discovery,1.2.1
+onap/multicloud/azure,1.2.1
+onap/multicloud/framework,1.2.1
+onap/multicloud/openstack-newton,1.2.1
+onap/multicloud/openstack-ocata,1.2.1
+onap/multicloud/openstack-pike,1.2.1
+onap/multicloud/openstack-windriver,1.2.1
+onap/multicloud/vio,1.2.1
 onap/multicloud/vio-vesagent,1.0.0
 onap/music/cassandra_3_11,3.0.24
 onap/music/cassandra_job,3.0.24
@@ -90,34 +92,34 @@ onap/org.onap.dcaegen2.platform.inventory-api,3.0.4
 onap/org.onap.dcaegen2.platform.policy-handler,4.4.0
 onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.5
 onap/org.onap.dcaegen2.services.prh.prh-app-server,1.1.1
-onap/policy-apex-pdp,2.0-SNAPSHOT-latest
-onap/policy-distribution,2.0.3-SNAPSHOT-latest
-onap/policy-drools,1.3-SNAPSHOT-latest
-onap/policy-pe,1.3-SNAPSHOT-latest
-onap/pomba-aai-context-builder,1.3.3-SNAPSHOT-latest
-onap/pomba-context-aggregator,1.3.5-SNAPSHOT-latest
-onap/pomba-network-discovery-context-builder,1.3.2-SNAPSHOT-latest
-onap/pomba-sdc-context-builder,1.3.3-SNAPSHOT-latest
+onap/policy-apex-pdp,2.0.3
+onap/policy-distribution,2.0.3
+onap/policy-drools,1.3.4
+onap/policy-pe,1.3.4
+onap/pomba-aai-context-builder,1.3.2
+onap/pomba-context-aggregator,1.3.4
+onap/pomba-network-discovery-context-builder,1.3.1
+onap/pomba-sdc-context-builder,1.3.2
 onap/portal-app,2.3.1
 onap/portal-db,2.3.1
 onap/portal-sdk,2.3.1
 onap/portal-wms,2.3.1
 onap/rproxy,2.1-STAGING-latest
-onap/sdc-backend,1.3-STAGING-latest
-onap/sdc-backend-init,1.3-STAGING-latest
-onap/sdc-cassandra,1.3-STAGING-latest
-onap/sdc-cassandra-init,1.3-STAGING-latest
-onap/sdc-elasticsearch,1.3-STAGING-latest
-onap/sdc-frontend,1.3-STAGING-latest
-onap/sdc-init-elasticsearch,1.3-STAGING-latest
-onap/sdc-kibana,1.3-STAGING-latest
-onap/sdc-onboard-backend,1.3-STAGING-latest
-onap/sdc-onboard-cassandra-init,1.3-STAGING-latest
-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.3-STAGING-latest
+onap/sdc-backend,1.3.3
+onap/sdc-backend-init,1.3.3
+onap/sdc-cassandra,1.3.3
+onap/sdc-cassandra-init,1.3.3
+onap/sdc-elasticsearch,1.3.3
+onap/sdc-frontend,1.3.3
+onap/sdc-init-elasticsearch,1.3.3
+onap/sdc-kibana,1.3.3
+onap/sdc-onboard-backend,1.3.3
+onap/sdc-onboard-cassandra-init,1.3.3
+onap/sdnc-ansible-server-image,1.4.2
+onap/sdnc-dmaap-listener-image,1.4.2
+onap/sdnc-image,1.4.2
+onap/sdnc-ueb-listener-image,1.4.2
+onap/search-data-service,1.3.1
 onap/service-decomposition,latest
 onap/sniroemulator,1.0.0
 onap/so/api-handler-infra,1.3.1-STAGING-latest
@@ -129,31 +131,31 @@ onap/so/sdc-controller,1.3.1-STAGING-latest
 onap/so/sdnc-adapter,1.3.1-STAGING-latest
 onap/so/so-monitoring,1.3.1-STAGING-latest
 onap/so/vfc-adapter,1.3.1-STAGING-latest
-onap/sparky-be,1.3-STAGING-latest
+onap/sparky-be,1.3.0
 onap/spike,1.0-STAGING-latest
 onap/testsuite,1.3.2-STAGING-latest
 onap/tproxy-config,2.1-STAGING-latest
-onap/usecase-ui,1.2.2-STAGING-latest
-onap/usecase-ui-server,1.2.1-STAGING-latest
-onap/validation,1.3-STAGING-latest
-onap/vfc/catalog,1.2.1-STAGING-latest
-onap/vfc/db,1.2.1-STAGING-latest
-onap/vfc/emsdriver,1.2.1-STAGING-latest
-onap/vfc/gvnfmdriver,1.2.1-STAGING-latest
-onap/vfc/jujudriver,1.2.1-STAGING-latest
-onap/vfc/multivimproxy,1.2.1-STAGING-latest
-onap/vfc/nfvo/svnfm/huawei,1.2.1-STAGING-latest
-onap/vfc/nfvo/svnfm/nokia,1.1.0-STAGING-latest
-onap/vfc/nfvo/svnfm/nokiav2,1.3.1-STAGING-latest
-onap/vfc/nslcm,1.2.1-STAGING-latest
-onap/vfc/resmanagement,1.2.1-STAGING-latest
-onap/vfc/vnflcm,1.2.1-STAGING-latest
-onap/vfc/vnfmgr,1.2.1-STAGING-latest
-onap/vfc/vnfres,1.2.1-STAGING-latest
-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.1-STAGING-latest
+onap/usecase-ui,1.2.2
+onap/usecase-ui-server,1.2.1
+onap/validation,1.3.1
+onap/vfc/catalog,1.2.1
+onap/vfc/db,1.2.1
+onap/vfc/emsdriver,1.2.1
+onap/vfc/gvnfmdriver,1.2.1
+onap/vfc/jujudriver,1.2.1
+onap/vfc/multivimproxy,1.2.1
+onap/vfc/nfvo/svnfm/huawei,1.2.1
+onap/vfc/nfvo/svnfm/nokia,1.1.0
+onap/vfc/nfvo/svnfm/nokiav2,1.3.0
+onap/vfc/nslcm,1.2.1
+onap/vfc/resmanagement,1.2.1
+onap/vfc/vnflcm,1.2.1
+onap/vfc/vnfmgr,1.2.1
+onap/vfc/vnfres,1.2.1
+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.1
 onap/vid,3.2-STAGING-latest
 onap/vnfsdk/ice,1.1.0
 onap/vnfsdk/refrepo,1.2.0
@@ -167,6 +169,6 @@ onap/vvp/jenkins,1.0.0
 onap/vvp/portal,1.0.0
 onap/vvp/postgresql,1.0.0
 onap/vvp/test-engine,1.0.0
-onap/workflow-backend,1.3.2-SNAPSHOT
-onap/workflow-frontend,1.3.2-SNAPSHOT
-onap/workflow-init,1.3.2-SNAPSHOT
+onap/workflow-backend,1.3.2
+onap/workflow-frontend,1.3.2
+onap/workflow-init,1.3.2