Merge "Add new docker images found in OOM"

2 files changed, 10 insertions, 1 deletions

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index dd5b4a26e..9138b72ec 100644
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -1,6 +1,7 @@
 image,tag
 onap/aaf/aaf_cass,2.1.5-SNAPSHOT
 onap/aaf/aaf_cm,2.1.5-SNAPSHOT
+onap/aaf/aaf_config,2.1.5-SNAPSHOT
 onap/aaf/aaf_fs,2.1.5-SNAPSHOT
 onap/aaf/aaf_gui,2.1.5-SNAPSHOT
 onap/aaf/aaf_hello,2.1.5-SNAPSHOT
@@ -38,6 +39,7 @@ onap/dmaap/datarouter-prov,latest
 onap/dmaap/dmaap-mr,1.1.8
 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.0-STAGING-latest
 onap/holmes/rule-management,1.2.0-STAGING-latest
@@ -55,6 +57,7 @@ onap/multicloud/vio-vesagent,1.0.0
 onap/music/cassandra_music,3.0.0
 onap/music/music,2.5.3
 onap/music/prom,1.0.5-latest
+onap/network-discovery,latest
 onap/oom/kube2msb,1.1.0
 onap/optf-has,1.2.2
 onap/optf-osdf,1.2.2
@@ -85,11 +88,13 @@ onap/policy-drools,1.3-SNAPSHOT-latest
 onap/policy-pe,1.3-SNAPSHOT-latest
 onap/pomba-aai-context-builder,1.3.2-SNAPSHOT-latest
 onap/pomba-context-aggregator,1.3.3-SNAPSHOT-latest
+onap/pomba-network-discovery-context-builder,latest
 onap/pomba-sdc-context-builder,1.3.2-SNAPSHOT-latest
 onap/portal-app,2.3.0
 onap/portal-db,2.3.0
 onap/portal-sdk,2.3.0
 onap/portal-wms,2.3.0
+onap/rproxy,2.1-STAGING-latest
 onap/sdc-api-tests,1.3-STAGING-latest
 onap/sdc-backend,1.3-STAGING-latest
 onap/sdc-backend-init,1.3-STAGING-latest
@@ -109,6 +114,7 @@ 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/service-decomposition,latest
 onap/sniroemulator,1.0.0
 onap/so/api-handler-infra,1.3.0-STAGING-latest
 onap/so/bpmn-infra,1.3.0-STAGING-latest
@@ -122,8 +128,10 @@ onap/so/vfc-adapter,1.3.0-STAGING-latest
 onap/sparky-be,1.3-STAGING-latest
 onap/spike,1.0-STAGING-latest
 onap/testsuite,1.3.1-STAGING-latest
+onap/tproxy-config,2.1-STAGING-latest
 onap/usecase-ui,1.1.1
 onap/usecase-ui/usecase-ui-server,1.1.1
+onap/validation,1.3-STAGING-latest
 onap/vfc/catalog,1.1.0
 onap/vfc/db,1.1.0-STAGING-latest
 onap/vfc/emsdriver,1.1.0
@@ -157,3 +165,4 @@ onap/vvp/postgresql,1.0.0
 onap/vvp/test-engine,1.0.0
 onap/workflow-backend,latest
 onap/workflow-frontend,latest
+onap/workflow-init,1.3.0-SNAPSHOT
diff --git a/version-manifest/src/main/scripts/add-images-from-oom.sh b/version-manifest/src/main/scripts/add-images-from-oom.sh
index f7207701f..6d8c40a92 100755
--- a/version-manifest/src/main/scripts/add-images-from-oom.sh
+++ b/version-manifest/src/main/scripts/add-images-from-oom.sh
@@ -21,7 +21,7 @@ mkdir -p $TARGET_DIR
 cd $TARGET_DIR
 
 cd $OOM_DIR
-rgrep "image: .*" --include=values.yaml -h | cut -d ' ' -f 2 | tr -d '"'| grep -v '<' | grep -e "^onap" -e "^openecomp" | LC_ALL=C sort -u > $TARGET_DIR/oom-manifest.txt
+rgrep -i "image: .*" --include=values.yaml -h | awk '{ $1=$1; print }' | cut -d ' ' -f 2 | tr -d '"'| grep -v '<' | grep -e "^onap" -e "^openecomp" | LC_ALL=C sort -u > $TARGET_DIR/oom-manifest.txt
 touch $TARGET_DIR/docker-manifest-new-entries.txt
 
 for line in $(cat $TARGET_DIR/oom-manifest.txt); do