From 846a9311a328b9cbadc8b70d34134b72b0b6b332 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Mon, 18 Jan 2016 15:33:03 -0500
Subject: [PATCH] 8080: fpm_depends comes before run-build-package commands;
fpm_args comes after run-build package commands. Improve quoting. Use sed
-i.
---
.../package-build-dockerfiles/centos6/Dockerfile | 3 +--
.../package-test-dockerfiles/centos6/Dockerfile | 3 +--
.../package-testing/deb-common-test-packages.sh | 14 ++++++++------
jenkins/run-build-packages.sh | 2 +-
jenkins/run-library.sh | 3 ++-
5 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/jenkins/package-build-dockerfiles/centos6/Dockerfile b/jenkins/package-build-dockerfiles/centos6/Dockerfile
index 51bad92..2bbec2e 100644
--- a/jenkins/package-build-dockerfiles/centos6/Dockerfile
+++ b/jenkins/package-build-dockerfiles/centos6/Dockerfile
@@ -23,8 +23,7 @@ RUN scl enable python33 "easy_install-3.3 pip" && scl enable python27 "easy_inst
RUN cd /tmp && \
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 && \
- cat /etc/yum.repos.d/rpmforge.repo | sed 's/enabled = 0/enabled = 1/' > /tmp/rpmforge.repo && \
- mv /tmp/rpmforge.repo /etc/yum.repos.d
+ sed -i 's/enabled = 0/enabled = 1/' /etc/yum.repos.d/rpmforge.repo
RUN touch /var/lib/rpm/* && yum install --assumeyes git
diff --git a/jenkins/package-test-dockerfiles/centos6/Dockerfile b/jenkins/package-test-dockerfiles/centos6/Dockerfile
index 95d8157..69927a1 100644
--- a/jenkins/package-test-dockerfiles/centos6/Dockerfile
+++ b/jenkins/package-test-dockerfiles/centos6/Dockerfile
@@ -15,7 +15,6 @@ RUN touch /var/lib/rpm/* && \
RUN cd /tmp && \
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 && \
- cat /etc/yum.repos.d/rpmforge.repo | sed 's/enabled = 0/enabled = 1/' > /tmp/rpmforge.repo && \
- mv /tmp/rpmforge.repo /etc/yum.repos.d
+ sed -i 's/enabled = 0/enabled = 1/' /etc/yum.repos.d/rpmforge.repo
COPY localrepo.repo /etc/yum.repos.d/localrepo.repo
\ No newline at end of file
diff --git a/jenkins/package-testing/deb-common-test-packages.sh b/jenkins/package-testing/deb-common-test-packages.sh
index 016ab5e..0d15436 100755
--- a/jenkins/package-testing/deb-common-test-packages.sh
+++ b/jenkins/package-testing/deb-common-test-packages.sh
@@ -8,15 +8,15 @@ target=$(echo $0 | sed 's/.*test-packages-\([^.]*\)\.sh.*/\1/')
export ARV_PACKAGES_DIR=/arvados/packages/$target
-dpkg-query --show > $ARV_PACKAGES_DIR/$1.before
+dpkg-query --show > "$ARV_PACKAGES_DIR/$1.before"
apt-get -qq update
apt-get --assume-yes --force-yes install $1
-dpkg-query --show > $ARV_PACKAGES_DIR/$1.after
+dpkg-query --show > "$ARV_PACKAGES_DIR/$1.after"
set +e
-diff $ARV_PACKAGES_DIR/$1.before $ARV_PACKAGES_DIR/$1.after > $ARV_PACKAGES_DIR/$1.diff
+diff "$ARV_PACKAGES_DIR/$1.before" "$ARV_PACKAGES_DIR/$1.after" > "$ARV_PACKAGES_DIR/$1.diff"
set -e
mkdir -p /tmp/opts
@@ -26,10 +26,12 @@ export ARV_PACKAGES_DIR=/arvados/packages/$target
dpkg-deb -x $ARV_PACKAGES_DIR/"$1"_*.deb .
-for so in $(find . -name "*.so") ; do
+while read so && [ -n "$so" ]; do
echo
echo "== Packages dependencies for $so =="
- ldd $so | awk '($3 ~ /^\//){print $3}' | sort -u | xargs dpkg -S | cut -d: -f1 | sort -u
-done
+ ldd "$so" | awk '($3 ~ /^\//){print $3}' | sort -u | xargs dpkg -S | cut -d: -f1 | sort -u
+done <<EOF
+$(find -name '*.so')
+EOF
exec /jenkins/package-testing/common-test-packages.sh $1
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index e9f75a4..30ba4cd 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -264,7 +264,7 @@ handle_python_package
# arvados-src
(
- set -ex
+ set -e
cd "$WORKSPACE"
COMMIT_HASH=$(format_last_commit_here "%H")
diff --git a/jenkins/run-library.sh b/jenkins/run-library.sh
index dce75eb..3c62d7b 100755
--- a/jenkins/run-library.sh
+++ b/jenkins/run-library.sh
@@ -250,13 +250,14 @@ fpm_build () {
for i in "${fpm_depends[@]}"; do
COMMAND_ARR+=('--depends' "$i")
done
- COMMAND_ARR+=("${fpm_args[@]}")
# Append remaining function arguments directly to fpm's command line.
for i; do
COMMAND_ARR+=("$i")
done
+ COMMAND_ARR+=("${fpm_args[@]}")
+
COMMAND_ARR+=("$PACKAGE")
debug_echo -e "\n${COMMAND_ARR[@]}\n"
--
2.30.2