[ARVADOS] updated: 1.3.0-2911-g7d7549d3a

[Git user]

Summary of changes:
 build/run-tests.sh      | 16 ++++++----------
 tools/arvbox/bin/arvbox |  1 +
 2 files changed, 7 insertions(+), 10 deletions(-)

       via  7d7549d3a3df1146f70c0a99891d2adbc3e20ed4 (commit)
       via  4de0821a28d54153c6046655d4a2d8f57da7e005 (commit)
      from  09f4d9f7fd5fc0518aa7d614c7f061c0b8f7d5a4 (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 7d7549d3a3df1146f70c0a99891d2adbc3e20ed4
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Tue Aug 25 10:14:24 2020 -0400

    16314: Fix bundle install recipe.
    
    Previous code used incorrect bin path when GEM_HOME was set by caller,
    e.g., arvbox.
    
    Also use "gem install --conservative" instead of parsing installed
    versions.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index c926fe87a..a1151686f 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -549,17 +549,10 @@ setup_ruby_environment() {
         echo "Will install dependencies to $(gem env gemdir)"
         echo "Will install arvados gems to $tmpdir_gem_home"
         echo "Gem search path is GEM_PATH=$GEM_PATH"
-        bundle="$(gem env gempath | cut -f1 -d:)/bin/bundle"
+        bundle="$(gem env gemdir)/bin/bundle"
         (
             export HOME=$GEMHOME
-            bundlers="$(gem list --details bundler)"
-            versions=(1.11.0 1.17.3 2.0.2)
-            for v in ${versions[@]}; do
-                if ! echo "$bundlers" | fgrep -q "($v)"; then
-                    gem install --user $(for v in ${versions[@]}; do echo bundler:${v}; done)
-                    break
-                fi
-            done
+            HOME="$GEMHOME" gem install --user --conservative --no-document bundler:1.11.0 bundler:1.17.3 bundler:2.0.2
             "$bundle" version | tee /dev/stderr | grep -q 'version 2'
         ) || fatal 'install bundler'
     fi

commit 4de0821a28d54153c6046655d4a2d8f57da7e005
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Tue Aug 25 10:12:55 2020 -0400

    16314: Fix cleanup of temp/arvbox dirs that contain readonly dirs.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 2742540b1..c926fe87a 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -162,9 +162,12 @@ temp_preserve=
 
 clear_temp() {
     if [[ -z "$temp" ]]; then
-        # we didn't even get as far as making a temp dir
+        # we did not even get as far as making a temp dir
         :
     elif [[ -z "$temp_preserve" ]]; then
+        # Go creates readonly dirs in the module cache, which cause
+        # "rm -rf" to fail unless we chmod first.
+        chmod -R u+w "$temp"
         rm -rf "$temp"
     else
         echo "Leaving behind temp dirs in $temp"
diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index 46acc8baf..7d45ba17c 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -497,6 +497,7 @@ case "$subcmd" in
                     exit 1
                 fi
                 set -x
+                chmod -R u+w "$ARVBOX_DATA"
                 rm -rf "$ARVBOX_DATA"
             else
                 if test "$1" != -f ; then

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


hooks/post-receive
--