[ARVADOS-DEV] updated: 8e51498f431f233a38da76c169ea2e897e91f051

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-tests.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

       via  8e51498f431f233a38da76c169ea2e897e91f051 (commit)
       via  63517baef2f2e2d2e1ea10d4952189ef377da635 (commit)
       via  ee10e6bbf12c994dd6335560acac2327392ba3b0 (commit)
      from  07b0b88d99a07be66b564d7d8cd76fbaf27e5909 (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 8e51498f431f233a38da76c169ea2e897e91f051
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Sep 22 15:40:00 2014 -0400

    3894: Add comments about CONFIGSRC in --help text.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 2b52830..ee4a9c4 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -20,6 +20,7 @@ Options:
                from a previous invocation if you use this option.
 WORKSPACE=path Arvados source tree to test.
 CONFIGSRC=path Dir with api server config files to copy into source tree.
+               (If none given, leave config files alone in source tree.)
 apiserver_test="TEST=test/functional/arvados/v1/collections_test.rb"
                Restrict apiserver tests to the given file
 python_sdk_test="--test-suite test.test_keep_locator"
@@ -36,6 +37,9 @@ into \$GOPATH, \$VENDIR, and \$GEMHOME before running any tests. Many
 test suites depend on other components being installed, and installing
 everything tends to be quicker than debugging dependencies.
 
+As a special concession to the current CI server config, CONFIGSRC
+defaults to $HOME/arvados-api-server if that directory exists.
+
 More information and background:
 
 https://arvados.org/projects/arvados/wiki/Running_tests

commit 63517baef2f2e2d2e1ea10d4952189ef377da635
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Sep 22 15:37:03 2014 -0400

    3894: Fix -n that should have been -z. Flatten condition.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 742baeb..2b52830 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -156,11 +156,9 @@ done
 echo "WORKSPACE=$WORKSPACE"
 [[ -n "$WORKSPACE" ]] || fatal "WORKSPACE not set"
 
-if [[ -n "$CONFIGSRC" ]]; then
-    if [[ -d "$HOME/arvados-api-server" ]]; then
-        # Jenkins expects us to use this by default.
-        CONFIGSRC="$HOME/arvados-api-server"
-    fi
+if [[ -z "$CONFIGSRC" ]] && [[ -d "$HOME/arvados-api-server" ]]; then
+    # Jenkins expects us to use this by default.
+    CONFIGSRC="$HOME/arvados-api-server"
 fi
 
 # Set up temporary install dirs (unless existing dirs were supplied)

commit ee10e6bbf12c994dd6335560acac2327392ba3b0
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Sep 22 15:32:50 2014 -0400

    3894: Use --first-parent and readable timestamp in fuse package as
    well. Use "tr -dc | cut" to eliminate the horrible list of byte
    positions. Fix git command to use the desired human-readable timestamp
    format.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 612f208..742baeb 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -273,14 +273,14 @@ install_python_sdk() {
     # keepproxy).
 
     cd "$WORKSPACE/sdk/python" \
-        && 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 \
+        && python setup.py egg_info -b ".$(git log --first-parent --format=format:%ci.%h -n1 . | tr -dc 0-9a-f. | cut -c 1-14,19-)" sdist rotate --keep=1 --match .tar.gz \
         && pip install dist/arvados-python-client-0.1.*.tar.gz
 }
 do_install python_sdk
 
 install_fuse() {
     cd "$WORKSPACE/services/fuse" \
-        && 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:%ci.%h -n1 . | tr -dc 0-9a-f. | cut -c 1-14,19-)" sdist rotate --keep=1 --match .tar.gz \
         && pip install dist/arvados_fuse-0.1.*.tar.gz
 }
 do_install fuse

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


hooks/post-receive
--