Fixing our fpm rails package building to handle fpm-info.sh.

diff --git a/jenkins/package-test-dockerfiles/centos6/Dockerfile b/jenkins/package-test-dockerfiles/centos6/Dockerfile
index 0020d5f874eae126073d4a506d7b8aff3f883d2e..6870ec3da5119b661d3f90b427a82cb62c05aaf3 100644 (file)
--- a/jenkins/package-test-dockerfiles/centos6/Dockerfile
+++ b/jenkins/package-test-dockerfiles/centos6/Dockerfile
@@ -12,4 +12,8 @@ RUN touch /var/lib/rpm/* && \
     /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
     /usr/local/rvm/bin/rvm-exec default gem install bundle fpm
 
+RUN cd / root && \
+    curl -OL 'http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm' && \
+    rpm -ivh rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm
+
 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 ad4645267b663ba964d70933b35928d5b74498cd..af6e078093e0eb6963411133bab2cbf9a2ccb03d 100755 (executable)
--- a/jenkins/run-build-packages-one-target.sh
+++ b/jenkins/run-build-packages-one-target.sh
@@ -21,6 +21,8 @@ WORKSPACE=path         Path to the Arvados source tree to build packages from
 
 EOF
 
+set -e
+
 if ! [[ -n "$WORKSPACE" ]]; then
   echo >&2 "$helpmessage"
   echo >&2
@@ -131,7 +133,7 @@ if test -z "$packages" ; then
         keep-web
         libarvados-perl"
 
-    if test $target == centos6 ; then
+    if test "$target" = centos6 ; then
         packages="$packages python27-python-arvados-fuse
                   python27-python-arvados-python-client"
     else

diff --git a/jenkins/run-library.sh b/jenkins/run-library.sh
index 623e8443196b891cceb70ba6a7e87cd4e992a9eb..0579814fc9d421f59a76cb4228cacd0bd7185e70 100755 (executable)
--- a/jenkins/run-library.sh
+++ b/jenkins/run-library.sh
@@ -235,18 +235,17 @@ fpm_build () {
   # that will take precedence, as desired.
   COMMAND_ARR+=(--iteration "$(default_iteration "$PACKAGE" "$VERSION")")
 
-  # Append remaining function arguments directly to fpm's command line.
-  for i; do
-    COMMAND_ARR+=("$i")
-  done
+  # 'dir' type packages are provided in the form /path/to/source=/path/to/dest
+  # so strip off the 2nd part to check for fpm-info below.
+  PACKAGE_DIR=$(echo $PACKAGE | sed 's/\/=.*//')
 
   # Append --depends X and other arguments specified by fpm-info.sh in
   # the package source dir. These are added last so they can override
   # the arguments added by this script.
   declare -a fpm_args=()
   declare -a fpm_depends=()
-  if [[ -d "$PACKAGE" ]]; then
-      FPM_INFO="$PACKAGE/fpm-info.sh"
+  if [[ -d "$PACKAGE_DIR" ]]; then
+      FPM_INFO="$PACKAGE_DIR/fpm-info.sh"
   else
       FPM_INFO="${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE}/fpm-info.sh"
   fi
@@ -259,6 +258,11 @@ fpm_build () {
   done
   COMMAND_ARR+=("${fpm_args[@]}")
 
+  # Append remaining function arguments directly to fpm's command line.
+  for i; do
+    COMMAND_ARR+=("$i")
+  done
+
   COMMAND_ARR+=("$PACKAGE")
 
   debug_echo -e "\n${COMMAND_ARR[@]}\n"