From 1659fd3eca62ac51e7628af3464dd03787e2d84f Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curoverse.com>
Date: Mon, 7 Mar 2016 00:46:08 -0500
Subject: [PATCH] 8345: Fix up log messages to show which distro/package is
 being built/tested.

---
 jenkins/run-build-packages-one-target.sh | 14 +++++++++-----
 jenkins/run-library.sh                   |  4 ++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/jenkins/run-build-packages-one-target.sh b/jenkins/run-build-packages-one-target.sh
index 34d8c08..c5e0a89 100755
--- a/jenkins/run-build-packages-one-target.sh
+++ b/jenkins/run-build-packages-one-target.sh
@@ -138,7 +138,7 @@ if test -z "$packages" ; then
         centos6)
             packages="$packages python27-python-arvados-fuse
                   python27-python-arvados-python-client"
-        ;;
+            ;;
         *)
             packages="$packages python-arvados-fuse
                   python-arvados-python-client"
@@ -164,6 +164,8 @@ docker_volume_args=(
 
 if [[ -n "$test_packages" ]]; then
     for p in $packages ; do
+        echo
+        echo "START: $p test on $IMAGE" >&2
         if docker run --rm \
             "${docker_volume_args[@]}" \
             --env ARVADOS_DEBUG=1 \
@@ -171,24 +173,26 @@ if [[ -n "$test_packages" ]]; then
             --env "WORKSPACE=/arvados" \
             "$IMAGE" $COMMAND $p
         then
-            true
+            echo "OK: $p test on $IMAGE succeeded" >&2
         else
             FINAL_EXITCODE=$?
             package_fails="$package_fails $p"
-            echo "ERROR: $tag test failed with exit status $FINAL_EXITCODE." >&2
+            echo "ERROR: $p test on $IMAGE failed with exit status $FINAL_EXITCODE" >&2
         fi
     done
 else
+    echo
+    echo "START: build packages on $IMAGE" >&2
     if docker run --rm \
         "${docker_volume_args[@]}" \
         --env ARVADOS_DEBUG=1 \
         "$IMAGE" $COMMAND
     then
         echo
-        echo "Build packages for $TARGET succeeded." >&2
+        echo "OK: build packages on $IMAGE succeeded" >&2
     else
         FINAL_EXITCODE=$?
-        echo "ERROR: $tag build failed with exit status $FINAL_EXITCODE." >&2
+        echo "ERROR: build packages on $IMAGE failed with exit status $FINAL_EXITCODE" >&2
     fi
 fi
 
diff --git a/jenkins/run-library.sh b/jenkins/run-library.sh
index bec5279..c2e9b40 100755
--- a/jenkins/run-library.sh
+++ b/jenkins/run-library.sh
@@ -225,6 +225,10 @@ fpm_build () {
     fi
   fi
 
+  if [[ "${DEBUG:-0}" != "0" ]]; then
+    COMMAND_ARR+=('--verbose' '--log' 'info')
+  fi
+
   if [[ "$PACKAGE_NAME" != "$PACKAGE" ]]; then
     COMMAND_ARR+=('-n' "$PACKAGE_NAME")
   fi
-- 
2.30.2