[ARVADOS-DEV] updated: bab8ca353f89418b0d92ec639e5964cd1d2aada5
git at public.curoverse.com
git at public.curoverse.com
Wed Aug 26 11:42:15 EDT 2015
Summary of changes:
jenkins/run-build-packages.sh | 7 +++----
jenkins/run-tests.sh | 34 ++++++++++++++++++++++++----------
jenkins/run_upload_packages.py | 6 +++++-
3 files changed, 32 insertions(+), 15 deletions(-)
via bab8ca353f89418b0d92ec639e5964cd1d2aada5 (commit)
via feac22422cfdc33e14633b1a2b724c49eea69d94 (commit)
via 0be695eef3af4788a0890060a765e6b0d2c32334 (commit)
from fc1a358d5403e87bfdeca2d0c510362576a8c2e4 (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 bab8ca353f89418b0d92ec639e5964cd1d2aada5
Merge: fc1a358 feac224
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Aug 26 11:29:32 2015 -0400
Merge branch '6781-arvados-login-sync' refs #6781
commit feac22422cfdc33e14633b1a2b724c49eea69d94
Author: Ward Vandewege <ward at curoverse.com>
Date: Wed Aug 19 14:49:00 2015 -0400
Stop building broken debs for our gems. We don't use them and they have
never worked. We can reintroduce a working version later.
refs #6781
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 1c59fa8..cd83513 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -241,10 +241,6 @@ handle_ruby_gem() {
# -q appears to be broken in gem version 2.2.2
$GEM build "$gem_name.gemspec" $DASHQ_UNLESS_DEBUG >"$STDOUT_IF_DEBUG" 2>"$STDERR_IF_DEBUG"
fi
-
- cd "$WORKSPACE/packages/$TARGET"
- fpm_build "$gem_src_dir/$gem_name"-*.gem "" "Curoverse, Inc." gem "" \
- --prefix "$FPM_GEM_PREFIX"
}
# Build packages for everything
commit 0be695eef3af4788a0890060a765e6b0d2c32334
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Aug 13 11:02:51 2015 -0400
6781: Add arvados-login-sync.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 96bcea0..1c59fa8 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -418,6 +418,9 @@ handle_ruby_gem arvados
cd "$WORKSPACE/sdk/cli"
handle_ruby_gem arvados-cli
+cd "$WORKSPACE/services/login-sync"
+handle_ruby_gem arvados-login-sync
+
# Python packages
debug_echo -e "\nPython packages\n"
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index e191b44..cdff551 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -60,6 +60,7 @@ services/dockercleaner
services/fuse
services/keepproxy
services/keepstore
+services/login-sync
services/nodemanager
services/arv-git-httpd
sdk/cli
@@ -558,12 +559,18 @@ install_doc() {
}
do_install doc
-install_ruby_sdk() {
- with_test_gemset gem_uninstall_if_exists arvados \
- && cd "$WORKSPACE/sdk/ruby" \
+install_gem() {
+ gemname=$1
+ srcpath=$2
+ with_test_gemset gem_uninstall_if_exists "$gemname" \
+ && cd "$WORKSPACE/$srcpath" \
&& bundle_install_trylocal \
- && gem build arvados.gemspec \
- && with_test_gemset gem install --no-ri --no-rdoc `ls -t arvados-*.gem|head -n1`
+ && gem build "$gemname.gemspec" \
+ && with_test_gemset gem install --no-ri --no-rdoc $(ls -t "$gemname"-*.gem|head -n1)
+}
+
+install_ruby_sdk() {
+ install_gem arvados sdk/ruby
}
do_install sdk/ruby ruby_sdk
@@ -575,14 +582,15 @@ install_perl_sdk() {
do_install sdk/perl perl_sdk
install_cli() {
- with_test_gemset gem_uninstall_if_exists arvados-cli \
- && cd "$WORKSPACE/sdk/cli" \
- && bundle_install_trylocal \
- && gem build arvados-cli.gemspec \
- && with_test_gemset gem install --no-ri --no-rdoc `ls -t arvados-cli-*.gem|head -n1`
+ install_gem arvados-cli sdk/cli
}
do_install sdk/cli cli
+install_login-sync() {
+ install_gem arvados-login-sync services/login-sync
+}
+do_install services/login-sync login-sync
+
# Install the Python SDK early. Various other test suites (like
# keepproxy) bring up run_test_server.py, which imports the arvados
# module. We can't actually *test* the Python SDK yet though, because
@@ -719,6 +727,12 @@ test_cli() {
}
do_test sdk/cli cli
+test_login-sync() {
+ cd "$WORKSPACE/services/login-sync" \
+ && bundle exec rake test TESTOPTS=-v ${testargs[services/login-sync]}
+}
+do_test services/login-sync login-sync
+
for p in "${pythonstuff[@]}"
do
do_test "$p" pip
diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py
index eff30cc..5fc134c 100755
--- a/jenkins/run_upload_packages.py
+++ b/jenkins/run_upload_packages.py
@@ -192,7 +192,11 @@ PACKAGE_SUITES = {
'services/nodemanager/dist/*.tar.gz',
'services/fuse/dist/*.tar.gz',
),
- 'gems': _define_suite(GemPackageSuite, 'sdk/ruby/*.gem', 'sdk/cli/*.gem'),
+ 'gems': _define_suite(GemPackageSuite,
+ 'sdk/ruby/*.gem',
+ 'sdk/cli/*.gem',
+ 'services/login-sync/*.gem',
+ ),
}
for target in ['debian7', 'debian8', 'ubuntu1204', 'ubuntu1404']:
PACKAGE_SUITES[target] = _define_suite(
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list