[ARVADOS] updated: 1.3.0-2518-g0552b270d

[Git user]

Summary of changes:
 sdk/cwl/tests/federation/arvboxcwl/start.cwl | 28 +++++++++++++-----------
 sdk/python/tests/fed-migrate/jenkins.sh      | 32 ++++++++++++++++++++++++++++
 tools/arvbox/bin/arvbox                      |  1 +
 3 files changed, 49 insertions(+), 12 deletions(-)
 create mode 100755 sdk/python/tests/fed-migrate/jenkins.sh

       via  0552b270da8e91b026e3d90b147410889cabe646 (commit)
      from  4fbd7b42b4ebcf1dfbcb54bb6b18bef0b2ab43ed (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 0552b270da8e91b026e3d90b147410889cabe646
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Apr 24 15:13:36 2020 -0400

    16263: jenkin script to run whole fed-migrate test
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/tests/federation/arvboxcwl/start.cwl b/sdk/cwl/tests/federation/arvboxcwl/start.cwl
index ec095ac74..c933de254 100644
--- a/sdk/cwl/tests/federation/arvboxcwl/start.cwl
+++ b/sdk/cwl/tests/federation/arvboxcwl/start.cwl
@@ -74,19 +74,23 @@ arguments:
   - shellQuote: false
     valueFrom: |
       set -ex
-      mkdir -p $ARVBOX_DATA
-      if ! test -d $ARVBOX_DATA/arvados ; then
-        cd $ARVBOX_DATA
-        git clone https://git.arvados.org/arvados.git
+      if test $(inputs.arvbox_mode) = dev ; then
+        mkdir -p $ARVBOX_DATA
+        if ! test -d $ARVBOX_DATA/arvados ; then
+          cd $ARVBOX_DATA
+          git clone https://git.arvados.org/arvados.git
+        fi
+        cd $ARVBOX_DATA/arvados
+        gitver=`git rev-parse HEAD`
+        git fetch
+        git checkout -f $(inputs.branch)
+        git pull
+        pulled=`git rev-parse HEAD`
+        git --no-pager log -n1 $pulled
+      else
+        export ARVBOX_BASE=$(runtime.tmpdir)
+        unset ARVBOX_DATA
       fi
-      cd $ARVBOX_DATA/arvados
-      gitver=`git rev-parse HEAD`
-      git fetch
-      git checkout -f $(inputs.branch)
-      git pull
-      pulled=`git rev-parse HEAD`
-      git --no-pager log -n1 $pulled
-
       cd $(runtime.outdir)
       if test "$gitver" = "$pulled" ; then
         $(inputs.arvbox_bin.path) start $(inputs.arvbox_mode)
diff --git a/sdk/python/tests/fed-migrate/jenkins.sh b/sdk/python/tests/fed-migrate/jenkins.sh
new file mode 100755
index 000000000..8eb6e8dbf
--- /dev/null
+++ b/sdk/python/tests/fed-migrate/jenkins.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+if test -z "$WORKSPACE" ; then
+    echo "WORKSPACE unset"
+    exit 1
+fi
+
+docker stop fedbox1 fedbox2 fedbox3
+docker rm fedbox1 fedbox2 fedbox3
+docker rm fedbox1-data fedbox2-data fedbox3-data
+
+set -ex
+
+mkdir -p $WORKSPACE/tmp
+cd $WORKSPACE/tmp
+virtualenv --python python3 venv3
+. venv3/bin/activate
+
+cd $WORKSPACE/sdk/python
+pip install -e .
+
+cd $WORKSPACE/sdk/cwl
+pip install -e .
+
+mkdir -p $WORKSPACE/tmp/arvbox
+cd $WORKSPACE/sdk/python/tests/fed-migrate
+cwltool arvbox-make-federation.cwl \
+	--arvbox_base $WORKSPACE/tmp/arvbox \
+	--branch $(git rev-parse HEAD) \
+	--arvbox_mode localdemo > fed.json
+
+cwltool fed-migrate.cwl fed.json
diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index bf18c9aca..59aca1e5b 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -614,6 +614,7 @@ sv stop keepstore0
 sv stop keepstore1
 sv stop keepproxy
 cd /usr/src/arvados/services/api
+export DISABLE_DATABASE_ENVIRONMENT_CHECK=1
 export RAILS_ENV=development
 bundle exec rake db:drop
 rm /var/lib/arvados/api_database_setup

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


hooks/post-receive
--