Bump out-of-date staging images to release version

Change-Id: Icd22aca66c6caa919dc9a7a441c4abf92efde5bb
Issue-ID: INT-1055
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

2 files changed, 34 insertions, 31 deletions

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index 2688e2217..dc23ebd75 100644
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -84,8 +84,8 @@ onap/network-discovery,1.5.0-SNAPSHOT-latest
 onap/oom/kube2msb,1.1.0
 onap/optf-cmso-dbinit,latest
 onap/optf-cmso-service,latest
-onap/optf-has,1.2.5-SNAPSHOT-latest
-onap/optf-osdf,1.2.4-SNAPSHOT-latest
+onap/optf-has,1.3.0
+onap/optf-osdf,1.3.0
 onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web,3.0.0-SNAPSHOT
 onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.1.2
 onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.1.0
@@ -116,10 +116,10 @@ onap/policy-apex-pdp,2.1-SNAPSHOT-latest
 onap/policy-distribution,2.1.0-SNAPSHOT-latest
 onap/policy-pdpd-cl,1.4-SNAPSHOT-latest
 onap/policy-pe,1.4-SNAPSHOT-latest
-onap/pomba-aai-context-builder,1.4.0-SNAPSHOT-latest
-onap/pomba-context-aggregator,1.4.0-SNAPSHOT-latest
-onap/pomba-network-discovery-context-builder,1.4.0-SNAPSHOT-latest
-onap/pomba-sdc-context-builder,1.4.0-SNAPSHOT-latest
+onap/pomba-aai-context-builder,1.4.0
+onap/pomba-context-aggregator,1.4.0
+onap/pomba-network-discovery-context-builder,1.4.0
+onap/pomba-sdc-context-builder,1.4.0
 onap/portal-app,2.5.0
 onap/portal-db,2.5.0
 onap/portal-sdk,2.5.0
@@ -142,15 +142,15 @@ onap/sdnc-ueb-listener-image,1.5-STAGING-latest
 onap/search-data-service,1.4.3
 onap/service-decomposition,1.5.0-SNAPSHOT-latest
 onap/sniroemulator,1.0.0
-onap/so/api-handler-infra,1.4.1-STAGING-latest
-onap/so/bpmn-infra,1.4.1-STAGING-latest
-onap/so/catalog-db-adapter,1.4.1-STAGING-latest
-onap/so/openstack-adapter,1.4.1-STAGING-latest
-onap/so/request-db-adapter,1.4.1-STAGING-latest
-onap/so/sdc-controller,1.4.1-STAGING-latest
-onap/so/sdnc-adapter,1.4.1-STAGING-latest
-onap/so/so-monitoring,1.4.1-STAGING-latest
-onap/so/vfc-adapter,1.4.1-STAGING-latest
+onap/so/api-handler-infra,1.4.1
+onap/so/bpmn-infra,1.4.1
+onap/so/catalog-db-adapter,1.4.1
+onap/so/openstack-adapter,1.4.1
+onap/so/request-db-adapter,1.4.1
+onap/so/sdc-controller,1.4.1
+onap/so/sdnc-adapter,1.4.1
+onap/so/so-monitoring,1.4.1
+onap/so/vfc-adapter,1.4.1
 onap/sparky-be,1.4.0
 onap/spike,1.4.0
 onap/testsuite,1.4.0-STAGING-latest
@@ -158,23 +158,23 @@ onap/tproxy-config,2.1-STAGING-latest
 onap/usecase-ui,2.0.0-STAGING-latest
 onap/usecase-ui-server,2.0.0-STAGING-latest
 onap/validation,1.3.1
-onap/vfc/catalog,1.3.0-STAGING-latest
-onap/vfc/db,1.3.0-STAGING-latest
-onap/vfc/emsdriver,1.3.0-STAGING-latest
-onap/vfc/gvnfmdriver,1.3.1-STAGING-latest
-onap/vfc/jujudriver,1.3.1-STAGING-latest
-onap/vfc/multivimproxy,1.3.0-STAGING-latest
-onap/vfc/nfvo/svnfm/huawei,1.3.0-STAGING-latest
+onap/vfc/catalog,1.3.0
+onap/vfc/db,1.3.0
+onap/vfc/emsdriver,1.3.0
+onap/vfc/gvnfmdriver,1.3.1
+onap/vfc/jujudriver,1.3.1
+onap/vfc/multivimproxy,1.3.0
+onap/vfc/nfvo/svnfm/huawei,1.3.0
 onap/vfc/nfvo/svnfm/nokiav2,1.3.1-STAGING-latest
-onap/vfc/nslcm,1.3.0-STAGING-latest
-onap/vfc/resmanagement,1.3.0-STAGING-latest
-onap/vfc/vnflcm,1.3.0-STAGING-latest
-onap/vfc/vnfmgr,1.3.0-STAGING-latest
-onap/vfc/vnfres,1.3.0-STAGING-latest
-onap/vfc/wfengine-activiti,1.3.0-STAGING-latest
-onap/vfc/wfengine-mgrservice,1.3.0-STAGING-latest
-onap/vfc/ztesdncdriver,1.3.0-STAGING-latest
-onap/vfc/ztevnfmdriver,1.3.0-STAGING-latest
+onap/vfc/nslcm,1.3.0
+onap/vfc/resmanagement,1.3.0
+onap/vfc/vnflcm,1.3.0
+onap/vfc/vnfmgr,1.3.0
+onap/vfc/vnfres,1.3.0
+onap/vfc/wfengine-activiti,1.3.0
+onap/vfc/wfengine-mgrservice,1.3.0
+onap/vfc/ztesdncdriver,1.3.0
+onap/vfc/ztevnfmdriver,1.3.0
 onap/vid,4.0-STAGING-latest
 onap/vnfsdk/ice,1.1.0
 onap/vnfsdk/refrepo,1.2.0
diff --git a/version-manifest/src/main/scripts/compare-docker-manifests.sh b/version-manifest/src/main/scripts/compare-docker-manifests.sh
index 73591326b..875368506 100755
--- a/version-manifest/src/main/scripts/compare-docker-manifests.sh
+++ b/version-manifest/src/main/scripts/compare-docker-manifests.sh
@@ -20,6 +20,9 @@ for line in $(join -t, $1 $2 | tail -n +2); do
 
     if [[ "${staging//./-}_" < "${release//./-}_" ]]; then
         echo "[ERROR] $image:$staging is out-of-date vs. release ($release)."
+
+        # Uncomment the following to update the staging manifest with the release version
+        # sed -i "s|$image,.*|$image,$release|g" $2
     fi
 done
 exit $err