Distribution check: Improve error reporting

Change-Id: I5b7e9383c9e17dca294c1149893197cf78686b1e
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/integration-distribution-delete-snaphot-artifacts.sh b/jjb/integration-distribution-delete-snaphot-artifacts.sh
index be56d78c21dda0a2b10224fde9581aac7ad19237..42ba838562241df024228935b211380580d08871 100644 (file)
--- a/jjb/integration-distribution-delete-snaphot-artifacts.sh
+++ b/jjb/integration-distribution-delete-snaphot-artifacts.sh
@@ -4,6 +4,6 @@ set +e  # To avoid failures in projects which generate zero snapshot artifacts.
 find /tmp/r/org/opendaylight/$GERRIT_PROJECT/ -path *-SNAPSHOT* -delete
 find /tmp/r/ -regex '.*/_remote.repositories\|.*/maven-metadata-local\.xml\|.*/maven-metadata-fake-nexus\.xml\|.*/resolver-status\.properties' -delete
 find /tmp/r/ -type d -empty -delete
-echo "# INFO: A listing of project related files left in local repository follows."
+echo "INFO: A listing of project related files left in local repository follows."
 find /tmp/r/org/opendaylight/$GERRIT_PROJECT/
 true  # To prevent the possibly non-zero return code from failing the job.

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 4af4d24620fe31fa9f82f1b595a51b10d5be3007..08b29ee7fa5a50b3866f0cfc0719fcffcfe6bb0f 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -152,7 +152,7 @@
       - shell: |
           mkdir -p /tmp/t/org/opendaylight/$GERRIT_PROJECT
           mv /tmp/n/org/opendaylight/$GERRIT_PROJECT/* /tmp/t/org/opendaylight/$GERRIT_PROJECT/
-          test `find /tmp/n/ -type f | wc -l` -eq 0
+          test -z "`find /tmp/n/ -type f`" || ( echo "ERROR: Mismatched groupId detected (see above)." && false )
           rm -rf /tmp/n
           mv /tmp/t /tmp/n
       # Step three: Online build of integration distribution.