aboutsummaryrefslogtreecommitdiffstats
path: root/version-manifest
diff options
context:
space:
mode:
authorYang Xu <yang.xu3@huawei.com>2018-10-26 22:08:05 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-26 22:08:05 +0000
commit0c25453409d7a6d949af9b5205ab70b6cd01927d (patch)
tree5788fb3821bdc67b9f3162aa4a2c89e9522e0292 /version-manifest
parent312fd75bf0a82c92f90789a076bbe3511c84e9f1 (diff)
parentacc5314ed8e916903a1f136ffcbef847ae39fef5 (diff)
Merge "Check for duplicate entries in manifests"
Diffstat (limited to 'version-manifest')
-rw-r--r--version-manifest/src/main/resources/docker-manifest-staging.csv3
-rwxr-xr-xversion-manifest/src/main/scripts/check-sorted.sh9
2 files changed, 9 insertions, 3 deletions
diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index 6811eb580..ac5e8434d 100644
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -159,8 +159,5 @@ onap/vvp/portal,1.0.0
onap/vvp/postgresql,1.0.0
onap/vvp/test-engine,1.0.0
onap/workflow-backend,1.3.1-SNAPSHOT
-onap/workflow-backend,latest
onap/workflow-frontend,1.3.1-SNAPSHOT
-onap/workflow-frontend,latest
-onap/workflow-init,1.3.0-SNAPSHOT
onap/workflow-init,1.3.1-SNAPSHOT
diff --git a/version-manifest/src/main/scripts/check-sorted.sh b/version-manifest/src/main/scripts/check-sorted.sh
index 70ca5ac04..eb41ddef2 100755
--- a/version-manifest/src/main/scripts/check-sorted.sh
+++ b/version-manifest/src/main/scripts/check-sorted.sh
@@ -7,6 +7,7 @@ if [ "$#" -ne 1 ]; then
fi
LC_ALL=C sort -c $1
+
retval=$?
if [ $retval -ne 0 ]; then
echo
@@ -16,4 +17,12 @@ if [ $retval -ne 0 ]; then
echo " mv $1.tmp $1"
echo
fi
+
+# check that there are no duplicate records
+DUPLICATES=$(rev < $1 | cut -f2- -d, | uniq -d | rev | tr ',' ':')
+for DUP in $DUPLICATES; do
+ echo "[ERROR] $DUP has duplicate entries"
+ ((retval++))
+done
+
exit $retval