[ARVADOS] created: 1.3.0-1912-g5ffd4a118
Git user
git at public.curoverse.com
Fri Nov 22 20:35:04 UTC 2019
at 5ffd4a118ae8c97c4c75fc789b2b5c8437461797 (commit)
commit 5ffd4a118ae8c97c4c75fc789b2b5c8437461797
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Fri Nov 22 15:31:23 2019 -0500
15851: Update expected versions in Gemfile.lock files.
Bundler won't install a gem whose *.gemspec file doesn't match the
expected version number, even when Gemfile.lock specifies a git
repo+commit.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 27e5e1165..f16f298ba 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -3,7 +3,7 @@ GIT
revision: dd9f2403f43bcb93da5908ddde57d8c0491bb4c2
glob: sdk/ruby/arvados.gemspec
specs:
- arvados (1.4.1.20191019025325)
+ arvados (1.4.2.20191019025325)
activesupport (>= 3)
andand (~> 1.3, >= 1.3.3)
arvados-google-api-client (>= 0.7, < 0.8.9)
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index ef758bd43..c4bd33fda 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -3,7 +3,7 @@ GIT
revision: dd9f2403f43bcb93da5908ddde57d8c0491bb4c2
glob: sdk/*/*.gemspec
specs:
- arvados (1.4.1.20191019025325)
+ arvados (1.4.2.20191019025325)
activesupport (>= 3)
andand (~> 1.3, >= 1.3.3)
arvados-google-api-client (>= 0.7, < 0.8.9)
@@ -11,7 +11,7 @@ GIT
i18n (~> 0)
json (>= 1.7.7, < 3)
jwt (>= 0.1.5, < 2)
- arvados-cli (1.4.1.20191017145711)
+ arvados-cli (1.4.2.20191017145711)
activesupport (>= 3.2.13, < 5.1)
andand (~> 1.3, >= 1.3.3)
arvados (>= 1.4.1.20190320201707)
commit 2e6208ee675505d9af3a9d7c837aabdf2d497f21
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Fri Nov 22 14:34:43 2019 -0500
15851: Explicit path to bundle executable.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/build/run-tests.sh b/build/run-tests.sh
index af3426cd7..b32fe6a43 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -520,6 +520,10 @@ setup_ruby_environment() {
|| fatal 'rvm gemset setup'
rvm env
+ (bundle version | grep -q 2.0.2) || gem install bundler -v 2.0.2
+ bundle="$(which bundle)"
+ echo "$bundle"
+ "$bundle" version | grep 2.0.2 || fatal 'install bundler'
else
# When our "bundle install"s need to install new gems to
# satisfy dependencies, we want them to go where "gem install
@@ -545,12 +549,14 @@ 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"
+ (
+ export HOME=$GEMHOME
+ ("$bundle" version | grep -q 2.0.2) \
+ || gem install --user bundler -v 2.0.2
+ "$bundle" version | grep 2.0.2
+ ) || fatal 'install bundler'
fi
- (
- export HOME=$GEMHOME
- ("$(gem env gempath | cut -f1 -d:)/bin/bundle" version | grep 2.0.2) \
- || gem install --user bundler -v 2.0.2
- ) || fatal 'install bundler'
}
with_test_gemset() {
@@ -668,11 +674,6 @@ Warning: python3 could not be found. Python 3 tests will be skipped.
EOF
fi
-
- if ! which bundler >/dev/null
- then
- gem install --user-install bundler || fatal 'Could not install bundler'
- fi
}
retry() {
@@ -884,11 +885,11 @@ bundle_install_trylocal() {
(
set -e
echo "(Running bundle install --local. 'could not find package' messages are OK.)"
- if ! bundle install --local --no-deployment; then
+ if ! "$bundle" install --local --no-deployment; then
echo "(Running bundle install again, without --local.)"
- bundle install --no-deployment
+ "$bundle" install --no-deployment
fi
- bundle package --all
+ "$bundle" package --all
)
}
@@ -973,11 +974,11 @@ install_services/api() {
(cd "$WORKSPACE/services/api"
export RAILS_ENV=test
- if bundle exec rails db:environment:set ; then
- bundle exec rake db:drop
+ if "$bundle" exec rails db:environment:set ; then
+ "$bundle" exec rake db:drop
fi
- bundle exec rake db:setup \
- && bundle exec rake db:fixtures:load
+ "$bundle" exec rake db:setup \
+ && "$bundle" exec rake db:fixtures:load
)
}
@@ -1003,7 +1004,7 @@ install_apps/workbench() {
cd "$WORKSPACE/apps/workbench" \
&& mkdir -p tmp/cache \
&& RAILS_ENV=test bundle_install_trylocal \
- && RAILS_ENV=test RAILS_GROUPS=assets bundle exec rake npm:install
+ && RAILS_ENV=test RAILS_GROUPS=assets "$bundle" exec rake npm:install
}
test_doc() {
@@ -1013,7 +1014,7 @@ test_doc() {
ARVADOS_API_HOST=qr1hi.arvadosapi.com
# Make sure python-epydoc is installed or the next line won't
# do much good!
- PYTHONPATH=$WORKSPACE/sdk/python/ bundle exec rake linkchecker baseurl=file://$WORKSPACE/doc/.site/ arvados_workbench_host=https://workbench.$ARVADOS_API_HOST arvados_api_host=$ARVADOS_API_HOST
+ PYTHONPATH=$WORKSPACE/sdk/python/ "$bundle" exec rake linkchecker baseurl=file://$WORKSPACE/doc/.site/ arvados_workbench_host=https://workbench.$ARVADOS_API_HOST arvados_api_host=$ARVADOS_API_HOST
)
}
@@ -1026,12 +1027,12 @@ test_gofmt() {
test_services/api() {
rm -f "$WORKSPACE/services/api/git-commit.version"
cd "$WORKSPACE/services/api" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test TESTOPTS=\'-v -d\' ${testargs[services/api]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} "$bundle" exec rake test TESTOPTS=\'-v -d\' ${testargs[services/api]}
}
test_sdk/ruby() {
cd "$WORKSPACE/sdk/ruby" \
- && bundle exec rake test TESTOPTS=-v ${testargs[sdk/ruby]}
+ && "$bundle" exec rake test TESTOPTS=-v ${testargs[sdk/ruby]}
}
test_sdk/R() {
@@ -1044,7 +1045,7 @@ test_sdk/R() {
test_sdk/cli() {
cd "$WORKSPACE/sdk/cli" \
&& mkdir -p /tmp/keep \
- && KEEP_LOCAL_STORE=/tmp/keep bundle exec rake test TESTOPTS=-v ${testargs[sdk/cli]}
+ && KEEP_LOCAL_STORE=/tmp/keep "$bundle" exec rake test TESTOPTS=-v ${testargs[sdk/cli]}
}
test_sdk/java-v2() {
@@ -1053,7 +1054,7 @@ test_sdk/java-v2() {
test_services/login-sync() {
cd "$WORKSPACE/services/login-sync" \
- && bundle exec rake test TESTOPTS=-v ${testargs[services/login-sync]}
+ && "$bundle" exec rake test TESTOPTS=-v ${testargs[services/login-sync]}
}
test_services/nodemanager_integration() {
@@ -1064,31 +1065,31 @@ test_services/nodemanager_integration() {
test_apps/workbench_units() {
local TASK="test:units"
cd "$WORKSPACE/apps/workbench" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_units]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} "$bundle" exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_units]}
}
test_apps/workbench_functionals() {
local TASK="test:functionals"
cd "$WORKSPACE/apps/workbench" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_functionals]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} "$bundle" exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_functionals]}
}
test_apps/workbench_integration() {
local TASK="test:integration"
cd "$WORKSPACE/apps/workbench" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_integration]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} "$bundle" exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_integration]}
}
test_apps/workbench_benchmark() {
local TASK="test:benchmark"
cd "$WORKSPACE/apps/workbench" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} ${testargs[apps/workbench_benchmark]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} "$bundle" exec rake ${TASK} ${testargs[apps/workbench_benchmark]}
}
test_apps/workbench_profile() {
local TASK="test:profile"
cd "$WORKSPACE/apps/workbench" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} ${testargs[apps/workbench_profile]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} "$bundle" exec rake ${TASK} ${testargs[apps/workbench_profile]}
}
install_deps() {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list