X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/380a54a7d97b34119cbaa3bee05d6b6cd241eee5..58f3ef79e9c3b4fb45d5d516c519df16ef6b9147:/build/run-library.sh diff --git a/build/run-library.sh b/build/run-library.sh index b0068d2112..e3c0e251bf 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -40,50 +40,62 @@ EOF format_last_commit_here() { local format="$1"; shift - TZ=UTC git log -n1 --first-parent "--format=format:$format" . + local dir="${1:-.}"; shift + TZ=UTC git log -n1 --first-parent "--format=format:$format" "$dir" } version_from_git() { # Output the version being built, or if we're building a # dev/prerelease, output a version number based on the git log for - # the current working directory. + # the given $subdir. + local subdir="$1"; shift if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then echo "$ARVADOS_BUILDING_VERSION" return fi - local git_ts git_hash prefix - if [[ -n "$1" ]] ; then - prefix="$1" - else - prefix="0.1" - fi - - declare $(format_last_commit_here "git_ts=%ct git_hash=%h") - ARVADOS_BUILDING_VERSION="$(git tag -l |sort -V -r |head -n1).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)" + local git_ts git_hash + declare $(format_last_commit_here "git_ts=%ct git_hash=%h" "$subdir") + ARVADOS_BUILDING_VERSION="$($WORKSPACE/build/version-at-commit.sh $git_hash)" echo "$ARVADOS_BUILDING_VERSION" } nohash_version_from_git() { + local subdir="$1"; shift if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then echo "$ARVADOS_BUILDING_VERSION" return fi - version_from_git $1 | cut -d. -f1-4 + version_from_git $subdir | cut -d. -f1-4 } timestamp_from_git() { - format_last_commit_here "%ct" + local subdir="$1"; shift + format_last_commit_here "%ct" "$subdir" } -handle_python_package () { - # This function assumes the current working directory is the python package directory - if [ -n "$(find dist -name "*-$(nohash_version_from_git).tar.gz" -print -quit)" ]; then - # This package doesn't need rebuilding. - return - fi - # Make sure only to use sdist - that's the only format pip can deal with (sigh) - python setup.py $DASHQ_UNLESS_DEBUG sdist +calculate_python_sdk_cwl_package_versions() { + python_sdk_version=$(cd sdk/python && python3 arvados_version.py) + cwl_runner_version=$(cd sdk/cwl && python3 arvados_version.py) +} + +# Usage: get_native_arch +get_native_arch() { + # Only amd64 and aarch64 are supported at the moment + local native_arch="" + case "$HOSTTYPE" in + x86_64) + native_arch="amd64" + ;; + aarch64) + native_arch="arm64" + ;; + *) + echo "Error: architecture not supported" + exit 1 + ;; + esac + echo $native_arch } handle_ruby_gem() { @@ -103,55 +115,138 @@ handle_ruby_gem() { fi } -# Usage: package_go_binary services/foo arvados-foo "Compute foo to arbitrary precision" +calculate_go_package_version() { + # $__returnvar has the nameref attribute set, which means it is a reference + # to another variable that is passed in as the first argument to this function. + # see https://www.gnu.org/software/bash/manual/html_node/Shell-Parameters.html + local -n __returnvar="$1"; shift + local oldpwd="$PWD" + + cd "$WORKSPACE" + go mod download + + # Update the version number and build a new package if the vendor + # bundle has changed, or the command imports anything from the + # Arvados SDK and the SDK has changed. + declare -a checkdirs=(go.mod go.sum) + while [ -n "$1" ]; do + checkdirs+=("$1") + shift + done + # Even our rails packages (version calculation happens here!) depend on a go component (arvados-server) + # Everything depends on the build directory. + checkdirs+=(sdk/go lib build) + local timestamp=0 + for dir in ${checkdirs[@]}; do + cd "$WORKSPACE" + ts="$(timestamp_from_git "$dir")" + if [[ "$ts" -gt "$timestamp" ]]; then + version=$(version_from_git "$dir") + timestamp="$ts" + fi + done + cd "$oldpwd" + __returnvar="$version" +} + +# Usage: package_go_binary services/foo arvados-foo [deb|rpm] [amd64|arm64] "Compute foo to arbitrary precision" [apache-2.0.txt] package_go_binary() { + local src_path="$1"; shift + local prog="$1"; shift + local package_format="$1"; shift + local target_arch="$1"; shift + local description="$1"; shift + local license_file="${1:-agpl-3.0.txt}"; shift + + if [[ -n "$ONLY_BUILD" ]] && [[ "$prog" != "$ONLY_BUILD" ]]; then + # arvados-workbench depends on arvados-server at build time, so even when + # only arvados-workbench is being built, we need to build arvados-server too + if [[ "$prog" != "arvados-server" ]] || [[ "$ONLY_BUILD" != "arvados-workbench" ]]; then + debug_echo -e "Skipping build of $prog package." + return 0 + fi + fi + + native_arch=$(get_native_arch) + + if [[ "$native_arch" != "amd64" ]] && [[ -n "$target_arch" ]] && [[ "$native_arch" != "$target_arch" ]]; then + echo "Error: no cross compilation support for Go on $native_arch, can not build $prog for $target_arch" + return 1 + fi + + case "$package_format-$TARGET" in + # Older Debian/Ubuntu do not support cross compilation because the + # libfuse package does not support multiarch. See + # . + # Red Hat-based distributions do not support native cross compilation at + # all (they use a qemu-based solution we haven't implemented yet). + deb-debian10|deb-ubuntu1804|deb-ubuntu2004|rpm-*) + cross_compilation=0 + if [[ "$native_arch" == "amd64" ]] && [[ -n "$target_arch" ]] && [[ "$native_arch" != "$target_arch" ]]; then + echo "Error: no cross compilation support for Go on $native_arch for $TARGET, can not build $prog for $target_arch" + return 1 + fi + ;; + *) + cross_compilation=1 + ;; + esac + + if [[ -n "$target_arch" ]]; then + archs=($target_arch) + else + # No target architecture specified, default to native target. When on amd64 + # also crosscompile arm64 (when supported). + archs=($native_arch) + if [[ $cross_compilation -ne 0 ]]; then + archs+=("arm64") + fi + fi + + for ta in ${archs[@]}; do + package_go_binary_worker "$src_path" "$prog" "$package_format" "$description" "$native_arch" "$ta" "$license_file" + retval=$? + if [[ $retval -ne 0 ]]; then + return $retval + fi + done +} + +# Usage: package_go_binary services/foo arvados-foo deb "Compute foo to arbitrary precision" [amd64/arm64] [amd64/arm64] [apache-2.0.txt] +package_go_binary_worker() { local src_path="$1"; shift local prog="$1"; shift + local package_format="$1"; shift local description="$1"; shift + local native_arch="${1:-amd64}"; shift + local target_arch="${1:-amd64}"; shift local license_file="${1:-agpl-3.0.txt}"; shift - if [[ -n "$ONLY_BUILD" ]] && [[ "$prog" != "$ONLY_BUILD" ]] ; then - return 0 - fi - - debug_echo "package_go_binary $src_path as $prog" - + debug_echo "package_go_binary $src_path as $prog (native arch: $native_arch, target arch: $target_arch)" local basename="${src_path##*/}" - - mkdir -p "$GOPATH/src/git.curoverse.com" - ln -sfn "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git" - (cd "$GOPATH/src/git.curoverse.com/arvados.git" && "$GOPATH/bin/govendor" sync -v) - - cd "$GOPATH/src/git.curoverse.com/arvados.git/$src_path" - local version="$(version_from_git)" - local timestamp="$(timestamp_from_git)" - - # Update the version number and build a new package if the vendor - # bundle has changed, or the command imports anything from the - # Arvados SDK and the SDK has changed. - declare -a checkdirs=(vendor) - if grep -qr git.curoverse.com/arvados .; then - checkdirs+=(sdk/go lib) - fi - for dir in ${checkdirs[@]}; do - cd "$GOPATH/src/git.curoverse.com/arvados.git/$dir" - ts="$(timestamp_from_git)" - if [[ "$ts" -gt "$timestamp" ]]; then - version=$(version_from_git) - timestamp="$ts" - fi - done + calculate_go_package_version go_package_version $src_path cd $WORKSPACE/packages/$TARGET - test_package_presence $prog $version go - - if [[ "$?" != "0" ]]; then - return 1 + test_package_presence "$prog" "$go_package_version" "go" "" "$target_arch" + if [[ $? -ne 0 ]]; then + return 0 fi - go get -ldflags "-X main.version=${version}" "git.curoverse.com/arvados.git/$src_path" + echo "Building $package_format ($target_arch) package for $prog from $src_path" + if [[ "$native_arch" == "amd64" ]] && [[ "$target_arch" == "arm64" ]]; then + CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc GOARCH=${target_arch} go install -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path" + else + GOARCH=${arch} go install -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path" + fi local -a switches=() + + binpath=$GOPATH/bin/${basename} + if [[ "${target_arch}" != "${native_arch}" ]]; then + switches+=("-a${target_arch}") + binpath="$GOPATH/bin/linux_${target_arch}/${basename}" + fi + systemd_unit="$WORKSPACE/${src_path}/${prog}.service" if [[ -e "${systemd_unit}" ]]; then switches+=( @@ -161,7 +256,44 @@ package_go_binary() { fi switches+=("$WORKSPACE/${license_file}=/usr/share/doc/$prog/${license_file}") - 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[@]}" + fpm_build "${WORKSPACE}/${src_path}" "$binpath=/usr/bin/${prog}" "${prog}" dir "${go_package_version}" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=${description}" "${switches[@]}" +} + +# Usage: package_go_so lib/foo arvados_foo.so arvados-foo deb amd64 "Arvados foo library" +package_go_so() { + local src_path="$1"; shift + local sofile="$1"; shift + local pkg="$1"; shift + local package_format="$1"; shift + local target_arch="$1"; shift # supported: amd64, arm64 + local description="$1"; shift + + if [[ -n "$ONLY_BUILD" ]] && [[ "$pkg" != "$ONLY_BUILD" ]]; then + debug_echo -e "Skipping build of $pkg package." + return 0 + fi + + debug_echo "package_go_so $src_path as $pkg" + + calculate_go_package_version go_package_version $src_path + cd $WORKSPACE/packages/$TARGET + test_package_presence $pkg $go_package_version go || return 1 + cd $WORKSPACE/$src_path + go build -buildmode=c-shared -o ${GOPATH}/bin/${sofile} + cd $WORKSPACE/packages/$TARGET + local -a fpmargs=( + "--url=https://arvados.org" + "--license=Apache License, Version 2.0" + "--description=${description}" + "$WORKSPACE/apache-2.0.txt=/usr/share/doc/$pkg/apache-2.0.txt" + ) + if [[ -e "$WORKSPACE/$src_path/pam-configs-arvados" ]]; then + fpmargs+=("$WORKSPACE/$src_path/pam-configs-arvados=/usr/share/doc/$pkg/pam-configs-arvados-go") + fi + if [[ -e "$WORKSPACE/$src_path/README" ]]; then + fpmargs+=("$WORKSPACE/$src_path/README=/usr/share/doc/$pkg/README") + fi + fpm_build "${WORKSPACE}/${src_path}" "$GOPATH/bin/${sofile}=/usr/lib/${sofile}" "${pkg}" dir "${go_package_version}" "${fpmargs[@]}" } default_iteration() { @@ -177,10 +309,6 @@ default_iteration() { [[ ${BASH_REMATCH[1]} -le $LICENSE_PACKAGE_TS ]]; then iteration=2 fi - if [[ $package_type =~ ^python ]]; then - # Fix --iteration for #9242. - iteration=2 - fi echo $iteration } @@ -194,6 +322,20 @@ _build_rails_package_scripts() { done } +rails_package_version() { + local pkgname="$1"; shift + local srcdir="$1"; shift + if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then + echo "$ARVADOS_BUILDING_VERSION" + return + fi + local version="$(version_from_git)" + if [ $pkgname = "arvados-api-server" -o $pkgname = "arvados-workbench" ] ; then + calculate_go_package_version version cmd/arvados-server "$srcdir" + fi + echo $version +} + test_rails_package_presence() { local pkgname="$1"; shift local srcdir="$1"; shift @@ -206,68 +348,91 @@ test_rails_package_presence() { cd $srcdir - local version="$(version_from_git)" + local version="$(rails_package_version "$pkgname" "$srcdir")" cd $tmppwd test_package_presence $pkgname $version rails "$RAILS_PACKAGE_ITERATION" } +get_complete_package_name() { + # if the errexit flag is set, unset it until this function returns + # otherwise, the shift calls below will abort the program if optional arguments are not supplied + if [ -o errexit ]; then + set +e + trap 'set -e' RETURN + fi + # $__returnvar has the nameref attribute set, which means it is a reference + # to another variable that is passed in as the first argument to this function. + # see https://www.gnu.org/software/bash/manual/html_node/Shell-Parameters.html + local -n __returnvar="$1"; shift + local pkgname="$1"; shift + local version="$1"; shift + local pkgtype="$1"; shift + local iteration="$1"; shift + local arch="$1"; shift + if [[ "$iteration" == "" ]]; then + iteration="$(default_iteration "$pkgname" "$version" "$pkgtype")" + fi + + if [[ "$arch" == "" ]]; then + native_arch=$(get_native_arch) + rpm_native_arch="x86_64" + if [[ "$HOSTTYPE" == "aarch64" ]]; then + rpm_native_arch="arm64" + fi + rpm_architecture="$rpm_native_arch" + deb_architecture="$native_arch" + + if [[ "$pkgtype" =~ ^(src)$ ]]; then + rpm_architecture="noarch" + deb_architecture="all" + fi + else + rpm_architecture=$arch + deb_architecture=$arch + fi + + local complete_pkgname="${pkgname}_$version${iteration:+-$iteration}_$deb_architecture.deb" + if [[ "$FORMAT" == "rpm" ]]; then + # rpm packages get iteration 1 if we don't supply one + iteration=${iteration:-1} + complete_pkgname="$pkgname-$version-${iteration}.$rpm_architecture.rpm" + fi + __returnvar=${complete_pkgname} +} + +# Test if the package already exists, if not return 0, if it does return 1 test_package_presence() { local pkgname="$1"; shift local version="$1"; shift local pkgtype="$1"; shift local iteration="$1"; shift local arch="$1"; shift - if [[ -n "$ONLY_BUILD" ]] && [[ "$pkgname" != "$ONLY_BUILD" ]] ; then + # arvados-workbench depends on arvados-server at build time, so even when + # only arvados-workbench is being built, we need to build arvados-server too + if [[ "$pkgname" != "arvados-server" ]] || [[ "$ONLY_BUILD" != "arvados-workbench" ]]; then return 1 - fi - - if [[ "$iteration" == "" ]]; then - iteration="$(default_iteration "$pkgname" "$version" "$pkgtype")" - fi - - if [[ "$arch" == "" ]]; then - rpm_architecture="x86_64" - deb_architecture="amd64" - - if [[ "$pkgtype" =~ ^(src)$ ]]; then - rpm_architecture="noarch" - deb_architecture="all" - fi - - # These python packages have binary components - if [[ "$pkgname" =~ (ruamel|ciso|pycrypto|pyyaml) ]]; then - rpm_architecture="x86_64" - deb_architecture="amd64" fi - else - rpm_architecture=$arch - deb_architecture=$arch fi - if [[ "$FORMAT" == "deb" ]]; then - local complete_pkgname="${pkgname}_$version${iteration:+-$iteration}_$deb_architecture.deb" - else - # rpm packages get iteration 1 if we don't supply one - iteration=${iteration:-1} - local complete_pkgname="$pkgname-$version-${iteration}.$rpm_architecture.rpm" - fi + local full_pkgname + get_complete_package_name full_pkgname "$pkgname" "$version" "$pkgtype" "$iteration" "$arch" # See if we can skip building the package, only if it already exists in the # processed/ directory. If so, move it back to the packages directory to make # sure it gets picked up by the test and/or upload steps. # Get the list of packages from the repos - if [[ "$FORMAT" == "deb" ]]; then + if [[ "$FORCE_BUILD" == "1" ]]; then + echo "Package $full_pkgname build forced with --force-build, building" + elif [[ "$FORMAT" == "deb" ]]; then declare -A dd - dd[debian8]=jessie - dd[debian9]=stretch dd[debian10]=buster - dd[ubuntu1404]=trusty - dd[ubuntu1604]=xenial + dd[debian11]=bullseye dd[ubuntu1804]=bionic + dd[ubuntu2004]=focal D=${dd[$TARGET]} if [ ${pkgname:0:3} = "lib" ]; then repo_subdir=${pkgname:0:4} @@ -275,33 +440,39 @@ test_package_presence() { 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} + repo_pkg_list=$(curl -s -o - http://apt.arvados.org/${D}/pool/main/${repo_subdir}/${pkgname}/) + echo "${repo_pkg_list}" |grep -q ${full_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} + echo "Package $full_pkgname exists upstream, not rebuilding, downloading instead!" + curl -s -o "$WORKSPACE/packages/$TARGET/${full_pkgname}" http://apt.arvados.org/${D}/pool/main/${repo_subdir}/${pkgname}/${full_pkgname} return 1 - elif test -f "$WORKSPACE/packages/$TARGET/processed/${complete_pkgname}" ; then - echo "Package $complete_pkgname exists, not rebuilding!" + elif test -f "$WORKSPACE/packages/$TARGET/processed/${full_pkgname}" ; then + echo "Package $full_pkgname exists, not rebuilding!" return 1 else - echo "Package $complete_pkgname not found, building" + echo "Package $full_pkgname not found, building" return 0 fi else - centos_repo="http://rpm.arvados.org/CentOS/7/dev/x86_64/" - - 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 -s -o ./${complete_pkgname} ${centos_repo}${complete_pkgname} + local rpm_root + case "$TARGET" in + centos7) rpm_root="CentOS/7/dev" ;; + rocky8) rpm_root="CentOS/8/dev" ;; + *) + echo "FIXME: Don't know RPM URL path for $TARGET, building" + return 0 + ;; + esac + local rpm_url="http://rpm.arvados.org/$rpm_root/$arch/$full_pkgname" + + if curl -fs -o "$WORKSPACE/packages/$TARGET/$full_pkgname" "$rpm_url"; then + echo "Package $full_pkgname exists upstream, not rebuilding, downloading instead!" return 1 - elif test -f "$WORKSPACE/packages/$TARGET/processed/${complete_pkgname}" ; then - echo "Package $complete_pkgname exists, not rebuilding!" + elif [[ -f "$WORKSPACE/packages/$TARGET/processed/$full_pkgname" ]]; then + echo "Package $full_pkgname exists, not rebuilding!" return 1 else - echo "Package $complete_pkgname not found, building" + echo "Package $full_pkgname not found, building" return 0 fi fi @@ -316,7 +487,7 @@ handle_rails_package() { local srcdir="$1"; shift cd "$srcdir" local license_path="$1"; shift - local version="$(version_from_git)" + local version="$(rails_package_version "$pkgname" "$srcdir")" echo "$version" >package-build.version local scripts_dir="$(mktemp --tmpdir -d "$pkgname-XXXXXXXX.scripts")" && \ ( @@ -325,7 +496,8 @@ handle_rails_package() { cd "$srcdir" mkdir -p tmp git rev-parse HEAD >git-commit.version - bundle package --all + bundle config set cache_all true + bundle package ) if [[ 0 != "$?" ]] || ! cd "$WORKSPACE/packages/$TARGET"; then echo "ERROR: $pkgname package prep failed" >&2 @@ -344,45 +516,245 @@ handle_rails_package() { fi # For some reason fpm excludes need to not start with /. local exclude_root="${railsdir#/}" - # .git and packages are for the SSO server, which is built from its - # repository root. - local -a exclude_list=(.git packages tmp log coverage Capfile\* \ + local -a exclude_list=(tmp log coverage Capfile\* \ config/deploy\* config/application.yml) # for arvados-workbench, we need to have the (dummy) config/database.yml in the 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 - fpm_build "${pos_args[@]}" "${switches[@]}" \ + fpm_build "${srcdir}" "${pos_args[@]}" "${switches[@]}" \ -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 +} + +# Usage: handle_api_server [amd64|arm64] +handle_api_server () { + local target_arch="${1:-amd64}"; shift + + if [[ -n "$ONLY_BUILD" ]] && [[ "$ONLY_BUILD" != "arvados-api-server" ]] ; then + debug_echo -e "Skipping build of arvados-api-server package." + return 0 + fi + + native_arch=$(get_native_arch) + if [[ "$target_arch" != "$native_arch" ]]; then + echo "Error: no cross compilation support for Rails yet, can not build arvados-api-server for $ARCH" + echo + exit 1 + fi + + # Build the API server package + test_rails_package_presence arvados-api-server "$WORKSPACE/services/api" + if [[ "$?" == "0" ]]; then + calculate_go_package_version arvados_server_version cmd/arvados-server + arvados_server_iteration=$(default_iteration "arvados-server" "$arvados_server_version" "go") + handle_rails_package arvados-api-server "$WORKSPACE/services/api" \ + "$WORKSPACE/agpl-3.0.txt" --url="https://arvados.org" \ + --description="Arvados API server - Arvados is a free and open source platform for big data science." \ + --license="GNU Affero General Public License, version 3.0" --depends "arvados-server = ${arvados_server_version}-${arvados_server_iteration}" + fi +} + +# Usage: handle_workbench [amd64|arm64] +handle_workbench () { + local target_arch="${1:-amd64}"; shift + if [[ -n "$ONLY_BUILD" ]] && [[ "$ONLY_BUILD" != "arvados-workbench" ]] ; then + debug_echo -e "Skipping build of arvados-workbench package." + return 0 + fi + + native_arch=$(get_native_arch) + if [[ "$target_arch" != "$native_arch" ]]; then + echo "Error: no cross compilation support for Rails yet, can not build arvados-workbench for $native_arch" + echo + exit 1 + fi + + if [[ "$native_arch" != "amd64" ]]; then + echo "Error: building the arvados-workbench package is not yet supported on this architecture ($native_arch)." + echo + exit 1 + fi + + # Build the workbench server package + test_rails_package_presence arvados-workbench "$WORKSPACE/apps/workbench" + if [[ "$?" == "0" ]] ; then + calculate_go_package_version arvados_server_version cmd/arvados-server + arvados_server_iteration=$(default_iteration "arvados-server" "$arvados_server_version" "go") + + ( + set -e + + # The workbench package has a build-time dependency on the arvados-server + # package for config manipulation, so install it first. + cd $WORKSPACE/cmd/arvados-server + get_complete_package_name arvados_server_pkgname arvados-server ${arvados_server_version} go + + arvados_server_pkg_path="$WORKSPACE/packages/$TARGET/${arvados_server_pkgname}" + if [[ ! -e ${arvados_server_pkg_path} ]]; then + arvados_server_pkg_path="$WORKSPACE/packages/$TARGET/processed/${arvados_server_pkgname}" + fi + if [[ "$FORMAT" == "deb" ]]; then + dpkg -i ${arvados_server_pkg_path} + else + rpm -i ${arvados_server_pkg_path} + fi + + cd "$WORKSPACE/apps/workbench" + + # We need to bundle to be ready even when we build a package without vendor directory + # because asset compilation requires it. + bundle config set --local system 'true' >"$STDOUT_IF_DEBUG" + bundle install >"$STDOUT_IF_DEBUG" + + # clear the tmp directory; the asset generation step will recreate tmp/cache/assets, + # and we want that in the package, so it's easier to not exclude the tmp directory + # from the package - empty it instead. + rm -rf tmp + mkdir tmp + + # Set up an appropriate config.yml + arvados-server config-dump -config <(cat /etc/arvados/config.yml 2>/dev/null || echo "Clusters: {zzzzz: {}}") > /tmp/x + mkdir -p /etc/arvados/ + mv /tmp/x /etc/arvados/config.yml + perl -p -i -e 'BEGIN{undef $/;} s/WebDAV(.*?):\n( *)ExternalURL: ""/WebDAV$1:\n$2ExternalURL: "example.com"/g' /etc/arvados/config.yml + + ARVADOS_CONFIG=none RAILS_ENV=production RAILS_GROUPS=assets bin/rake npm:install >"$STDOUT_IF_DEBUG" + ARVADOS_CONFIG=none RAILS_ENV=production RAILS_GROUPS=assets bin/rake assets:precompile >"$STDOUT_IF_DEBUG" + + # Remove generated configuration files so they don't go in the package. + rm -rf /etc/arvados/ + ) + + if [[ "$?" != "0" ]]; then + echo "ERROR: Asset precompilation failed" + EXITCODE=1 + else + handle_rails_package arvados-workbench "$WORKSPACE/apps/workbench" \ + "$WORKSPACE/agpl-3.0.txt" --url="https://arvados.org" \ + --description="Arvados Workbench - Arvados is a free and open source platform for big data science." \ + --license="GNU Affero General Public License, version 3.0" --depends "arvados-server = ${arvados_server_version}-${arvados_server_iteration}" fi + fi +} + +# Usage: handle_cwltest [deb|rpm] [amd64|arm64] +handle_cwltest () { + local package_format="$1"; shift + local target_arch="${1:-amd64}"; shift + + if [[ -n "$ONLY_BUILD" ]] && [[ "$ONLY_BUILD" != "python3-cwltest" ]] ; then + debug_echo -e "Skipping build of cwltest package." + return 0 + fi + cd "$WORKSPACE" + if [[ -e "$WORKSPACE/cwltest" ]]; then + rm -rf "$WORKSPACE/cwltest" + fi + git clone https://github.com/common-workflow-language/cwltest.git + + # The subsequent release of cwltest confirms that files exist on disk, since + # our files are in Keep, all the tests fail. + # We should add [optional] Arvados support to cwltest so it can access + # Keep but for the time being just package the last working version. + (cd cwltest && git checkout 2.3.20230108193615) + + # signal to our build script that we want a cwltest executable installed in /usr/bin/ + mkdir cwltest/bin && touch cwltest/bin/cwltest + fpm_build_virtualenv "cwltest" "cwltest" "$package_format" "$target_arch" + # The python->python3 metapackage + build_metapackage "cwltest" "cwltest" + cd "$WORKSPACE" + rm -rf "$WORKSPACE/cwltest" +} + +# Usage: handle_arvados_src +handle_arvados_src () { + if [[ -n "$ONLY_BUILD" ]] && [[ "$ONLY_BUILD" != "arvados-src" ]] ; then + debug_echo -e "Skipping build of arvados-src package." + return 0 + fi + # arvados-src + ( + cd "$WORKSPACE" + COMMIT_HASH=$(format_last_commit_here "%H") + arvados_src_version="$(version_from_git)" + + cd $WORKSPACE/packages/$TARGET + test_package_presence arvados-src "$arvados_src_version" src "" + + if [[ "$?" == "0" ]]; then + cd "$WORKSPACE" + SRC_BUILD_DIR=$(mktemp -d) + # mktemp creates the directory with 0700 permissions by default + chmod 755 $SRC_BUILD_DIR + git clone $DASHQ_UNLESS_DEBUG "$WORKSPACE/.git" "$SRC_BUILD_DIR" + cd "$SRC_BUILD_DIR" + + # go into detached-head state + git checkout $DASHQ_UNLESS_DEBUG "$COMMIT_HASH" + echo "$COMMIT_HASH" >git-commit.version + + cd $WORKSPACE/packages/$TARGET + fpm_build "$WORKSPACE" $SRC_BUILD_DIR/=/usr/local/arvados/src arvados-src 'dir' "$arvados_src_version" "--exclude=usr/local/arvados/src/.git" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=The Arvados source code" "--architecture=all" + + rm -rf "$SRC_BUILD_DIR" + fi + ) } # Build python packages with a virtualenv built-in +# Usage: fpm_build_virtualenv arvados-python-client sdk/python [deb|rpm] [amd64|arm64] fpm_build_virtualenv () { - PKG=$1 - shift - PKG_DIR=$1 - shift - PACKAGE_TYPE=${1:-python} - shift + local pkg=$1; shift + local pkg_dir=$1; shift + local package_format="$1"; shift + local target_arch="${1:-amd64}"; shift + + native_arch=$(get_native_arch) + + if [[ "$pkg" != "arvados-docker-cleaner" ]]; then + PYTHON_PKG=$PYTHON3_PKG_PREFIX-$pkg + else + # Exception to our package naming convention + PYTHON_PKG=$pkg + fi + + if [[ -n "$ONLY_BUILD" ]] && [[ "$PYTHON_PKG" != "$ONLY_BUILD" ]]; then + # arvados-python-client sdist should always be built if we are building a + # python package. + if [[ "$ONLY_BUILD" != "python3-arvados-cwl-runner" ]] && + [[ "$ONLY_BUILD" != "python3-arvados-fuse" ]] && + [[ "$ONLY_BUILD" != "python3-crunchstat-summary" ]] && + [[ "$ONLY_BUILD" != "arvados-docker-cleaner" ]] && + [[ "$ONLY_BUILD" != "python3-arvados-user-activity" ]]; then + debug_echo -e "Skipping build of $pkg package." + return 0 + fi + fi + + if [[ -n "$target_arch" ]] && [[ "$native_arch" == "$target_arch" ]]; then + fpm_build_virtualenv_worker "$pkg" "$pkg_dir" "$package_format" "$native_arch" "$target_arch" + elif [[ -z "$target_arch" ]]; then + fpm_build_virtualenv_worker "$pkg" "$pkg_dir" "$package_format" "$native_arch" "$native_arch" + else + echo "Error: no cross compilation support for Python yet, can not build $pkg for $target_arch" + return 1 + fi +} + +# Build python packages with a virtualenv built-in +# Usage: fpm_build_virtualenv_worker arvados-python-client sdk/python python3 [deb|rpm] [amd64|arm64] [amd64|arm64] +fpm_build_virtualenv_worker () { + PKG=$1; shift + PKG_DIR=$1; shift + local package_format="$1"; shift + local native_arch="${1:-amd64}"; shift + local target_arch=${1:-amd64}; shift # Set up STDOUT_IF_DEBUG=/dev/null @@ -397,50 +769,25 @@ fpm_build_virtualenv () { ARVADOS_BUILDING_ITERATION=1 fi - 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 - ;; - esac + local python=$PYTHON3_EXECUTABLE + pip=pip3 + PACKAGE_PREFIX=$PYTHON3_PKG_PREFIX - if [[ "$PKG" != "libpam-arvados" ]] && - [[ "$PKG" != "arvados-node-manager" ]] && - [[ "$PKG" != "arvados-docker-cleaner" ]]; then + if [[ "$PKG" != "arvados-docker-cleaner" ]]; then PYTHON_PKG=$PACKAGE_PREFIX-$PKG else # Exception to our package naming convention PYTHON_PKG=$PKG fi - # arvados-python-client sdist should always be built, to be available - # for other dependant packages. - if [[ -n "$ONLY_BUILD" ]] && [[ "arvados-python-client" != "$PKG" ]] && [[ "$PYTHON_PKG" != "$ONLY_BUILD" ]] && [[ "$PKG" != "$ONLY_BUILD" ]]; then - return 0 - fi - cd $WORKSPACE/$PKG_DIR rm -rf dist/* # Get the latest setuptools - if ! $pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U setuptools; then + if ! $pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U 'setuptools<45'; then echo "Error, unable to upgrade setuptools with" - echo " $pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U setuptools" + echo " $pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U 'setuptools<45'" exit 1 fi # filter a useless warning (when building the cwltest package) from the stderr output @@ -452,7 +799,7 @@ fpm_build_virtualenv () { PACKAGE_PATH=`(cd dist; ls *tar.gz)` if [[ "arvados-python-client" == "$PKG" ]]; then - PYSDK_PATH=`pwd`/dist/ + PYSDK_PATH="-f $(pwd)/dist/" fi if [[ -n "$ONLY_BUILD" ]] && [[ "$PYTHON_PKG" != "$ONLY_BUILD" ]] && [[ "$PKG" != "$ONLY_BUILD" ]]; then @@ -460,17 +807,23 @@ fpm_build_virtualenv () { fi # Determine the package version from the generated sdist archive - PYTHON_VERSION=${ARVADOS_BUILDING_VERSION:-$(awk '($1 == "Version:"){print $2}' *.egg-info/PKG-INFO)} + if [[ -n "$ARVADOS_BUILDING_VERSION" ]] ; then + UNFILTERED_PYTHON_VERSION=$ARVADOS_BUILDING_VERSION + PYTHON_VERSION=$(echo -n $ARVADOS_BUILDING_VERSION | sed s/~dev/.dev/g | sed s/~rc/rc/g) + else + PYTHON_VERSION=$(awk '($1 == "Version:"){print $2}' *.egg-info/PKG-INFO) + UNFILTERED_PYTHON_VERSION=$(echo -n $PYTHON_VERSION | sed s/\.dev/~dev/g |sed 's/\([0-9]\)rc/\1~rc/g') + fi # 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. - if ! test_package_presence "$PYTHON_PKG" $PYTHON_VERSION $PACKAGE_TYPE $ARVADOS_BUILDING_ITERATION; then + if ! test_package_presence "$PYTHON_PKG" "$UNFILTERED_PYTHON_VERSION" "$python" "$ARVADOS_BUILDING_ITERATION" "$target_arch"; then return 0 fi - echo "Building $FORMAT package for $PKG from $PKG_DIR" + echo "Building $package_format ($target_arch) package for $PKG from $PKG_DIR" # Package the sdist in a virtualenv echo "Creating virtualenv..." @@ -495,9 +848,9 @@ fpm_build_virtualenv () { 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 + if ! build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U 'setuptools<45'; 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" + echo " build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U 'setuptools<45'" exit 1 fi echo "setuptools version: `build/usr/share/$python/dist/$PYTHON_PKG/bin/$python -c 'import setuptools; print(setuptools.__version__)'`" @@ -510,23 +863,23 @@ fpm_build_virtualenv () { 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 -f $PYSDK_PATH $PACKAGE_PATH + build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG $PYSDK_PATH $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 -f $PYSDK_PATH $PACKAGE_PATH + PYCURL_SSL_LIBRARY=nss build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG $PYSDK_PATH $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 -f $PYSDK_PATH $PACKAGE_PATH" + echo " build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG $PYSDK_PATH $PACKAGE_PATH" exit 1 fi cd build/usr/share/$python/dist/$PYTHON_PKG/ # Replace the shebang lines in all python scripts, and handle the activate - # scripts too This is a functional replacement of the 237 line + # scripts too. This is a functional replacement of the 237 line # 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 @@ -553,7 +906,11 @@ fpm_build_virtualenv () { # Finally, generate the package echo "Creating package..." - declare -a COMMAND_ARR=("fpm" "-s" "dir" "-t" "$FORMAT") + declare -a COMMAND_ARR=("fpm" "-s" "dir" "-t" "$package_format") + + if [[ -n "$target_arch" ]] && [[ "$target_arch" != "amd64" ]]; then + COMMAND_ARR+=("-a$target_arch") + fi if [[ "$MAINTAINER" != "" ]]; then COMMAND_ARR+=('--maintainer' "$MAINTAINER") @@ -573,47 +930,37 @@ fpm_build_virtualenv () { LICENSE_STRING=`grep license $WORKSPACE/$PKG_DIR/setup.py|cut -f2 -d=|sed -e "s/[',\\"]//g"` COMMAND_ARR+=('--license' "$LICENSE_STRING") - # 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 - # 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. - if [[ "$FORMAT" == "rpm" ]] && [[ "$python" == "python2.7" ]]; then - COMMAND_ARR+=('--rpm-auto-add-directories') - fi - - if [[ "$PKG" == "arvados-python-client" ]]; then - if [[ "$python" == "python2.7" ]]; then - COMMAND_ARR+=('--conflicts' "$PYTHON3_PKG_PREFIX-$PKG") - else - COMMAND_ARR+=('--conflicts' "$PYTHON2_PKG_PREFIX-$PKG") - fi - fi - if [[ "$DEBUG" != "0" ]]; then COMMAND_ARR+=('--verbose' '--log' 'info') fi - COMMAND_ARR+=('-v' "$PYTHON_VERSION") + COMMAND_ARR+=('-v' $(echo -n "$PYTHON_VERSION" | sed s/.dev/~dev/g | sed s/rc/~rc/g)) COMMAND_ARR+=('--iteration' "$ARVADOS_BUILDING_ITERATION") COMMAND_ARR+=('-n' "$PYTHON_PKG") COMMAND_ARR+=('-C' "build") - if [[ -e "$WORKSPACE/$PKG_DIR/$PKG.service" ]]; then + systemd_unit="$WORKSPACE/$PKG_DIR/$PKG.service" + if [[ -e "${systemd_unit}" ]]; 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 - COMMAND_ARR+=('--depends' "$PYTHON3_PACKAGE") - fi - - # avoid warning - COMMAND_ARR+=('--deb-no-default-config-files') + COMMAND_ARR+=('--depends' "$PYTHON3_PACKAGE") + case "$package_format" in + deb) + COMMAND_ARR+=( + # Avoid warning + --deb-no-default-config-files + ) ;; + rpm) + COMMAND_ARR+=( + # Conflict with older packages we used to publish + --conflicts "rh-python36-python-$PKG" + # Do not generate /usr/lib/.build-id links on RH8+ + # (otherwise our packages conflict with platform-python) + --rpm-rpmbuild-define "_build_id_links none" + ) ;; + esac # Append --depends X and other arguments specified by fpm-info.sh in # the package source dir. These are added last so they can override @@ -634,6 +981,16 @@ fpm_build_virtualenv () { COMMAND_ARR+=('--depends' "$i") done + for i in "${fpm_depends[@]}"; do + COMMAND_ARR+=('--replaces' "python-$PKG") + done + + # make sure the systemd service file ends up in the right place + # used by arvados-docker-cleaner + if [[ -e "${systemd_unit}" ]]; then + COMMAND_ARR+=("usr/share/$python/dist/$PKG/share/doc/$PKG/$PKG.service=/lib/systemd/system/$PKG.service") + fi + COMMAND_ARR+=("${fpm_args[@]}") # Make sure to install all our package binaries in /usr/bin. @@ -648,22 +1005,15 @@ fpm_build_virtualenv () { done fi - # the libpam module should place a few files in the correct place for the pam - # subsystem - if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/$python/dist/$PYTHON_PKG/lib/security/libpam_arvados.py" ]]; then - COMMAND_ARR+=("usr/share/$python/dist/$PYTHON_PKG/lib/security/libpam_arvados.py=/usr/lib/security/") - fi - if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/$python/dist/$PYTHON_PKG/share/pam-configs/arvados" ]]; then - COMMAND_ARR+=("usr/share/$python/dist/$PYTHON_PKG/share/pam-configs/arvados=/usr/share/pam-configs/") - fi - - # 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/") + # the python3-arvados-cwl-runner package comes with cwltool, expose that version + if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/$python/dist/$PYTHON_PKG/bin/cwltool" ]]; then + COMMAND_ARR+=("usr/share/$python/dist/$PYTHON_PKG/bin/cwltool=/usr/bin/") fi COMMAND_ARR+=(".") + debug_echo -e "\n${COMMAND_ARR[@]}\n" + FPM_RESULTS=$("${COMMAND_ARR[@]}") FPM_EXIT_CODE=$? @@ -673,14 +1023,147 @@ fpm_build_virtualenv () { echo echo -e "\n${COMMAND_ARR[@]}\n" else - echo `ls *$FORMAT` - mv $WORKSPACE/$PKG_DIR/dist/*$FORMAT $WORKSPACE/packages/$TARGET/ + echo `ls *$package_format` + mv $WORKSPACE/$PKG_DIR/dist/*$package_format $WORKSPACE/packages/$TARGET/ fi echo } +# build_metapackage builds meta packages that help with the python to python 3 package migration +build_metapackage() { + # base package name (e.g. arvados-python-client) + BASE_NAME=$1 + shift + PKG_DIR=$1 + shift + + if [[ -n "$ONLY_BUILD" ]] && [[ "python-$BASE_NAME" != "$ONLY_BUILD" ]]; then + return 0 + fi + + if [[ "$ARVADOS_BUILDING_ITERATION" == "" ]]; then + ARVADOS_BUILDING_ITERATION=1 + fi + + if [[ -z "$ARVADOS_BUILDING_VERSION" ]]; then + cd $WORKSPACE/$PKG_DIR + pwd + rm -rf dist/* + + # Get the latest setuptools + if ! pip3 install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U 'setuptools<45'; then + echo "Error, unable to upgrade setuptools with XY" + echo " pip3 install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U 'setuptools<45'" + exit 1 + fi + # filter a useless warning (when building the cwltest package) from the stderr output + if ! python3 setup.py $DASHQ_UNLESS_DEBUG sdist 2> >(grep -v 'warning: no previously-included files matching'); then + echo "Error, unable to run python3 setup.py sdist for $PKG" + exit 1 + fi + + PYTHON_VERSION=$(awk '($1 == "Version:"){print $2}' *.egg-info/PKG-INFO) + UNFILTERED_PYTHON_VERSION=$(echo -n $PYTHON_VERSION | sed s/\.dev/~dev/g |sed 's/\([0-9]\)rc/\1~rc/g') + + else + UNFILTERED_PYTHON_VERSION=$ARVADOS_BUILDING_VERSION + PYTHON_VERSION=$(echo -n $ARVADOS_BUILDING_VERSION | sed s/~dev/.dev/g | sed s/~rc/rc/g) + fi + + cd - >$STDOUT_IF_DEBUG + if [[ -d "$BASE_NAME" ]]; then + rm -rf $BASE_NAME + fi + mkdir $BASE_NAME + cd $BASE_NAME + + if [[ "$FORMAT" == "deb" ]]; then + cat >ns-control < +Depends: python3-${BASE_NAME} +Description: metapackage to ease the upgrade to the Pyhon 3 version of ${BASE_NAME} + This package is a metapackage that will automatically install the new version of + ${BASE_NAME} which is Python 3 based and has a different name. +EOF + + /usr/bin/equivs-build ns-control + if [[ $? -ne 0 ]]; then + echo "Error running 'equivs-build ns-control', is the 'equivs' package installed?" + return 1 + fi + elif [[ "$FORMAT" == "rpm" ]]; then + cat >meta.spec < +- initial release +EOF + + /usr/bin/rpmbuild -ba meta.spec + if [[ $? -ne 0 ]]; then + echo "Error running 'rpmbuild -ba meta.spec', is the 'rpm-build' package installed?" + return 1 + else + mv /root/rpmbuild/RPMS/x86_64/python-${BASE_NAME}*.${FORMAT} . + if [[ $? -ne 0 ]]; then + echo "Error finding rpm file output of 'rpmbuild -ba meta.spec'" + return 1 + fi + fi + else + echo "Unknown format" + return 1 + fi + + if [[ $EXITCODE -ne 0 ]]; then + return 1 + else + echo `ls *$FORMAT` + mv *$FORMAT $WORKSPACE/packages/$TARGET/ + fi + + # clean up + cd - >$STDOUT_IF_DEBUG + if [[ -d "$BASE_NAME" ]]; then + rm -rf $BASE_NAME + fi +} + # Build packages for everything fpm_build () { + # Source dir where fpm-info.sh (if any) will be found. + SRC_DIR=$1 + shift # The package source. Depending on the source type, this can be a # path, or the name of the package in an upstream repository (e.g., # pip). @@ -697,7 +1180,11 @@ fpm_build () { shift if [[ -n "$ONLY_BUILD" ]] && [[ "$PACKAGE_NAME" != "$ONLY_BUILD" ]] && [[ "$PACKAGE" != "$ONLY_BUILD" ]] ; then + # arvados-workbench depends on arvados-server at build time, so even when + # only arvados-workbench is being built, we need to build arvados-server too + if [[ "$PACKAGE_NAME" != "arvados-server" ]] || [[ "$ONLY_BUILD" != "arvados-workbench" ]]; then return 0 + fi fi local default_iteration_value="$(default_iteration "$PACKAGE" "$VERSION" "$PACKAGE_TYPE")" @@ -710,17 +1197,6 @@ fpm_build () { COMMAND_ARR+=(--deb-ignore-iteration-in-dependencies) fi - # 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 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. - if [[ "$FORMAT" = rpm ]] && [[ "$python" = python2.7 ]]; then - COMMAND_ARR+=('--rpm-auto-add-directories') - fi - if [[ "$DEBUG" != "0" ]]; then COMMAND_ARR+=('--verbose' '--log' 'info') fi @@ -752,18 +1228,17 @@ fpm_build () { declare -a fpm_args=() declare -a build_depends=() declare -a fpm_depends=() + declare -a fpm_conflicts=() declare -a fpm_exclude=() - declare -a fpm_dirs=( - # source dir part of 'dir' package ("/source=/dest" => "/source"): - "${PACKAGE%%=/*}") - for pkgdir in "${fpm_dirs[@]}"; do - fpminfo="$pkgdir/fpm-info.sh" - if [[ -e "$fpminfo" ]]; then - debug_echo "Loading fpm overrides from $fpminfo" - source "$fpminfo" - break - fi - done + if [[ ! -d "$SRC_DIR" ]]; then + echo >&2 "BUG: looking in wrong dir for fpm-info.sh: $pkgdir" + exit 1 + fi + fpminfo="${SRC_DIR}/fpm-info.sh" + if [[ -e "$fpminfo" ]]; then + debug_echo "Loading fpm overrides from $fpminfo" + source "$fpminfo" + fi for pkg in "${build_depends[@]}"; do if [[ $TARGET =~ debian|ubuntu ]]; then pkg_deb=$(ls "$WORKSPACE/packages/$TARGET/$pkg_"*.deb | sort -rg | awk 'NR==1') @@ -789,17 +1264,20 @@ fpm_build () { for i in "${fpm_depends[@]}"; do COMMAND_ARR+=('--depends' "$i") done + for i in "${fpm_conflicts[@]}"; do + COMMAND_ARR+=('--conflicts' "$i") + done for i in "${fpm_exclude[@]}"; do COMMAND_ARR+=('--exclude' "$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" @@ -871,7 +1349,9 @@ timer_reset() { } timer() { - echo -n "$(($SECONDS - $t0))s" + if [[ -n "$t0" ]]; then + echo -n "$(($SECONDS - $t0))s" + fi } report_outcomes() {