[ARVADOS-DEV] updated: 1659fd3eca62ac51e7628af3464dd03787e2d84f

Git user git at public.curoverse.com
Mon Mar 7 00:46:16 EST 2016


Summary of changes:
 jenkins/run-build-packages-one-target.sh | 14 +++++++++-----
 jenkins/run-build-packages.sh            |  2 +-
 jenkins/run-library.sh                   |  4 ++++
 3 files changed, 14 insertions(+), 6 deletions(-)

       via  1659fd3eca62ac51e7628af3464dd03787e2d84f (commit)
       via  27ac5631c777fefc89839089109d0b06d596019d (commit)
      from  a4f8a4e24e7a778194878c200391c4a3dca55961 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1659fd3eca62ac51e7628af3464dd03787e2d84f
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Mar 7 00:46:08 2016 -0500

    8345: Fix up log messages to show which distro/package is being built/tested.

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

commit 27ac5631c777fefc89839089109d0b06d596019d
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Mar 7 00:44:46 2016 -0500

    8345: Build contextlib2 backport, needed by python-llfuse on debian7.

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 21cc6c6..136b73c 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -93,7 +93,7 @@ case "$TARGET" in
             oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
             rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
             ciso8601 pycrypto backports.ssl_match_hostname llfuse \
-            'pycurl<7.21.5')
+            'pycurl<7.21.5' contextlib2)
         PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
         ;;
     debian8)

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list