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 9fcf3c62bcfacb8f0836f3bda407ac070cc5b11f..3277e608eba0dd5dd30f0abdf3e0a544262d7116 100644 (file)
--- 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@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 2908515a4778febedb0a3c4a5f0d07725dd9bfde..80573bf99cf335aac4a589bc9bf0e2bdc0f93e44 100644 (file)
--- 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@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 1bd06b311cb65d3262aa088fc287c9971049353b..2d8ebe95c8e93ce9ace945eb5467d0672cd19b02 100644 (file)
--- 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@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 654d55199b8eb95c743e440c3418695551d40029..5cd5e74836ce616212d7dacc3f6fc5569b349e60 100755 (executable)
--- 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