Merge "release java-manifest for APPC R3"
diff --git a/deployment/heat/onap-oom/scripts/cleanup.sh b/deployment/heat/onap-oom/scripts/cleanup.sh
index 03bcd17..b6583f4 100644
--- a/deployment/heat/onap-oom/scripts/cleanup.sh
+++ b/deployment/heat/onap-oom/scripts/cleanup.sh
@@ -4,20 +4,20 @@
'
if [ -z $1 ]; then
- echo "ONAP component name missing"
- echo "Usage: ./cleanup.sh ONAP_COMPONENT_NAME"
- exit 1
+ echo "ONAP component name missing"
+ echo "Usage: ./cleanup.sh onap_component_name"
+ exit 1
fi
COMPONENT=$1
if [ $COMPONENT == "dcae" ] || [ $COMPONENT == "DCAE" ]; then
- kubectl delete service consul -n onap
+ kubectl delete service consul -n onap
fi
for op in secrets configmaps pv services deployments statefulsets; do
- ARRAY=(`kubectl get $op -n onap | grep $COMPONENT | awk '{print $1}'`)
- for i in ${ARRAY[*]}; do
- kubectl delete $op -n onap $i
- done
+ ARRAY=(`kubectl get $op -n onap | grep dev-$COMPONENT | awk '{print $1}'`)
+ for i in ${ARRAY[*]}; do
+ kubectl delete $op -n onap $i
+ done
done
diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 58885af..414ec10 100644
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -119,7 +119,7 @@
onap/vfc/wfengine-mgrservice,1.1.0
onap/vfc/ztesdncdriver,1.1.0
onap/vfc/ztevnfmdriver,1.1.0
-onap/vid,2.0.0
+onap/vid,3.0.0
onap/vnfsdk/ice,1.1.0
onap/vnfsdk/refrepo,1.1.1
onap/vnfsdk/refrepo/postgres,1.1.1