arvbox creates /var/lib/arvados/run_tests/config.yml

[arvados.git] / tools / arvbox / bin / arvbox

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index 3e829522af24de67e134166e8dc227b2ba7b9b61..e56fbd489be3312c0e9159379d351a75acd20630 100755 (executable)
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -275,16 +275,23 @@ run() {
                        /var/lib/arvbox/service/api/run-service --only-setup
             fi
 
+           interactive=""
+           if [[ -z "$@" ]] ; then
+               interactive=--interactive
+           fi
+
             docker exec -ti \
                    -e LINES=$(tput lines) \
                    -e COLUMNS=$(tput cols) \
                    -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 \
                    --temp /var/lib/arvados/test \
+                  $interactive \
                    "$@"
         elif [[ "$CONFIG" = devenv ]] ; then
            if [[ $need_setup = 1 ]] ; then
@@ -554,7 +561,18 @@ case "$subcmd" in
 
     clone)
         if test -n "$2" ; then
-            cp -r "$ARVBOX_BASE/$1" "$ARVBOX_BASE/$2"
+           mkdir -p "$ARVBOX_BASE/$2"
+            cp -a "$ARVBOX_BASE/$1/passenger" \
+              "$ARVBOX_BASE/$1/gems" \
+              "$ARVBOX_BASE/$1/pip" \
+              "$ARVBOX_BASE/$1/npm" \
+              "$ARVBOX_BASE/$1/gopath" \
+              "$ARVBOX_BASE/$1/Rlibs" \
+              "$ARVBOX_BASE/$1/arvados" \
+              "$ARVBOX_BASE/$1/sso-devise-omniauth-provider" \
+              "$ARVBOX_BASE/$1/composer" \
+              "$ARVBOX_BASE/$1/workbench2" \
+              "$ARVBOX_BASE/$2"
             echo "Created new arvbox $2"
             echo "export ARVBOX_CONTAINER=$2"
         else