projects
/
arvados-dev.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix selecting most recent package for package testing, refs #8008.
[arvados-dev.git]
/
jenkins
/
package-testing
/
test-packages-centos6.sh
diff --git
a/jenkins/package-testing/test-packages-centos6.sh
b/jenkins/package-testing/test-packages-centos6.sh
index ad8056487f17e0d89a7937b867b788a7463f978e..4e05364f01519973894f2a8b6329723b481da8ad 100755
(executable)
--- a/
jenkins/package-testing/test-packages-centos6.sh
+++ b/
jenkins/package-testing/test-packages-centos6.sh
@@
-7,14
+7,14
@@
touch /var/lib/rpm/*
export ARV_PACKAGES_DIR=/arvados/packages/centos6
export ARV_PACKAGES_DIR=/arvados/packages/centos6
-rpm -qa | sort >
$ARV_PACKAGES_DIR/$1.before
+rpm -qa | sort >
"$ARV_PACKAGES_DIR/$1.before"
yum install --assumeyes $1
yum install --assumeyes $1
-rpm -qa | sort >
$ARV_PACKAGES_DIR/$1.after
+rpm -qa | sort >
"$ARV_PACKAGES_DIR/$1.after"
set +e
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
SCL=""
set -e
SCL=""
@@
-25,7
+25,7
@@
fi
mkdir -p /tmp/opts
cd /tmp/opts
mkdir -p /tmp/opts
cd /tmp/opts
-rpm2cpio $
ARV_PACKAGES_DIR/$1-*.rpm
| cpio -idm 2>/dev/null
+rpm2cpio $
(ls -t "$ARV_PACKAGES_DIR/$1"-*.rpm | head -n1)
| cpio -idm 2>/dev/null
shared=$(find -name '*.so')
if test -n "$shared" ; then
shared=$(find -name '*.so')
if test -n "$shared" ; then
@@
-38,7
+38,7
@@
if test -n "$shared" ; then
fi
if test -n "$SCL" ; then
fi
if test -n "$SCL" ; then
- exec $SCL "/jenkins/package-testing/common-test-packages.sh
$1
"
+ exec $SCL "/jenkins/package-testing/common-test-packages.sh
'$1'
"
else
else
- exec /jenkins/package-testing/common-test-packages.sh
$1
+ exec /jenkins/package-testing/common-test-packages.sh
"$1"
fi
fi