X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5a09ff5d42b0f8b71ca6775813e0844067363e12..86f72edb9b3bc75af47475bf83da07ce3ce86231:/build/run-library.sh diff --git a/build/run-library.sh b/build/run-library.sh index 16cb0bc1ef..01a6a06c14 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -161,7 +161,7 @@ package_go_binary() { fi switches+=("$WORKSPACE/${license_file}=/usr/share/doc/$prog/${license_file}") - fpm_build "$GOPATH/bin/${basename}=/usr/bin/${prog}" "${prog}" 'Curoverse, Inc.' dir "${version}" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=${description}" "${switches[@]}" + fpm_build "$GOPATH/bin/${basename}=/usr/bin/${prog}" "${prog}" dir "${version}" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=${description}" "${switches[@]}" } default_iteration() { @@ -232,11 +232,6 @@ test_package_presence() { rpm_architecture="x86_64" deb_architecture="amd64" - if [[ "$pkgtype" =~ ^(python|python3)$ ]]; then - rpm_architecture="noarch" - deb_architecture="all" - fi - if [[ "$pkgtype" =~ ^(src)$ ]]; then rpm_architecture="noarch" deb_architecture="all" @@ -266,37 +261,44 @@ test_package_presence() { # Get the list of packages from the repos if [[ "$FORMAT" == "deb" ]]; then - debian_distros="jessie precise stretch trusty wheezy xenial bionic" - - for D in ${debian_distros}; do - if [ ${pkgname:0:3} = "lib" ]; then - repo_subdir=${pkgname:0:4} - else - repo_subdir=${pkgname:0:1} - fi + declare -A dd + dd[debian8]=jessie + dd[debian9]=stretch + dd[debian10]=buster + dd[ubuntu1404]=trusty + dd[ubuntu1604]=xenial + dd[ubuntu1804]=bionic + D=${dd[$TARGET]} + if [ ${pkgname:0:3} = "lib" ]; then + repo_subdir=${pkgname:0:4} + else + repo_subdir=${pkgname:0:1} + fi - repo_pkg_list=$(curl -s -o - http://apt.arvados.org/pool/${D}/main/${repo_subdir}/) - echo ${repo_pkg_list} |grep -q ${complete_pkgname} - if [ $? -eq 0 ] ; then - echo "Package $complete_pkgname exists, not rebuilding!" - curl -o ./${complete_pkgname} http://apt.arvados.org/pool/${D}/main/${repo_subdir}/${complete_pkgname} - return 1 - elif test -f "$WORKSPACE/packages/$TARGET/processed/${complete_pkgname}" ; then - echo "Package $complete_pkgname exists, not rebuilding!" - return 1 - else - echo "Package $complete_pkgname not found, building" - return 0 - fi - done + repo_pkg_list=$(curl -s -o - http://apt.arvados.org/pool/${D}/main/${repo_subdir}/) + echo ${repo_pkg_list} |grep -q ${complete_pkgname} + if [ $? -eq 0 ] ; then + echo "Package $complete_pkgname exists, not rebuilding!" + curl -s -o ./${complete_pkgname} http://apt.arvados.org/pool/${D}/main/${repo_subdir}/${complete_pkgname} + return 1 + elif test -f "$WORKSPACE/packages/$TARGET/processed/${complete_pkgname}" ; then + echo "Package $complete_pkgname exists, not rebuilding!" + return 1 + else + echo "Package $complete_pkgname not found, building" + return 0 + fi else centos_repo="http://rpm.arvados.org/CentOS/7/dev/x86_64/" - repo_pkg_list=$(curl -o - ${centos_repo}) + repo_pkg_list=$(curl -s -o - ${centos_repo}) echo ${repo_pkg_list} |grep -q ${complete_pkgname} if [ $? -eq 0 ]; then echo "Package $complete_pkgname exists, not rebuilding!" - curl -o ./${complete_pkgname} ${centos_repo}${complete_pkgname} + curl -s -o ./${complete_pkgname} ${centos_repo}${complete_pkgname} + return 1 + elif test -f "$WORKSPACE/packages/$TARGET/processed/${complete_pkgname}" ; then + echo "Package $complete_pkgname exists, not rebuilding!" return 1 else echo "Package $complete_pkgname not found, building" @@ -332,7 +334,7 @@ handle_rails_package() { return 1 fi local railsdir="/var/www/${pkgname%-server}/current" - local -a pos_args=("$srcdir/=$railsdir" "$pkgname" "Curoverse, Inc." dir "$version") + local -a pos_args=("$srcdir/=$railsdir" "$pkgname" dir "$version") local license_arg="$license_path=$railsdir/$(basename "$license_path")" local -a switches=(--after-install "$scripts_dir/postinst" --before-remove "$scripts_dir/prerm" @@ -350,6 +352,15 @@ handle_rails_package() { if [[ "$pkgname" != "arvados-workbench" ]]; then exclude_list+=('config/database.yml') fi + # for arvados-api-server, we need to dereference the + # config/config.default.yml file. There is no fpm way to do that, sadly + # (excluding the existing symlink and then adding the file from its source + # path doesn't work, sadly. + if [[ "$pkgname" == "arvados-api-server" ]]; then + mv /arvados/services/api/config/config.default.yml /arvados/services/api/config/config.default.yml.bu + cp -p /arvados/lib/config/config.default.yml /arvados/services/api/config/ + exclude_list+=('config/config.default.yml.bu') + fi for exclude in ${exclude_list[@]}; do switches+=(-x "$exclude_root/$exclude") done @@ -357,6 +368,11 @@ handle_rails_package() { -x "$exclude_root/vendor/cache-*" \ -x "$exclude_root/vendor/bundle" "$@" "$license_arg" rm -rf "$scripts_dir" + # Undo the deferencing we did above + if [[ "$pkgname" == "arvados-api-server" ]]; then + rm -f /arvados/services/api/config/config.default.yml + mv /arvados/services/api/config/config.default.yml.bu /arvados/services/api/config/config.default.yml + fi } # Build python packages with a virtualenv built-in @@ -383,16 +399,23 @@ fpm_build_virtualenv () { local python="" case "$PACKAGE_TYPE" in + python3) + python=python3 + if [[ "$FORMAT" != "rpm" ]]; then + pip=pip3 + else + # In CentOS, we use a different mechanism to get the right version of pip + pip=pip + fi + PACKAGE_PREFIX=$PYTHON3_PKG_PREFIX + ;; python) # All Arvados Python2 packages depend on Python 2.7. # Make sure we build with that for consistency. python=python2.7 + pip=pip PACKAGE_PREFIX=$PYTHON2_PKG_PREFIX ;; - python3) - PACKAGE_PREFIX=$PYTHON3_PKG_PREFIX - python=python3 - ;; esac if [[ "$PKG" != "libpam-arvados" ]] && @@ -408,51 +431,37 @@ fpm_build_virtualenv () { return 0 fi - echo "Building $FORMAT package for $PKG from $PKG_DIR" cd $WORKSPACE/$PKG_DIR - # Create an sdist - echo "Creating sdist..." - rm -rf dist/* - $python setup.py $DASHQ_UNLESS_DEBUG sdist - if [[ "$?" != "0" ]]; then - echo "Error, unable to run python setup.py sdist for $PKG" + # Get the latest setuptools + if ! $pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U setuptools; then + echo "Error, unable to upgrade setuptools with" + echo " $pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U setuptools" + exit 1 + fi + # filter a useless warning (when building the cwltest package) from the stderr output + if ! $python setup.py $DASHQ_UNLESS_DEBUG sdist 2> >(grep -v 'warning: no previously-included files matching'); then + echo "Error, unable to run $python setup.py sdist for $PKG" exit 1 fi - # Determine the package version from the generated sdist archive PACKAGE_PATH=`(cd dist; ls *tar.gz)` - PYTHON_VERSION=${PACKAGE_PATH#$PKG-} - - # For historical reasons, arvados-fuse is called arvados_fuse in python land - # Same with crunchstat-summary. - # We should fix this, but for now let's just make this script dtrt. - PKG_ALTERNATE=${PKG//-/_} - PYTHON_VERSION=${PYTHON_VERSION#$PKG_ALTERNATE-} - # An even more complicated exception - if [[ "$PKG" == "libpam-arvados" ]]; then - PYTHON_VERSION=${PYTHON_VERSION#arvados-pam-} - fi - - if [[ "$PACKAGE_PATH" == "$PYTHON_VERSION" ]]; then - echo "Error, unable to determine python package version for $PKG from $PACKAGE_PATH" - exit 1 - fi - PYTHON_VERSION=${PYTHON_VERSION%.tar.gz} + # Determine the package version from the generated sdist archive + PYTHON_VERSION=${ARVADOS_BUILDING_VERSION:-$(awk '($1 == "Version:"){print $2}' *.egg-info/PKG-INFO)} # See if we actually need to build this package; does it exist already? # We can't do this earlier than here, because we need PYTHON_VERSION... # This isn't so bad; the sdist call above is pretty quick compared to # the invocation of virtualenv and fpm, below. - test_package_presence "$PYTHON_PKG" $PYTHON_VERSION $PACKAGE_TYPE $ARVADOS_BUILDING_ITERATION amd64 - if [[ "$?" != "0" ]]; then - echo "exists" + if ! test_package_presence "$PYTHON_PKG" $PYTHON_VERSION $PACKAGE_TYPE $ARVADOS_BUILDING_ITERATION; then return 0 fi + echo "Building $FORMAT package for $PKG from $PKG_DIR" + # Package the sdist in a virtualenv echo "Creating virtualenv..." @@ -460,31 +469,47 @@ fpm_build_virtualenv () { rm -rf build rm -f $PYTHON_PKG*deb - + echo "virtualenv version: `virtualenv --version`" virtualenv_command="virtualenv --python `which $python` $DASHQ_UNLESS_DEBUG build/usr/share/$python/dist/$PYTHON_PKG" - $virtualenv_command - - if [[ "$?" != "0" ]]; then + if ! $virtualenv_command; then echo "Error, unable to run" echo " $virtualenv_command" exit 1 fi - build/usr/share/$python/dist/$PYTHON_PKG/bin/pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U pip - build/usr/share/$python/dist/$PYTHON_PKG/bin/pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U wheel + if ! build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U pip; then + echo "Error, unable to upgrade pip with" + echo " build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U pip" + exit 1 + fi + echo "pip version: `build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip --version`" + + if ! build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U setuptools; then + echo "Error, unable to upgrade setuptools with" + echo " build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U setuptools" + exit 1 + fi + echo "setuptools version: `build/usr/share/$python/dist/$PYTHON_PKG/bin/$python -c 'import setuptools; print(setuptools.__version__)'`" + + if ! build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U wheel; then + echo "Error, unable to upgrade wheel with" + echo " build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U wheel" + exit 1 + fi + echo "wheel version: `build/usr/share/$python/dist/$PYTHON_PKG/bin/wheel version`" if [[ "$TARGET" != "centos7" ]] || [[ "$PYTHON_PKG" != "python-arvados-fuse" ]]; then - build/usr/share/$python/dist/$PYTHON_PKG/bin/pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG $PACKAGE_PATH + build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG $PACKAGE_PATH else # centos7 needs these special tweaks to install python-arvados-fuse - build/usr/share/$python/dist/$PYTHON_PKG/bin/pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG docutils - PYCURL_SSL_LIBRARY=nss build/usr/share/$python/dist/$PYTHON_PKG/bin/pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG $PACKAGE_PATH + build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG docutils + PYCURL_SSL_LIBRARY=nss build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG $PACKAGE_PATH fi if [[ "$?" != "0" ]]; then echo "Error, unable to run" - echo " build/usr/share/$python/dist/$PYTHON_PKG/bin/pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG $PACKAGE_PATH" + echo " build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG $PACKAGE_PATH" exit 1 fi @@ -495,16 +520,14 @@ fpm_build_virtualenv () { # virtualenv_tools.py script that doesn't work in python3 without serious # patching, minus the parts we don't need (modifying pyc files, etc). for binfile in `ls bin/`; do - file --mime bin/$binfile |grep -q binary - if [[ "$?" != "0" ]]; then + if ! file --mime bin/$binfile |grep -q binary; then # Not a binary file if [[ "$binfile" =~ ^activate(.csh|.fish|)$ ]]; then # these 'activate' scripts need special treatment sed -i "s/VIRTUAL_ENV=\".*\"/VIRTUAL_ENV=\"\/usr\/share\/$python\/dist\/$PYTHON_PKG\"/" bin/$binfile sed -i "s/VIRTUAL_ENV \".*\"/VIRTUAL_ENV \"\/usr\/share\/$python\/dist\/$PYTHON_PKG\"/" bin/$binfile else - grep -q -E '^#!.*/bin/python\d?' bin/$binfile - if [[ "$?" == "0" ]]; then + if grep -q -E '^#!.*/bin/python\d?' bin/$binfile; then # Replace shebang line sed -i "1 s/^.*$/#!\/usr\/share\/$python\/dist\/$PYTHON_PKG\/bin\/python/" bin/$binfile fi @@ -514,8 +537,8 @@ fpm_build_virtualenv () { cd - >$STDOUT_IF_DEBUG - find build -iname *.pyc -exec rm {} \; - find build -iname *.pyo -exec rm {} \; + find build -iname '*.pyc' -exec rm {} \; + find build -iname '*.pyo' -exec rm {} \; # Finally, generate the package echo "Creating package..." @@ -559,17 +582,20 @@ fpm_build_virtualenv () { fi fi - if [[ "${DEBUG:-0}" != "0" ]]; then + if [[ "$DEBUG" != "0" ]]; then COMMAND_ARR+=('--verbose' '--log' 'info') fi COMMAND_ARR+=('-v' "$PYTHON_VERSION") COMMAND_ARR+=('--iteration' "$ARVADOS_BUILDING_ITERATION") COMMAND_ARR+=('-n' "$PYTHON_PKG") - COMMAND_ARR+=('--before-remove' "$WORKSPACE/build/python-package-scripts/before-remove-$PKG.tmp.sh") - COMMAND_ARR+=('--after-install' "$WORKSPACE/build/python-package-scripts/after-install-$PKG.tmp.sh") COMMAND_ARR+=('-C' "build") + if [[ -e "$WORKSPACE/$PKG_DIR/$PKG.service" ]]; then + COMMAND_ARR+=('--after-install' "${WORKSPACE}/build/go-python-package-scripts/postinst") + COMMAND_ARR+=('--before-remove' "${WORKSPACE}/build/go-python-package-scripts/prerm") + fi + if [[ "$python" == "python2.7" ]]; then COMMAND_ARR+=('--depends' "$PYTHON2_PACKAGE") else @@ -588,46 +614,49 @@ fpm_build_virtualenv () { fpminfo="$WORKSPACE/$PKG_DIR/fpm-info.sh" if [[ -e "$fpminfo" ]]; then echo "Loading fpm overrides from $fpminfo" - source "$fpminfo" - if [[ "$?" != "0" ]]; then + if ! source "$fpminfo"; then echo "Error, unable to source $WORKSPACE/$PKG_DIR/fpm-info.sh for $PKG" exit 1 fi fi + for i in "${fpm_depends[@]}"; do + COMMAND_ARR+=('--depends' "$i") + done + + COMMAND_ARR+=("${fpm_args[@]}") + + # Make sure to install all our package binaries in /usr/bin. + # We have to walk $WORKSPACE/$PKG_DIR/bin rather than + # $WORKSPACE/build/usr/share/$python/dist/$PYTHON_PKG/bin/ to get the list + # because the latter also includes all the python binaries for the virtualenv. + # We have to take the copies of our binaries from the latter directory, though, + # because those are the ones we rewrote the shebang line of, above. if [[ -e "$WORKSPACE/$PKG_DIR/bin" ]]; then - FPM_BINARIES="" for binary in `ls $WORKSPACE/$PKG_DIR/bin`; do - FPM_BINARIES+="'$binary' " + COMMAND_ARR+=("usr/share/$python/dist/$PYTHON_PKG/bin/$binary=/usr/bin/") done fi - # create a custom version of the package scripts, with fpm_binaries populated - cp -f $WORKSPACE/build/python-package-scripts/before-remove.sh $WORKSPACE/build/python-package-scripts/before-remove-$PKG.tmp.sh - cp -f $WORKSPACE/build/python-package-scripts/after-install.sh $WORKSPACE/build/python-package-scripts/after-install-$PKG.tmp.sh - sed -i s/%FPM_BINARIES/"$FPM_BINARIES"/g $WORKSPACE/build/python-package-scripts/before-remove-$PKG.tmp.sh - sed -i s/%FPM_BINARIES/"$FPM_BINARIES"/g $WORKSPACE/build/python-package-scripts/after-install-$PKG.tmp.sh - - # Make sure the package scripts know the correct path where its files are installed - sed -i s/%PYTHON/$python/g $WORKSPACE/build/python-package-scripts/before-remove-$PKG.tmp.sh - sed -i s/%PYTHON/$python/g $WORKSPACE/build/python-package-scripts/after-install-$PKG.tmp.sh - - for i in "${fpm_depends[@]}"; do - COMMAND_ARR+=('--depends' "$i") - done + # the libpam module should place this file in the historically correct place + # so as not to break backwards compatibility + if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/python2.7/dist/libpam-arvados/lib/security/libpam_arvados.py" ]]; then + COMMAND_ARR+=("usr/share/$python/dist/$PYTHON_PKG/data/lib/security/libpam_arvados.py=/usr/data/lib/security/") + fi - COMMAND_ARR+=("${fpm_args[@]}") + # the python-arvados-cwl-runner package comes with cwltool, expose that version + if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/python2.7/dist/python-arvados-cwl-runner/bin/cwltool" ]]; then + COMMAND_ARR+=("usr/share/python2.7/dist/python-arvados-cwl-runner/bin/cwltool=/usr/bin/") + fi COMMAND_ARR+=(".") FPM_RESULTS=$("${COMMAND_ARR[@]}") FPM_EXIT_CODE=$? - fpm_verify $FPM_EXIT_CODE $FPM_RESULTS - # if something went wrong and debug is off, print out the fpm command that errored - if [[ 0 -ne $? ]] && [[ "$STDOUT_IF_DEBUG" == "/dev/null" ]]; then - echo "fpm returned an error execurin the command:" + if ! fpm_verify $FPM_EXIT_CODE $FPM_RESULTS && [[ "$STDOUT_IF_DEBUG" == "/dev/null" ]]; then + echo "fpm returned an error executing the command:" echo echo -e "\n${COMMAND_ARR[@]}\n" else @@ -635,10 +664,6 @@ fpm_build_virtualenv () { mv $WORKSPACE/$PKG_DIR/dist/*$FORMAT $WORKSPACE/packages/$TARGET/ fi echo - - # clean up - rm -f $WORKSPACE/build/python-package-scripts/before-remove-$PKG.tmp.sh - rm -f $WORKSPACE/build/python-package-scripts/after-install-$PKG.tmp.sh } # Build packages for everything @@ -651,12 +676,8 @@ fpm_build () { # The name of the package to build. PACKAGE_NAME=$1 shift - # Optional: the vendor of the package. Should be "Curoverse, Inc." for - # packages of our own software. Passed to fpm --vendor. - VENDOR=$1 - shift - # The type of source package. Passed to fpm -s. Default "python". - PACKAGE_TYPE=${1:-python} + # The type of source package. Passed to fpm -s. Default "dir". + PACKAGE_TYPE=${1:-dir} shift # Optional: the package version number. Passed to fpm -v. VERSION=$1 @@ -667,41 +688,8 @@ fpm_build () { fi local default_iteration_value="$(default_iteration "$PACKAGE" "$VERSION" "$PACKAGE_TYPE")" - local python="" - case "$PACKAGE_TYPE" in - python) - # All Arvados Python2 packages depend on Python 2.7. - # Make sure we build with that for consistency. - python=python2.7 - set -- "$@" --python-bin python2.7 \ - "${PYTHON_FPM_INSTALLER[@]}" \ - --python-package-name-prefix "$PYTHON2_PKG_PREFIX" \ - --prefix "$PYTHON2_PREFIX" \ - --python-install-lib "$PYTHON2_INSTALL_LIB" \ - --python-install-data . \ - --exclude "${PYTHON2_INSTALL_LIB#/}/tests" \ - --depends "$PYTHON2_PACKAGE" - ;; - python3) - # fpm does not actually support a python3 package type. Instead - # we recognize it as a convenience shortcut to add several - # necessary arguments to fpm's command line later, after we're - # done handling positional arguments. - PACKAGE_TYPE=python - python=python3 - set -- "$@" --python-bin python3 \ - "${PYTHON3_FPM_INSTALLER[@]}" \ - --python-package-name-prefix "$PYTHON3_PKG_PREFIX" \ - --prefix "$PYTHON3_PREFIX" \ - --python-install-lib "$PYTHON3_INSTALL_LIB" \ - --python-install-data . \ - --exclude "${PYTHON3_INSTALL_LIB#/}/tests" \ - --depends "$PYTHON3_PACKAGE" - ;; - esac - - declare -a COMMAND_ARR=("fpm" "--maintainer=Ward Vandewege " "-s" "$PACKAGE_TYPE" "-t" "$FORMAT") + declare -a COMMAND_ARR=("fpm" "-s" "$PACKAGE_TYPE" "-t" "$FORMAT") if [ python = "$PACKAGE_TYPE" ] && [ deb = "$FORMAT" ]; then # Dependencies are built from setup.py. Since setup.py will never # refer to Debian package iterations, it doesn't make sense to @@ -712,7 +700,7 @@ fpm_build () { # 12271 - As FPM-generated packages don't include scripts by default, the # packages cleanup on upgrade depends on files being listed on the %files # section in the generated SPEC files. To remove DIRECTORIES, they need to - # be listed in that sectiontoo, so we need to add this parameter to properly + # be listed in that section too, so we need to add this parameter to properly # remove lingering dirs. But this only works for python2: if used on # python33, it includes dirs like /opt/rh/python33 that belong to # other packages. @@ -720,7 +708,7 @@ fpm_build () { COMMAND_ARR+=('--rpm-auto-add-directories') fi - if [[ "${DEBUG:-0}" != "0" ]]; then + if [[ "$DEBUG" != "0" ]]; then COMMAND_ARR+=('--verbose' '--log' 'info') fi @@ -728,6 +716,10 @@ fpm_build () { COMMAND_ARR+=('-n' "$PACKAGE_NAME") fi + if [[ "$MAINTAINER" != "" ]]; then + COMMAND_ARR+=('--maintainer' "$MAINTAINER") + fi + if [[ "$VENDOR" != "" ]]; then COMMAND_ARR+=('--vendor' "$VENDOR") fi @@ -741,14 +733,6 @@ fpm_build () { COMMAND_ARR+=(--iteration "$default_iteration_value") fi - if [[ python = "$PACKAGE_TYPE" ]] && [[ -e "${PACKAGE}/${PACKAGE_NAME}.service" ]] - then - COMMAND_ARR+=( - --after-install "${WORKSPACE}/build/go-python-package-scripts/postinst" - --before-remove "${WORKSPACE}/build/go-python-package-scripts/prerm" - ) - fi - # 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. @@ -758,12 +742,7 @@ fpm_build () { declare -a fpm_exclude=() declare -a fpm_dirs=( # source dir part of 'dir' package ("/source=/dest" => "/source"): - "${PACKAGE%%=/*}" - # backports ("llfuse>=1.0" => "backports/python-llfuse") - "${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE%%[<=>]*}") - if [[ -n "$PACKAGE_NAME" ]]; then - fpm_dirs+=("${WORKSPACE}/backports/${PACKAGE_NAME}") - fi + "${PACKAGE%%=/*}") for pkgdir in "${fpm_dirs[@]}"; do fpminfo="$pkgdir/fpm-info.sh" if [[ -e "$fpminfo" ]]; then @@ -861,14 +840,13 @@ install_package() { fi } -title () { - txt="********** $1 **********" - printf "\n%*s%s\n\n" $((($COLUMNS-${#txt})/2)) "" "$txt" +title() { + printf '%s %s\n' "=======" "$1" } checkexit() { if [[ "$1" != "0" ]]; then - title "!!!!!! $2 FAILED !!!!!!" + title "$2 -- FAILED" failures+=("$2 (`timer`)") else successes+=("$2 (`timer`)") @@ -891,7 +869,9 @@ report_outcomes() { if [[ ${#failures[@]} == 0 ]] then - echo "All test suites passed." + if [[ ${#successes[@]} != 0 ]]; then + echo "All test suites passed." + fi else echo "Failures (${#failures[@]}):" for x in "${failures[@]}"