diff options
-rw-r--r-- | version-manifest/pom.xml | 14 | ||||
-rw-r--r-- | version-manifest/src/main/resources/docker-manifest.csv | 6 | ||||
-rw-r--r-- | version-manifest/src/main/resources/java-manifest.csv | 2 | ||||
-rwxr-xr-x | version-manifest/src/main/scripts/compare-docker-manifests.sh | 25 |
4 files changed, 43 insertions, 4 deletions
diff --git a/version-manifest/pom.xml b/version-manifest/pom.xml index 27fb4f478..48dd9c12a 100644 --- a/version-manifest/pom.xml +++ b/version-manifest/pom.xml @@ -150,6 +150,20 @@ </configuration> </execution> <execution> + <id>compare-docker-manifests</id> + <phase>validate</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <arguments> + <argument>${project.basedir}/src/main/scripts/compare-docker-manifests.sh</argument> + <argument>${project.basedir}/src/main/resources/docker-manifest.csv</argument> + <argument>${project.basedir}/src/main/resources/docker-manifest-staging.csv</argument> + </arguments> + </configuration> + </execution> + <execution> <id>check-java-artifacts-released</id> <phase>verify</phase> <goals> diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index a11ddec6c..7b9b186ce 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -27,9 +27,9 @@ onap/ccsdk-dgbuilder-image,0.3.1 onap/ccsdk-odl-oxygen-image,0.3.1 onap/ccsdk-odlsli-image,0.3.1 onap/champ,1.3.0 -onap/clamp,3.0.0 -onap/clamp-dashboard-kibana,3.0.0 -onap/clamp-dashboard-logstash,3.0.0 +onap/clamp,3.0.1 +onap/clamp-dashboard-kibana,3.0.1 +onap/clamp-dashboard-logstash,3.0.1 onap/cli,2.0.4 onap/data-router,1.3.0 onap/dmaap/buscontroller,1.0.23 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 2ff102201..13d11187e 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -155,7 +155,7 @@ org.onap.ccsdk.sli.plugins,properties-node-provider,0.3.1 org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.3.1 org.onap.ccsdk.storage.pgaas,pgaas,1.0.0 org.onap.ccsdk.utils,utils,1.0.0 -org.onap.clamp.clds.clamp,clamp,3.0.0 +org.onap.clamp.clds.clamp,clamp,3.0.1 org.onap.cli,cli-framework,2.0.4 org.onap.cli,cli-main,2.0.4 org.onap.cli,cli-plugins-sample,2.0.4 diff --git a/version-manifest/src/main/scripts/compare-docker-manifests.sh b/version-manifest/src/main/scripts/compare-docker-manifests.sh new file mode 100755 index 000000000..86f8221e9 --- /dev/null +++ b/version-manifest/src/main/scripts/compare-docker-manifests.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +if [ "$#" -ne 2 ]; then + echo This script compares docker-manifest.csv with docker-manifest-staging.csv to verify that staging has later versions than release. + echo "$0 <docker-manifest.csv> <docker-manifest-staging.csv>" + exit 1 +fi + +if [ -z "$WORKSPACE" ]; then + export WORKSPACE=`git rev-parse --show-toplevel` +fi + +export LC_ALL=C + +err=0 +for line in $(join -t, $1 $2 | tail -n +2); do + image=$(echo $line | cut -d , -f 1) + release=$(echo $line | cut -d , -f 2) + staging=$(echo $line | cut -d , -f 3) + + if [[ "${staging}_" < "${release}_" ]]; then + echo "[WARNING] $image:$staging is older than $release." + fi +done +exit $err |