[ARVADOS] updated: 1.3.0-1398-g2ecb1b1e0

Git user git at public.curoverse.com
Mon Jul 29 15:36:22 UTC 2019


Summary of changes:
 tools/arvbox/bin/arvbox                          |  1 +
 tools/arvbox/lib/arvbox/docker/cluster-config.sh | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

       via  2ecb1b1e045897ac5d028ae371d19a7afa1ce2bf (commit)
       via  eae1dba3e92c386e03ff07c0e06ddb214f4c7e0a (commit)
      from  da77af55002ffc7581048f70b17ffc3c46bf86b0 (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 2ecb1b1e045897ac5d028ae371d19a7afa1ce2bf
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Jul 29 11:34:03 2019 -0400

    arvbox creates /var/lib/arvados/run_tests/config.yml
    
    Set CONFIGSRC when running tests in arvbox
    
    refs #14717
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index 0a0d82e71..e56fbd489 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -286,6 +286,7 @@ run() {
                    -e TERM=$TERM \
                    -e WORKSPACE=/usr/src/arvados \
                    -e GEM_HOME=/var/lib/gems \
+		   -e CONFIGSRC=/var/lib/arvados/run_tests \
                    $ARVBOX_CONTAINER \
                    /usr/local/lib/arvbox/runsu.sh \
                    /usr/src/arvados/build/run-tests.sh \
diff --git a/tools/arvbox/lib/arvbox/docker/cluster-config.sh b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
index c02520467..7719fefce 100755
--- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh
+++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@ -89,3 +89,16 @@ EOF
 /usr/local/lib/arvbox/yml_override.py /var/lib/arvados/cluster_config.yml
 
 cp /var/lib/arvados/cluster_config.yml /etc/arvados/config.yml
+
+mkdir -p /var/lib/arvados/run_tests
+cat >/var/lib/arvados/run_tests/config.yml <<EOF
+Clusters:
+  zzzzz:
+    PostgreSQL:
+      Connection:
+        host: localhost
+        user: arvados
+        password: ${database_pw}
+        dbname: arvados_test
+        client_encoding: utf8
+EOF

commit eae1dba3e92c386e03ff07c0e06ddb214f4c7e0a
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Jul 23 15:33:33 2019 -0400

    Arvbox config doesn't need to set SupportedDockerImageFormats
    
    Since it is already the default, refs #15467
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/cluster-config.sh b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
index ee9c13042..c02520467 100755
--- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh
+++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@ -72,8 +72,6 @@ Clusters:
     Collections:
       BlobSigningKey: $blob_signing_key
       DefaultReplication: 1
-    Containers:
-      SupportedDockerImageFormats: ["v2"]
     Login:
       ProviderAppSecret: $sso_app_secret
       ProviderAppID: arvados-server

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list