projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
9587: test /trash page
[arvados.git]
/
build
/
run-build-packages.sh
diff --git
a/build/run-build-packages.sh
b/build/run-build-packages.sh
index 245be759800033067f40b9d421ec591624af9041..777cd3c844536fc43bc90e70a611c3e57ccd8feb 100755
(executable)
--- a/
build/run-build-packages.sh
+++ b/
build/run-build-packages.sh
@@
-32,8
+32,6
@@
DEBUG=${ARVADOS_DEBUG:-0}
TARGET=debian8
COMMAND=
TARGET=debian8
COMMAND=
-RAILS_PACKAGE_ITERATION=7
-
PARSEDOPTS=$(getopt --name "$0" --longoptions \
help,build-bundle-packages,debug,target:,only-build: \
-- "" "$@")
PARSEDOPTS=$(getopt --name "$0" --longoptions \
help,build-bundle-packages,debug,target:,only-build: \
-- "" "$@")
@@
-112,6
+110,9
@@
case "$TARGET" in
ubuntu1404)
FORMAT=deb
;;
ubuntu1404)
FORMAT=deb
;;
+ ubuntu1604)
+ FORMAT=deb
+ ;;
centos7)
FORMAT=rpm
PYTHON2_PACKAGE=$(rpm -qf "$(which python$PYTHON2_VERSION)" --queryformat '%{NAME}\n')
centos7)
FORMAT=rpm
PYTHON2_PACKAGE=$(rpm -qf "$(which python$PYTHON2_VERSION)" --queryformat '%{NAME}\n')
@@
-257,7
+258,7
@@
handle_python_package
arvados_src_version="$(version_from_git)"
cd $WORKSPACE/packages/$TARGET
arvados_src_version="$(version_from_git)"
cd $WORKSPACE/packages/$TARGET
- test_package_presence arvados-src $arvados_src_version src
+ test_package_presence arvados-src $arvados_src_version src
""
if [[ "$?" == "0" ]]; then
cd "$WORKSPACE"
if [[ "$?" == "0" ]]; then
cd "$WORKSPACE"
@@
-519,6
+520,7
@@
while read -r line || [[ -n "$line" ]]; do
pkgtype=${arr[4]}
arch=${arr[5]}
extra=${arr[6]}
pkgtype=${arr[4]}
arch=${arr[5]}
extra=${arr[6]}
+ declare -a 'extra_arr=('"$extra"')'
if [[ "$FORMAT" == "rpm" ]]; then
if [[ "$arch" == "all" ]]; then
if [[ "$FORMAT" == "rpm" ]]; then
if [[ "$arch" == "all" ]]; then
@@
-557,7
+559,7
@@
while read -r line || [[ -n "$line" ]]; do
"python$PYTHON2_VERSION" setup.py $DASHQ_UNLESS_DEBUG egg_info build
chmod -R go+rX .
set +e
"python$PYTHON2_VERSION" setup.py $DASHQ_UNLESS_DEBUG egg_info build
chmod -R go+rX .
set +e
- fpm_build . "$outname" "" "$pkgtype" "$version" --iteration "$iteration"
$extra
+ fpm_build . "$outname" "" "$pkgtype" "$version" --iteration "$iteration"
"${extra_arr[@]}"
# The upload step uses the package timestamp to determine
# if it is new. --no-clobber plays nice with that.
mv --no-clobber "$outname"*.$FORMAT "$WORKSPACE/packages/$TARGET"
# The upload step uses the package timestamp to determine
# if it is new. --no-clobber plays nice with that.
mv --no-clobber "$outname"*.$FORMAT "$WORKSPACE/packages/$TARGET"
@@
-574,7
+576,7
@@
while read -r line || [[ -n "$line" ]]; do
*)
test_package_presence $outname $version $pkgtype $iteration $arch
if [[ "$?" == "0" ]]; then
*)
test_package_presence $outname $version $pkgtype $iteration $arch
if [[ "$?" == "0" ]]; then
- fpm_build "$name" "$outname" "" "$pkgtype" "$version" --iteration "$iteration"
$extra
+ fpm_build "$name" "$outname" "" "$pkgtype" "$version" --iteration "$iteration"
"${extra_arr[@]}"
fi
;;
esac
fi
;;
esac