[ARVADOS] created: 1.3.0-2517-g4fbd7b42b

[Git user]

        at  4fbd7b42b4ebcf1dfbcb54bb6b18bef0b2ab43ed (commit)


commit 4fbd7b42b4ebcf1dfbcb54bb6b18bef0b2ab43ed
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Apr 24 11:52:24 2020 -0400

    16263: make the checker happy
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/tests/federation/arvbox-make-federation.cwl b/sdk/cwl/tests/federation/arvbox-make-federation.cwl
index a0f8a8eac..ed3f1d138 100644
--- a/sdk/cwl/tests/federation/arvbox-make-federation.cwl
+++ b/sdk/cwl/tests/federation/arvbox-make-federation.cwl
@@ -34,7 +34,7 @@ inputs:
     type: boolean
     default: false
   arvbox_mode:
-    type: string
+    type: string?
     default: "dev"
 outputs:
   arvados_api_token:
diff --git a/sdk/cwl/tests/federation/arvboxcwl/start.cwl b/sdk/cwl/tests/federation/arvboxcwl/start.cwl
index 802025039..ec095ac74 100644
--- a/sdk/cwl/tests/federation/arvboxcwl/start.cwl
+++ b/sdk/cwl/tests/federation/arvboxcwl/start.cwl
@@ -15,7 +15,7 @@ inputs:
     type: string
     default: master
   arvbox_mode:
-    type: string
+    type: string?
     default: "dev"
 outputs:
   cluster_id:
diff --git a/sdk/python/tests/fed-migrate/arvbox-make-federation.cwl b/sdk/python/tests/fed-migrate/arvbox-make-federation.cwl
index aa859cba4..cc0fb0fe0 100644
--- a/sdk/python/tests/fed-migrate/arvbox-make-federation.cwl
+++ b/sdk/python/tests/fed-migrate/arvbox-make-federation.cwl
@@ -9,6 +9,8 @@ inputs:
   branch:
     type: string
     default: master
+  arvbox_mode:
+    type: string?
 outputs:
   arvados_api_hosts:
     type: string[]
@@ -39,6 +41,7 @@ steps:
     in:
       arvbox_base: arvbox_base
       branch: branch
+      arvbox_mode: arvbox_mode
       logincluster:
         default: true
     out: [arvados_api_hosts, arvados_cluster_ids, arvado_api_host_insecure, superuser_tokens, arvbox_containers, arvbox_bin]

commit 263129c3643da95bb47e671239c17a098b9cb7b2
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Apr 24 11:25:58 2020 -0400

    16263: Fed tests can set arvbox mode (dev or localdemo)
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/tests/federation/arvbox-make-federation.cwl b/sdk/cwl/tests/federation/arvbox-make-federation.cwl
index 593f2399f..a0f8a8eac 100644
--- a/sdk/cwl/tests/federation/arvbox-make-federation.cwl
+++ b/sdk/cwl/tests/federation/arvbox-make-federation.cwl
@@ -33,6 +33,9 @@ inputs:
   logincluster:
     type: boolean
     default: false
+  arvbox_mode:
+    type: string
+    default: "dev"
 outputs:
   arvados_api_token:
     type: string
@@ -71,6 +74,7 @@ steps:
       arvbox_data: mkdir/arvbox_data
       arvbox_bin: arvbox
       branch: branch
+      arvbox_mode: arvbox_mode
     out: [cluster_id, container_host, arvbox_data_out, superuser_token]
     scatter: [container_name, arvbox_data]
     scatterMethod: dotproduct
diff --git a/sdk/cwl/tests/federation/arvboxcwl/start.cwl b/sdk/cwl/tests/federation/arvboxcwl/start.cwl
index a7f46d6b2..802025039 100644
--- a/sdk/cwl/tests/federation/arvboxcwl/start.cwl
+++ b/sdk/cwl/tests/federation/arvboxcwl/start.cwl
@@ -14,6 +14,9 @@ inputs:
   branch:
     type: string
     default: master
+  arvbox_mode:
+    type: string
+    default: "dev"
 outputs:
   cluster_id:
     type: string
@@ -86,9 +89,9 @@ arguments:
 
       cd $(runtime.outdir)
       if test "$gitver" = "$pulled" ; then
-        $(inputs.arvbox_bin.path) start dev
+        $(inputs.arvbox_bin.path) start $(inputs.arvbox_mode)
       else
-        $(inputs.arvbox_bin.path) restart dev
+        $(inputs.arvbox_bin.path) restart $(inputs.arvbox_mode)
       fi
       $(inputs.arvbox_bin.path) status > status.txt
       $(inputs.arvbox_bin.path) cat /var/lib/arvados/superuser_token > superuser_token.txt
diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index af9824c3a..bf18c9aca 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -236,7 +236,7 @@ run() {
         mkdir -p "$PG_DATA" "$VAR_DATA" "$PASSENGER" "$GEMS" "$PIPCACHE" "$NPMCACHE" "$GOSTUFF" "$RLIBS"
 
         if ! test -d "$ARVADOS_ROOT" ; then
-            git clone https://github.com/arvados/arvados.git "$ARVADOS_ROOT"
+            git clone https://git.arvados.org/arvados.git "$ARVADOS_ROOT"
         fi
         if ! test -d "$SSO_ROOT" ; then
             git clone https://github.com/arvados/sso-devise-omniauth-provider.git "$SSO_ROOT"

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


hooks/post-receive
--