From 9db29a1d66621fa8f500cab76ae381b4d4a8e00a Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Mon, 6 Mar 2017 14:02:25 +0100 Subject: [PATCH] Distribution check: Improve error reporting Change-Id: I5b7e9383c9e17dca294c1149893197cf78686b1e Signed-off-by: Vratko Polak --- jjb/integration-distribution-delete-snaphot-artifacts.sh | 2 +- jjb/releng-templates-java.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jjb/integration-distribution-delete-snaphot-artifacts.sh b/jjb/integration-distribution-delete-snaphot-artifacts.sh index be56d78c2..42ba83856 100644 --- 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 4af4d2462..08b29ee7f 100644 --- 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. -- 2.36.6