[ARVADOS] updated: 1.3.0-2623-g8e9f21692

[Git user]

Summary of changes:
 sdk/cwl/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

  discards  f0d9028cf68e1b72fcf5e64e507292af9a236a64 (commit)
  discards  a8f51c3e348515e2f8f39ef38cad50760a598bcf (commit)
  discards  20470bcb23d77a7d45d649c530dd4b29245ba6e5 (commit)
  discards  e830c0e8219cc6725892702f5215ff4b6d2e49ad (commit)
       via  8e9f21692e6a815b4aac226f8fb87ec3d716f781 (commit)
       via  6b3082d44131779a02278193de36070a96776caa (commit)
       via  6b400800330b5409ff67bcbfff19fb9bf93f4447 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (f0d9028cf68e1b72fcf5e64e507292af9a236a64)
            \
             N -- N -- N (8e9f21692e6a815b4aac226f8fb87ec3d716f781)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 8e9f21692e6a815b4aac226f8fb87ec3d716f781
Author: Ward Vandewege <ward at jhvc.com>
Date:   Wed Jun 3 15:42:03 2020 -0400

    16482: bump a-c-r's cwltool dependency to version 3.0.20200530110633 so
           that CWL v1.2.0-dev3 tests are supported.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 72969de94..40ee67985 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -39,8 +39,8 @@ setup(name='arvados-cwl-runner',
       # file to determine what version of cwltool and schema-salad to
       # build.
       install_requires=[
-          'cwltool==3.0.20200324120055',
-          'schema-salad==5.0.20200302192450',
+          'cwltool==3.0.20200530110633',
+          'schema-salad==6.0.20200601095207',
           'arvados-python-client{}'.format(pysdk_dep),
           'setuptools',
           'ciso8601 >= 2.0.0'

commit 6b3082d44131779a02278193de36070a96776caa
Author: Ward Vandewege <ward at jhvc.com>
Date:   Tue Jun 2 17:43:40 2020 -0400

    Bugfix: test_with_arvbox.sh in non-build mode now works again and uses
    the logic from run-library.sh to determine the version of arvados/jobs
    to pull. Also includes some extra error checking and a small comparison
    operator bugfix.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/sdk/cwl/test_with_arvbox.sh b/sdk/cwl/test_with_arvbox.sh
index 76aa43d61..6de404f44 100755
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -98,7 +98,7 @@ fi
 
 set -x
 
-if [ \$PYCMD = "python3" ]; then
+if [ "\$PYCMD" = "python3" ]; then
     pip3 install cwltest
 else
     pip install cwltest
@@ -118,6 +118,9 @@ elif [[ "$suite" =~ conformance-(.*) ]] ; then
      git clone https://github.com/common-workflow-language/cwl-\${version}.git
    fi
    cd cwl-\${version}
+elif [[ "$suite" != "integration" ]] ; then
+   echo "ERROR: unknown suite '$suite'"
+   exit 1
 fi
 
 if [[ "$suite" != "integration" ]] ; then
@@ -133,9 +136,17 @@ if test -n "$build" ; then
 elif test "$tag" = "latest" ; then
   arv-keepdocker --pull arvados/jobs $tag
 else
-  jobsimg=\$(curl https://versions.arvados.org/v1/commit/$tag | python -c "import json; import sys; sys.stdout.write(json.load(sys.stdin)['Versions']['Docker']['arvados/jobs'])")
-  arv-keepdocker --pull arvados/jobs \$jobsimg
-  docker tag arvados/jobs:\$jobsimg arvados/jobs:latest
+  set +u
+  export WORKSPACE=/usr/src/arvados
+  . /usr/src/arvados/build/run-library.sh
+  TMPHERE=\$(pwd)
+  cd /usr/src/arvados
+  calculate_python_sdk_cwl_package_versions
+  cd \$TMPHERE
+  set -u
+
+  arv-keepdocker --pull arvados/jobs \$cwl_runner_version
+  docker tag arvados/jobs:\$cwl_runner_version arvados/jobs:latest
   arv-keepdocker arvados/jobs latest
 fi
 
@@ -153,7 +164,7 @@ chmod +x /tmp/cwltest/arv-cwl-containers
 
 EXTRA=--compute-checksum
 
-if [[ $devcwl == 1 ]] ; then
+if [[ $devcwl -eq 1 ]] ; then
    EXTRA="\$EXTRA --enable-dev"
 fi
 

commit 6b400800330b5409ff67bcbfff19fb9bf93f4447
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Tue Jun 2 15:00:40 2020 -0300

    Fixes arvbox config, adding Login.SSO.Enable: true. No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/tools/arvbox/lib/arvbox/docker/cluster-config.sh b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
index dbcbc913c..4798cb6cc 100755
--- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh
+++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@ -140,6 +140,7 @@ Clusters:
       TrustAllContent: true
     Login:
       SSO:
+        Enable: true
         ProviderAppSecret: $sso_app_secret
         ProviderAppID: arvados-server
     Users:

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


hooks/post-receive
--