]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
Fix sbuild-post-build-get-reports and make output nicer.
authorBenjamin Drung <benjamin.drung@profitbricks.com>
Thu, 24 Jul 2014 12:16:23 +0000 (14:16 +0200)
committerBenjamin Drung <benjamin.drung@profitbricks.com>
Thu, 24 Jul 2014 12:16:23 +0000 (14:16 +0200)
sbuild-post-build-get-reports [changed mode: 0755->0644]

old mode 100755 (executable)
new mode 100644 (file)
index 89e3d2d..af502e0
@@ -20,14 +20,8 @@ builddir=$(dirname $(find /var/lib/schroot/mount/*/build/ -maxdepth 2 -name $dsc
 workspace=${OLDPWD}/../../workspace
 
 if echo "${BUILD_TRIGGERS}" | grep -q 'no-test'; then
-    echo "###"
-    echo "### Found build trigger 'no-test' so no reports.tgz will be created."
-    echo "###"
+    echo "Found build trigger 'no-test' so no reports.tgz will be created."
 else
-    echo "###"
-    echo "### Find report files and copy them out of chroot."
-    echo "###"
-
     cd $builddir
     if test "$(find * -maxdepth 0 -type d | wc -l)" -eq 1; then
         # switch into extract Debian source directory
@@ -38,9 +32,10 @@ else
     if test "$files" -eq 0; then
         echo "Found no report files in $(pwd)."
     else
-        echo "Found $files report files in $(pwd):"
+        echo "Found $files report files in $(pwd) (copy them out of the chroot):"
         find . -name surefire-reports -o -name failsafe-reports -o -name unittest.log -o -name tests-0.log -o -name build.log -o -name test-run-all.xml
 
         # Copy reports from the chroot into the workspace (for Jenkins)
         find . -name surefire-reports -o -name failsafe-reports -o -name unittest.log -o -name tests-0.log -o -name build.log -o -name test-run-all.xml -exec install -D -m 644 {} $workspace/{} \;
+    fi
 fi