aboutsummaryrefslogtreecommitdiffstats
path: root/version-manifest
diff options
context:
space:
mode:
authorHelen Chen <helen.chen@huawei.com>2018-05-07 18:52:10 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-07 18:52:10 +0000
commit455f8d2a70886b3c858d3461e87e4be63ff1a53a (patch)
treecb9dd471b554284e8deac7326436a0829184acc0 /version-manifest
parentd34aa594120c0bff99cd5b2d70cd0d5acfa456bb (diff)
parent3fc3c722df91d56b03c4b34aaa0bfd4e0a50a8cc (diff)
Merge "Add missing docker images from OOM helm charts"
Diffstat (limited to 'version-manifest')
-rw-r--r--version-manifest/src/main/resources/docker-manifest.csv11
-rwxr-xr-xversion-manifest/src/main/scripts/merge-oom-images.sh38
2 files changed, 49 insertions, 0 deletions
diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index c4d5b6082..87f6fd6f9 100644
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -1,21 +1,27 @@
image,tag
onap/aaf/aaf_service,2.1.0-SNAPSHOT
+onap/aaf/authz-service,latest
onap/aaf/sms,latest
+onap/aaf/smsquorumclient,latest
onap/aai-resources,1.2-STAGING-latest
onap/aai-traversal,1.2-STAGING-latest
onap/aai/esr-gui,1.1.0-SNAPSHOT
onap/aai/esr-server,1.1.0-SNAPSHOT
onap/admportal-sdnc-image,1.3-STAGING-latest
+onap/appc-cdt-image,1.3.0-SNAPSHOT-latest
onap/appc-image,1.3.0-SNAPSHOT-latest
+onap/babel,1.2-STAGING-latest
onap/ccsdk-dgbuilder-image,0.2-STAGING-latest
onap/ccsdk-odl-image,0.2-STAGING-latest
onap/ccsdk-odlsli-image,0.2-STAGING-latest
+onap/champ,1.2-STAGING-latest
onap/clamp,2.0-STAGING-latest
onap/cli,2.0-STAGING-latest
onap/data-router,1.2-STAGING-latest
onap/dmaap/buscontroller,latest
onap/dmaap/dmaap-mr,1.1.4
onap/externalapi/nbi,latest
+onap/gizmo,1.1-STAGING-latest
onap/holmes/engine-management,latest
onap/holmes/rule-management,latest
onap/model-loader,1.2-STAGING-latest
@@ -28,6 +34,7 @@ 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/vio-vesagent,1.0.0
+onap/music/cassandra_music,latest
onap/music/music,latest
onap/oom/kube2msb,v1.0.0
onap/optf-has,latest
@@ -36,6 +43,7 @@ onap/org.onap.dcaegen2.collectors.snmptrap,latest
onap/org.onap.dcaegen2.collectors.ves.vescollector,latest
onap/org.onap.dcaegen2.deployments.bootstrap,1.1.2
onap/org.onap.dcaegen2.deployments.cm-container,latest
+onap/org.onap.dcaegen2.deployments.healthcheck-container,1.0.0
onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,latest
onap/org.onap.dcaegen2.deployments.redis-cluster-container,latest
onap/org.onap.dcaegen2.deployments.tca-cdap-container,latest
@@ -51,11 +59,14 @@ onap/policy-drools,1.2.0
onap/policy-pe,1.2.0
onap/portal-app,2.1-STAGING-latest
onap/portal-db,2.1-STAGING-latest
+onap/portal-sdk,2.1-STAGING-latest
onap/portal-wms,2.1-STAGING-latest
onap/sdc-backend,1.2-STAGING-latest
+onap/sdc-cassandra,1.2-STAGING-latest
onap/sdc-elasticsearch,1.2-STAGING-latest
onap/sdc-frontend,1.2-STAGING-latest
onap/sdc-kibana,1.2-STAGING-latest
+onap/sdc-onboard-backend,1.2-STAGING-latest
onap/sdc-sanity,1.2-STAGING-latest
onap/sdc/sdc-workflow-designer,1.1.0-SNAPSHOT-STAGING-latest
onap/sdnc-ansible-server-image,1.3-STAGING-latest
diff --git a/version-manifest/src/main/scripts/merge-oom-images.sh b/version-manifest/src/main/scripts/merge-oom-images.sh
new file mode 100755
index 000000000..09bc12fd2
--- /dev/null
+++ b/version-manifest/src/main/scripts/merge-oom-images.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+if [ "$#" -ne 2 ]; then
+ echo "$0 <docker-manifest.csv> <oom directory>"
+ exit 1
+fi
+
+# expected parameters
+MANIFEST=$1
+OOM_DIR=$2
+
+if [ -z "$WORKSPACE" ]; then
+ export WORKSPACE=`git rev-parse --show-toplevel`
+fi
+
+DIR=$(dirname $(readlink -f "$0"))
+TARGET_DIR=$DIR/target
+rm -rf $TARGET_DIR
+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 > $TARGET_DIR/oom-manifest.txt
+touch $TARGET_DIR/docker-manifest-new-entries.txt
+
+for line in $(cat $TARGET_DIR/oom-manifest.txt); do
+ image=$(echo $line | cut -d : -f 1)
+ tag=$(echo $line | cut -s -d : -f 2)
+ if [ -z "$tag" ]; then
+ tag="latest"
+ fi
+ if ! grep -q "$image" $MANIFEST; then
+ echo $image,$tag >> $TARGET_DIR/docker-manifest-new-entries.txt
+ fi
+done
+
+cat $MANIFEST $TARGET_DIR/docker-manifest-new-entries.txt | LC_ALL=C sort > $MANIFEST.tmp
+cp $MANIFEST.tmp $MANIFEST