Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk

Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic@capeannenterprises.com>

diff --git a/build/run-build-packages-all-targets.sh b/build/run-build-packages-all-targets.sh
index bb2b2af7b2acf1df55f3f5f60f3c7f6649ad23ef..85c498ecd5e55f98b079af1477852e967ebc851e 100755 (executable)
--- a/build/run-build-packages-all-targets.sh
+++ b/build/run-build-packages-all-targets.sh
@@ -18,7 +18,9 @@ Options:
 --debug
     Output debug information (default: false)
 --build-version <string>
-    Version to build (default: \$ARVADOS_BUILDING_VERSION or 0.1.timestamp.commithash)
+    Version to build (default:
+    \$ARVADOS_BUILDING_VERSION-\$ARVADOS_BUILDING_ITERATION or
+    0.1.timestamp.commithash)
 
 WORKSPACE=path         Path to the Arvados source tree to build packages from
 

diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index ef7862c8d686c004651a5b22044898802710e327..c675a2407c590d8255052d502558b3391bc0c69b 100755 (executable)
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -22,7 +22,9 @@ Syntax:
 --only-test <package>
     Test only a specific package
 --build-version <string>
-    Version to build (default: \$ARVADOS_BUILDING_VERSION or 0.1.timestamp.commithash)
+    Version to build (default:
+    \$ARVADOS_BUILDING_VERSION-\$ARVADOS_BUILDING_ITERATION or
+    0.1.timestamp.commithash)
 
 WORKSPACE=path         Path to the Arvados source tree to build packages from
 

diff --git a/build/run-build-test-packages-one-target.sh b/build/run-build-test-packages-one-target.sh
index 24942e96393e47a8aa4a9529385d1566baa21162..744b5834d852aaa77035cd2460d8802db4b0d466 100755 (executable)
--- a/build/run-build-test-packages-one-target.sh
+++ b/build/run-build-test-packages-one-target.sh
@@ -14,6 +14,10 @@ Syntax:
 --upload
     If the build and test steps are successful, upload the packages
     to a remote apt repository (default: false)
+--build-version <version>
+    Version to build (default:
+    \$ARVADOS_BUILDING_VERSION-\$ARVADOS_BUILDING_ITERATION or
+    0.1.timestamp.commithash)
 
 WORKSPACE=path         Path to the Arvados source tree to build packages from
 
@@ -36,7 +40,7 @@ if ! [[ -d "$WORKSPACE" ]]; then
 fi
 
 PARSEDOPTS=$(getopt --name "$0" --longoptions \
-    help,upload,target: \
+    help,upload,target:,build-version: \
     -- "" "$@")
 if [ $? -ne 0 ]; then
     exit 1
@@ -45,6 +49,8 @@ fi
 TARGET=debian8
 UPLOAD=0
 
+declare -a build_args=()
+
 eval set -- "$PARSEDOPTS"
 while [ $# -gt 0 ]; do
     case "$1" in
@@ -59,6 +65,10 @@ while [ $# -gt 0 ]; do
         --upload)
             UPLOAD=1
             ;;
+        --build-version)
+            build_args+=("$1" "$2")
+            shift
+            ;;
         --)
             if [ $# -gt 1 ]; then
                 echo >&2 "$0: unrecognized argument '$2'. Try: $0 --help"
@@ -69,6 +79,8 @@ while [ $# -gt 0 ]; do
     shift
 done
 
+build_args+=(--target "$TARGET")
+
 exit_cleanly() {
     trap - INT
     report_outcomes
@@ -81,7 +93,7 @@ COLUMNS=80
 title "Start build packages"
 timer_reset
 
-$WORKSPACE/build/run-build-packages-one-target.sh --target $TARGET
+$WORKSPACE/build/run-build-packages-one-target.sh "${build_args[@]}"
 
 checkexit $? "build packages"
 title "End of build packages (`timer`)"
@@ -90,7 +102,7 @@ title "Start test packages"
 timer_reset
 
 if [ ${#failures[@]} -eq 0 ]; then
-  $WORKSPACE/build/run-build-packages-one-target.sh --target $TARGET --test-packages
+  $WORKSPACE/build/run-build-packages-one-target.sh "${build_args[@]}" --test-packages
 else
   echo "Skipping package upload, there were errors building the packages"
 fi

diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh
index 466ef1fceede5fd7c956a9ee46c558614712633a..c5e15233bcb9720a7a8f7d416a8bf274e42fa623 100644 (file)
--- a/tools/arvbox/lib/arvbox/docker/common.sh
+++ b/tools/arvbox/lib/arvbox/docker/common.sh
@@ -53,6 +53,7 @@ run_bundler() {
         else
             flock /var/lib/gems/gems.lock gem install --no-document bundler
         fi
+        ln -sf /var/lib/gems/bin/bundle /usr/local/bin
     fi
     if ! flock /var/lib/gems/gems.lock bundle install --path $GEM_HOME --local --no-deployment $frozen "$@" ; then
         flock /var/lib/gems/gems.lock bundle install --path $GEM_HOME --no-deployment $frozen "$@"

diff --git a/tools/arvbox/lib/arvbox/docker/service/composer/run-service b/tools/arvbox/lib/arvbox/docker/service/composer/run-service
index 71b9b1c4ba1d3033c3c232bb1b8ff6e7b42d5d71..ac4441de099ab37e1a0a36109807cf9e127db507 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/composer/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/composer/run-service
@@ -10,7 +10,7 @@ set -ex -o pipefail
 
 cd /usr/src/composer
 
-npm install yarn
+npm -d install yarn
 
 PATH=$PATH:/usr/src/composer/node_modules/.bin
 

diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
index 885385aeef971816b08f5f32f17b51ebf23ff2eb..e5bd0147b87674bee40cc8a2e2546c95d0d65468 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
@@ -46,6 +46,7 @@ $RAILS_ENV:
   keep_web_url: http://$localip:${services[keep-web]}/c=%{uuid_or_pdh}
   arvados_docsite: http://$localip:${services[doc]}/
   force_ssl: false
+  composer_url: http://$localip:${services[composer]}
 EOF
 
 bundle exec rake assets:precompile