[ARVADOS-DEV] updated: a956a49875fc484c2c237aec228a92f8ce5b0f06

[git at public.curoverse.com]

Summary of changes:
 jenkins/package-test-dockerfiles/debian7/Dockerfile    | 6 +++---
 jenkins/package-test-dockerfiles/ubuntu1204/Dockerfile | 7 +++----
 jenkins/package-test-dockerfiles/ubuntu1404/Dockerfile | 7 +++----
 jenkins/run-build-packages-all-targets.sh              | 8 ++++++--
 4 files changed, 15 insertions(+), 13 deletions(-)

       via  a956a49875fc484c2c237aec228a92f8ce5b0f06 (commit)
      from  f84fd5c8f2292a41bbb4cd762dbedab09adbf784 (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 a956a49875fc484c2c237aec228a92f8ce5b0f06
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jan 14 16:40:59 2016 -0500

    8008: SSO package tests pass for all targets.

diff --git a/jenkins/package-test-dockerfiles/debian7/Dockerfile b/jenkins/package-test-dockerfiles/debian7/Dockerfile
index 9fcf3c6..3277e60 100644
--- a/jenkins/package-test-dockerfiles/debian7/Dockerfile
+++ b/jenkins/package-test-dockerfiles/debian7/Dockerfile
@@ -2,10 +2,10 @@ FROM debian:7
 MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
 
 # Install RVM
-RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
+RUN apt-get update && apt-get -y install curl procps && \
+    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 fpm
+    /usr/local/rvm/bin/rvm alias create default ruby-2.1
 
 RUN echo "deb file:///arvados/packages/debian7/ /" >>/etc/apt/sources.list
diff --git a/jenkins/package-test-dockerfiles/ubuntu1204/Dockerfile b/jenkins/package-test-dockerfiles/ubuntu1204/Dockerfile
index 2908515..80573bf 100644
--- a/jenkins/package-test-dockerfiles/ubuntu1204/Dockerfile
+++ b/jenkins/package-test-dockerfiles/ubuntu1204/Dockerfile
@@ -1,12 +1,11 @@
 FROM ubuntu:precise
 MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
 
-
 # Install RVM
-RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
+RUN apt-get update && apt-get -y install curl && \
+    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 fpm
+    /usr/local/rvm/bin/rvm alias create default ruby-2.1
 
 RUN echo "deb file:///arvados/packages/ubuntu1204/ /" >>/etc/apt/sources.list
\ No newline at end of file
diff --git a/jenkins/package-test-dockerfiles/ubuntu1404/Dockerfile b/jenkins/package-test-dockerfiles/ubuntu1404/Dockerfile
index 1bd06b3..2d8ebe9 100644
--- a/jenkins/package-test-dockerfiles/ubuntu1404/Dockerfile
+++ b/jenkins/package-test-dockerfiles/ubuntu1404/Dockerfile
@@ -1,12 +1,11 @@
 FROM ubuntu:trusty
 MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
 
-
 # Install RVM
-RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
+RUN apt-get update && apt-get -y install curl && \
+    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 fpm
+    /usr/local/rvm/bin/rvm alias create default ruby-2.1
 
 RUN echo "deb file:///arvados/packages/ubuntu1404/ /" >>/etc/apt/sources.list
\ No newline at end of file
diff --git a/jenkins/run-build-packages-all-targets.sh b/jenkins/run-build-packages-all-targets.sh
index 654d551..5cd5e74 100755
--- a/jenkins/run-build-packages-all-targets.sh
+++ b/jenkins/run-build-packages-all-targets.sh
@@ -38,7 +38,7 @@ fi
 set -e
 
 PARSEDOPTS=$(getopt --name "$0" --longoptions \
-    help,test-packages,debug,command: \
+    help,test-packages,debug,command:,only-test: \
     -- "" "$@")
 if [ $? -ne 0 ]; then
     exit 1
@@ -47,6 +47,7 @@ fi
 COMMAND=
 DEBUG=
 TEST_PACKAGES=
+ONLY_TEST=
 
 eval set -- "$PARSEDOPTS"
 while [ $# -gt 0 ]; do
@@ -65,6 +66,9 @@ while [ $# -gt 0 ]; do
         --test-packages)
             TEST_PACKAGES="--test-packages"
             ;;
+        --only-test)
+            ONLY_TEST="$1 $2"; shift
+            ;;
         --)
             if [ $# -gt 1 ]; then
                 echo >&2 "$0: unrecognized argument '$2'. Try: $0 --help"
@@ -78,5 +82,5 @@ done
 cd $(dirname $0)
 
 for dockerfile_path in $(find -name Dockerfile); do
-    ./run-build-packages-one-target.sh --target "$(basename $(dirname "$dockerfile_path"))" --command "$COMMAND" $DEBUG $TEST_PACKAGES
+    ./run-build-packages-one-target.sh --target "$(basename $(dirname "$dockerfile_path"))" --command "$COMMAND" $DEBUG $TEST_PACKAGES $ONLY_TEST
 done

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


hooks/post-receive
--