[ARVADOS] updated: 1.3.0-235-g9b712f30f

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/done.py | 2 +-
 sdk/cwl/test_with_arvbox.sh | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

       via  9b712f30fe6784a5c8e747a8cf229c54cc02a509 (commit)
       via  38b5a8e1debf8ee7a48bfe896a44089cb7f27453 (commit)
      from  d1993ffdca3bc9036b1915bae6360dee145ee9f2 (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 9b712f30fe6784a5c8e747a8cf229c54cc02a509
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Feb 4 15:13:34 2019 -0500

    13306: fix crunchv1 bug
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/done.py b/sdk/cwl/arvados_cwl/done.py
index 378192b62..9b26ad706 100644
--- a/sdk/cwl/arvados_cwl/done.py
+++ b/sdk/cwl/arvados_cwl/done.py
@@ -93,7 +93,7 @@ def logtail(logcollection, logfunc, header, maxlen=25):
             loglines.append("%s %s %s" % (ts, earliest, msg))
         loglines = loglines[-maxlen:]
     else:
-        loglines = viewvalues(mergelogs)[0]
+        loglines = mergelogs[list(mergelogs)[0]]
 
     logtxt = "\n  ".join(l.strip() for l in loglines)
     logfunc("%s\n\n  %s", header, logtxt)

commit 38b5a8e1debf8ee7a48bfe896a44089cb7f27453
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Feb 4 15:13:12 2019 -0500

    13306: test_with_arvbox can select api
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/cwl/test_with_arvbox.sh b/sdk/cwl/test_with_arvbox.sh
index 936560366..22d47a5d4 100755
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -15,6 +15,7 @@ config=dev
 tag="latest"
 pythoncmd=python
 suite=conformance
+runapi=containers
 
 while test -n "$1" ; do
     arg="$1"
@@ -47,6 +48,10 @@ while test -n "$1" ; do
             suite=$2
             shift ; shift
             ;;
+	--api)
+	    runapi=$2
+            shift ; shift
+            ;;
         -h|--help)
             echo "$0 [--no-reset-container] [--leave-running] [--config dev|localdemo] [--tag docker_tag] [--build] [--pythoncmd python(2|3)] [--suite (integration|conformance)]"
             exit
@@ -127,7 +132,7 @@ chmod +x /tmp/cwltest/arv-cwl-containers
 
 env
 if [[ "$suite" = "conformance" ]] ; then
-   exec ./run_test.sh RUNNER=/tmp/cwltest/arv-cwl-containers EXTRA=--compute-checksum $@
+   exec ./run_test.sh RUNNER=/tmp/cwltest/arv-cwl-${runapi} EXTRA=--compute-checksum $@
 elif [[ "$suite" = "integration" ]] ; then
    cd /usr/src/arvados/sdk/cwl/tests
    exec ./arvados-tests.sh $@

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


hooks/post-receive
--