[ARVADOS-DEV] updated: 07b0b88d99a07be66b564d7d8cd76fbaf27e5909

git at public.curoverse.com git at public.curoverse.com
Mon Sep 22 11:12:03 EDT 2014


Summary of changes:
 jenkins/run-tests.sh | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

       via  07b0b88d99a07be66b564d7d8cd76fbaf27e5909 (commit)
       via  e4f90e4d14a89ff08ba654333d316cd3e5e97225 (commit)
       via  0b16f3e4e4beccf000f04f63129276e0716c141c (commit)
      from  73b46d8b02451bb782f7262253778593181fd02d (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 07b0b88d99a07be66b564d7d8cd76fbaf27e5909
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Sep 22 11:07:13 2014 -0400

    3894: Use readable timestamp (yyyymmddhhmmss) for python package
    version, and use first-parent to ensure each merge to master results
    in a higher version number.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 5830565..612f208 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -273,7 +273,7 @@ install_python_sdk() {
     # keepproxy).
 
     cd "$WORKSPACE/sdk/python" \
-        && python setup.py egg_info -b ".$(git log --format=format:%ct.%h -n1 .)" sdist rotate --keep=1 --match .tar.gz \
+        && python setup.py egg_info -b ".$(git log --first-parent --format=format:%ct.%h -n1 . | cut -c 1-4,6-7,9-10,12-13,15-16,18-19,26-33)" sdist rotate --keep=1 --match .tar.gz \
         && pip install dist/arvados-python-client-0.1.*.tar.gz
 }
 do_install python_sdk

commit e4f90e4d14a89ff08ba654333d316cd3e5e97225
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Sep 22 11:05:39 2014 -0400

    3894: Remove bundle install stage from sdk/cli.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 1db3857..5830565 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -260,7 +260,6 @@ do_install ruby_sdk
 
 install_cli() {
     cd "$WORKSPACE/sdk/cli" \
-        && HOME="$GEMHOME" bundle install --no-deployment \
         && gem build arvados-cli.gemspec \
         && HOME="$GEMHOME" gem install --user-install --no-ri --no-rdoc `ls -t arvados-cli-*.gem|head -n1`
 }

commit 0b16f3e4e4beccf000f04f63129276e0716c141c
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Sep 22 11:04:08 2014 -0400

    3894: Move report_outcomes to a function.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 680ae0a..1db3857 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -95,6 +95,23 @@ fatal() {
     exit 1
 }
 
+report_outcomes() {
+    for x in "${successes[@]}"
+    do
+        echo "Pass: $x"
+    done
+
+    if [[ ${#failures[@]} == 0 ]]
+    then
+        echo "All test suites passed."
+    else
+        echo "Failures (${#failures[@]}):"
+        for x in "${failures[@]}"
+        do
+            echo "Fail: $x"
+        done
+    fi
+}
 declare -a failures
 declare -A skip
 
@@ -395,21 +412,7 @@ test_workbench() {
 }
 do_test workbench
 
+report_outcomes
 clear_temp
 
-for x in "${successes[@]}"
-do
-    echo "Pass: $x"
-done
-
-if [[ ${#failures[@]} == 0 ]]
-then
-    echo "All test suites passed."
-else
-    echo "Failures (${#failures[@]}):"
-    for x in "${failures[@]}"
-    do
-        echo "Fail: $x"
-    done
-fi
 exit ${#failures}

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list