[ARVADOS-DEV] updated: ebdbb0bb23ceb1d1373472e6405fa2293f51616b

[git at public.curoverse.com]

Summary of changes:
 jenkins/deb-common-test-packages.sh                 |  4 +++-
 jenkins/package-test-dockerfiles/centos6/Dockerfile | 11 ++++++++++-
 jenkins/run-build-packages-one-target.sh            | 14 ++++++++++----
 jenkins/test-package-arvados-api-server.sh          |  5 +++++
 jenkins/test-package-arvados-workbench.sh           |  5 +++++
 jenkins/test-packages-centos6.sh                    | 10 ++++++----
 6 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100755 jenkins/test-package-arvados-api-server.sh
 create mode 100755 jenkins/test-package-arvados-workbench.sh

       via  ebdbb0bb23ceb1d1373472e6405fa2293f51616b (commit)
      from  60d3fdf6dedff3cb9eca478caacfeee19a752812 (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 ebdbb0bb23ceb1d1373472e6405fa2293f51616b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Jan 13 15:40:36 2016 -0500

    8008: Run bundle install and bundle list for api server and workbench.

diff --git a/jenkins/deb-common-test-packages.sh b/jenkins/deb-common-test-packages.sh
index fe6a04e..1b52fc1 100755
--- a/jenkins/deb-common-test-packages.sh
+++ b/jenkins/deb-common-test-packages.sh
@@ -12,7 +12,9 @@ apt-get --assume-yes --force-yes install $1
 mkdir -p /tmp/opts
 cd /tmp/opts
 
-dpkg-deb -x /arvados/packages/$target/$1-*.deb .
+export ARV_PACKAGES_DIR=/arvados/packages/$target
+
+dpkg-deb -x $ARV_PACKAGES_DIR/"$1"_*.deb .
 
 for so in $(find . -name "*.so") ; do
     echo
diff --git a/jenkins/package-test-dockerfiles/centos6/Dockerfile b/jenkins/package-test-dockerfiles/centos6/Dockerfile
index addd259..0020d5f 100644
--- a/jenkins/package-test-dockerfiles/centos6/Dockerfile
+++ b/jenkins/package-test-dockerfiles/centos6/Dockerfile
@@ -1,6 +1,15 @@
 FROM centos:6
 MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
 
-RUN yum -q install --assumeyes scl-utils centos-release-SCL
+RUN yum -q install --assumeyes scl-utils centos-release-SCL \
+    which tar
+
+# Install RVM
+RUN touch /var/lib/rpm/* && \
+    gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
+    curl -L https://get.rvm.io | bash -s stable && \
+    /usr/local/rvm/bin/rvm install 2.1 && \
+    /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
+    /usr/local/rvm/bin/rvm-exec default gem install bundle fpm
 
 COPY localrepo.repo /etc/yum.repos.d/localrepo.repo
\ No newline at end of file
diff --git a/jenkins/run-build-packages-one-target.sh b/jenkins/run-build-packages-one-target.sh
index 2399342..ad46452 100755
--- a/jenkins/run-build-packages-one-target.sh
+++ b/jenkins/run-build-packages-one-target.sh
@@ -117,7 +117,7 @@ time docker build --tag=$IMAGE .
 popd
 
 if test -z "$packages" ; then
-packages="arvados-api-server
+    packages="arvados-api-server
         arvados-data-manager
         arvados-docker-cleaner
         arvados-git-httpd
@@ -129,9 +129,15 @@ packages="arvados-api-server
         keep-rsync
         keepstore
         keep-web
-        libarvados-perl
-        python27-python-arvados-fuse
-        python27-python-arvados-python-client"
+        libarvados-perl"
+
+    if test $target == centos6 ; then
+        packages="$packages python27-python-arvados-fuse
+                  python27-python-arvados-python-client"
+    else
+        packages="$packages python-arvados-fuse
+                  python-arvados-python-client"
+    fi
 fi
 
 FINAL_EXITCODE=0
diff --git a/jenkins/test-package-arvados-api-server.sh b/jenkins/test-package-arvados-api-server.sh
new file mode 100755
index 0000000..0f21ff5
--- /dev/null
+++ b/jenkins/test-package-arvados-api-server.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+cd /var/www/arvados-api/current/
+/usr/local/rvm/bin/rvm-exec default bundle install
+/usr/local/rvm/bin/rvm-exec default bundle list >$ARV_PACKAGES_DIR/arados-api-server.gems
diff --git a/jenkins/test-package-arvados-workbench.sh b/jenkins/test-package-arvados-workbench.sh
new file mode 100755
index 0000000..270fc3a
--- /dev/null
+++ b/jenkins/test-package-arvados-workbench.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+cd /var/www/arvados-workbench/current/
+/usr/local/rvm/bin/rvm-exec default bundle install
+/usr/local/rvm/bin/rvm-exec default bundle list >$ARV_PACKAGES_DIR/arvados-workbench.gems
diff --git a/jenkins/test-packages-centos6.sh b/jenkins/test-packages-centos6.sh
index 9241291..29ad987 100755
--- a/jenkins/test-packages-centos6.sh
+++ b/jenkins/test-packages-centos6.sh
@@ -5,14 +5,16 @@ set -eu
 yum -q clean all
 touch /var/lib/rpm/*
 
-rpm -qa | sort > /arvados/packages/centos6/$1.before
+export ARV_PACKAGES_DIR=/arvados/packages/centos6
+
+rpm -qa | sort > $ARV_PACKAGES_DIR/$1.before
 
 yum install --assumeyes $1
 
-rpm -qa | sort > /arvados/packages/centos6/$1.after
+rpm -qa | sort > $ARV_PACKAGES_DIR/$1.after
 
 set +e
-diff /arvados/packages/centos6/$1.before /arvados/packages/centos6/$1.after > /arvados/packages/centos6/$1.diff
+diff $ARV_PACKAGES_DIR/$1.before $ARV_PACKAGES_DIR/$1.after > $ARV_PACKAGES_DIR/$1.diff
 set -e
 
 SCL=""
@@ -23,7 +25,7 @@ fi
 mkdir -p /tmp/opts
 cd /tmp/opts
 
-rpm2cpio /arvados/packages/centos6/$1-*.rpm | cpio -idm 2>/dev/null
+rpm2cpio $ARV_PACKAGES_DIR/$1-*.rpm | cpio -idm 2>/dev/null
 
 shared=$(find -name '*.so')
 if test -n "$shared" ; then

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


hooks/post-receive
--