X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ba2c87d3cad4f66afa26c0033fc70ce69ba10301..db6d1ebdedf07b714d9664313c085aa6bc621277:/build/run-library.sh diff --git a/build/run-library.sh b/build/run-library.sh index 06aec50501..03d99b1327 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -79,6 +79,25 @@ calculate_python_sdk_cwl_package_versions() { 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() { local gem_name="$1"; shift local gem_version="$(nohash_version_from_git)" @@ -96,6 +115,25 @@ handle_ruby_gem() { fi } +# Usage: package_workbench2 +package_workbench2() { + local pkgname=arvados-workbench2 + local src=services/workbench2 + local dst=/var/www/arvados-workbench2/workbench2 + local description="Arvados Workbench 2" + cd "$WORKSPACE/$src" + local version="$(version_from_git)" + rm -rf ./build + NODE_ENV=production yarn install + VERSION="$version" BUILD_NUMBER="$(default_iteration "$pkgname" "$version" yarn)" GIT_COMMIT="$(git rev-parse HEAD | head -c9)" yarn build + cd "$WORKSPACE/packages/$TARGET" + fpm_build "${WORKSPACE}/$src" "${WORKSPACE}/$src/build/=$dst" "$pkgname" dir "$version" \ + --license="GNU Affero General Public License, version 3.0" \ + --description="${description}" \ + --config-files="/etc/arvados/$pkgname/workbench2.example.json" \ + "$WORKSPACE/services/workbench2/etc/arvados/workbench2/workbench2.example.json=/etc/arvados/$pkgname/workbench2.example.json" +} + 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. @@ -130,36 +168,107 @@ calculate_go_package_version() { __returnvar="$version" } -# Usage: package_go_binary services/foo arvados-foo "Compute foo to arbitrary precision" [apache-2.0.txt] +# 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 description="$1"; shift - local license_file="${1:-agpl-3.0.txt}"; shift + 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 + debug_echo -e "Skipping build of $prog package." + return 0 + fi - 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 - return 0 + 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 + # Ubuntu 20.04 does 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-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 - debug_echo "package_go_binary $src_path as $prog" + 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 + debug_echo "package_go_binary $src_path as $prog (native arch: $native_arch, target arch: $target_arch)" local basename="${src_path##*/}" calculate_go_package_version go_package_version $src_path cd $WORKSPACE/packages/$TARGET - test_package_presence $prog $go_package_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 git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/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 + + case "$package_format" in + # As of April 2024 we package identical Go binaries under different + # packages and names. This upsets the build id database, so don't + # register ourselves there. + rpm) switches+=(--rpm-rpmbuild-define="_build_id_links none") ;; + esac + systemd_unit="$WORKSPACE/${src_path}/${prog}.service" if [[ -e "${systemd_unit}" ]]; then switches+=( @@ -169,16 +278,23 @@ package_go_binary() { fi switches+=("$WORKSPACE/${license_file}=/usr/share/doc/$prog/${license_file}") - fpm_build "${WORKSPACE}/${src_path}" "$GOPATH/bin/${basename}=/usr/bin/${prog}" "${prog}" dir "${go_package_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 "Arvados foo library" +# 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 @@ -236,7 +352,7 @@ rails_package_version() { return fi local version="$(version_from_git)" - if [ $pkgname = "arvados-api-server" -o $pkgname = "arvados-workbench" ] ; then + if [ $pkgname = "arvados-api-server" ] ; then calculate_go_package_version version cmd/arvados-server "$srcdir" fi echo $version @@ -282,19 +398,18 @@ get_complete_package_name() { fi if [[ "$arch" == "" ]]; then - rpm_architecture="x86_64" - deb_architecture="amd64" + 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 - - # 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 @@ -317,15 +432,11 @@ test_package_presence() { 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 fi local full_pkgname - get_complete_package_name full_pkgname $pkgname $version $pkgtype $iteration $arch + 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 @@ -336,10 +447,10 @@ test_package_presence() { echo "Package $full_pkgname build forced with --force-build, building" elif [[ "$FORMAT" == "deb" ]]; then declare -A dd - dd[debian10]=buster - dd[ubuntu1604]=xenial - dd[ubuntu1804]=bionic + dd[debian11]=bullseye + dd[debian12]=bookworm dd[ubuntu2004]=focal + dd[ubuntu2204]=jammy D=${dd[$TARGET]} if [ ${pkgname:0:3} = "lib" ]; then repo_subdir=${pkgname:0:4} @@ -361,15 +472,20 @@ test_package_presence() { 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 ${full_pkgname} - if [ $? -eq 0 ]; then + local rpm_root + case "$TARGET" in + 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!" - curl -s -o "$WORKSPACE/packages/$TARGET/${full_pkgname}" ${centos_repo}${full_pkgname} return 1 - elif test -f "$WORKSPACE/packages/$TARGET/processed/${full_pkgname}" ; then + elif [[ -f "$WORKSPACE/packages/$TARGET/processed/$full_pkgname" ]]; then echo "Package $full_pkgname exists, not rebuilding!" return 1 else @@ -397,7 +513,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 @@ -416,13 +533,10 @@ handle_rails_package() { fi # For some reason fpm excludes need to not start with /. local exclude_root="${railsdir#/}" - 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 exclude in ${exclude_list[@]}; do + for exclude in tmp log coverage Capfile\* \ + config/deploy\* \ + config/application.yml \ + config/database.yml; do switches+=(-x "$exclude_root/$exclude") done fpm_build "${srcdir}" "${pos_args[@]}" "${switches[@]}" \ @@ -431,14 +545,103 @@ handle_rails_package() { rm -rf "$scripts_dir" } +# 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_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 + ) +} + +setup_build_virtualenv() { + PYTHON_BUILDROOT="$(mktemp --directory --tmpdir pybuild.XXXXXXXX)" + "$PYTHON3_EXECUTABLE" -m venv "$PYTHON_BUILDROOT/venv" + "$PYTHON_BUILDROOT/venv/bin/pip" install --upgrade build piprepo setuptools wheel + mkdir "$PYTHON_BUILDROOT/wheelhouse" +} + # 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 [[ -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 @@ -453,15 +656,7 @@ fpm_build_virtualenv () { ARVADOS_BUILDING_ITERATION=1 fi - local python="" - case "$PACKAGE_TYPE" in - python3) - python=python3 - pip=pip3 - PACKAGE_PREFIX=$PYTHON3_PKG_PREFIX - ;; - esac - + PACKAGE_PREFIX=$PYTHON3_PKG_PREFIX if [[ "$PKG" != "arvados-docker-cleaner" ]]; then PYTHON_PKG=$PACKAGE_PREFIX-$PKG else @@ -469,139 +664,110 @@ fpm_build_virtualenv () { PYTHON_PKG=$PKG fi - # arvados-python-client sdist should always be built, to be available - # for other dependent packages. - if [[ -n "$ONLY_BUILD" ]] && [[ "arvados-python-client" != "$PKG" ]] && [[ "$PYTHON_PKG" != "$ONLY_BUILD" ]] && [[ "$PKG" != "$ONLY_BUILD" ]]; then - return 0 + # We must always add a wheel to our repository, even if we're not building + # this distro package, because it might be a dependency for a later + # package we do build. + if [[ "$PKG_DIR" =~ ^.=[0-9]+\. ]]; then + # Not source to build, but a version to download. + # The rest of the function expects a filesystem path, so set one afterwards. + "$PYTHON_BUILDROOT/venv/bin/pip" download --dest="$PYTHON_BUILDROOT/wheelhouse" "$PKG$PKG_DIR" \ + && PKG_DIR="$PYTHON_BUILDROOT/nonexistent" + else + # Make PKG_DIR absolute. + PKG_DIR="$(env -C "$WORKSPACE" readlink -e "$PKG_DIR")" + if [[ -e "$PKG_DIR/pyproject.toml" ]]; then + "$PYTHON_BUILDROOT/venv/bin/python" -m build --outdir="$PYTHON_BUILDROOT/wheelhouse" "$PKG_DIR" + else + env -C "$PKG_DIR" "$PYTHON_BUILDROOT/venv/bin/python" setup.py bdist_wheel --dist-dir="$PYTHON_BUILDROOT/wheelhouse" + fi fi - - cd $WORKSPACE/$PKG_DIR - - rm -rf dist/* - - # Get the latest setuptools - 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<45'" + if [[ $? -ne 0 ]]; then + printf "Error, unable to download/build wheel for %s @ %s" "$PKG" "$PKG_DIR" 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" + elif ! "$PYTHON_BUILDROOT/venv/bin/piprepo" build "$PYTHON_BUILDROOT/wheelhouse"; then + printf "Error, unable to update local wheel repository" exit 1 fi - PACKAGE_PATH=`(cd dist; ls *tar.gz)` - - if [[ "arvados-python-client" == "$PKG" ]]; then - PYSDK_PATH=`pwd`/dist/ - fi - if [[ -n "$ONLY_BUILD" ]] && [[ "$PYTHON_PKG" != "$ONLY_BUILD" ]] && [[ "$PKG" != "$ONLY_BUILD" ]]; then return 0 fi - # Determine the package version from the generated sdist archive - 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" $UNFILTERED_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 + local venv_dir="$PYTHON_BUILDROOT/$PYTHON_PKG" echo "Creating virtualenv..." - - cd dist - - 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" - - if ! $virtualenv_command; then - echo "Error, unable to run" - echo " $virtualenv_command" + if ! "$PYTHON3_EXECUTABLE" -m venv "$venv_dir"; then + printf "Error, unable to run\n %s -m venv %s\n" "$PYTHON3_EXECUTABLE" "$venv_dir" exit 1 - fi - - 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" + # We must have the dependency resolver introduced in late 2020 for the rest + # of our install process to work. + # + elif ! "$venv_dir/bin/pip" install "pip>=20.3"; then + printf "Error, unable to run\n %s/bin/pip install 'pip>=20.3'\n" "$venv_dir" 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<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<45'" + local pip_wheel="$(ls --sort=time --reverse "$PYTHON_BUILDROOT/wheelhouse/$(echo "$PKG" | sed s/-/_/g)-"*.whl | tail -n1)" + if [[ -z "$pip_wheel" ]]; then + printf "Error, unable to find built wheel for $PKG" 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" + elif ! "$venv_dir/bin/pip" install $DASHQ_UNLESS_DEBUG $CACHE_FLAG --extra-index-url="file://$PYTHON_BUILDROOT/wheelhouse/simple" "$pip_wheel"; then + printf "Error, unable to run + %s/bin/pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG --extra-index-url=file://%s %s +" "$venv_dir" "$PYTHON_BUILDROOT/wheelhouse/simple" "$pip_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 -f $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 - fi + # Determine the package version from the wheel + PYTHON_VERSION="$("$venv_dir/bin/python" "$WORKSPACE/build/pypkg_info.py" metadata "$PKG" Version)" + UNFILTERED_PYTHON_VERSION="$(echo "$PYTHON_VERSION" | sed 's/\.dev/~dev/; s/\([0-9]\)rc/\1~rc/')" - 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" - exit 1 + # 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. + if ! test_package_presence "$PYTHON_PKG" "$UNFILTERED_PYTHON_VERSION" python3 "$ARVADOS_BUILDING_ITERATION" "$target_arch"; then + return 0 fi - - cd build/usr/share/$python/dist/$PYTHON_PKG/ + echo "Building $package_format ($target_arch) package for $PKG from $PKG_DIR" # Replace the shebang lines in all python scripts, and handle the activate # 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 - 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 - 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 - fi + local sys_venv_dir="/usr/lib/$PYTHON_PKG" + local sys_venv_py="$sys_venv_dir/bin/python$PYTHON3_VERSION" + find "$venv_dir/bin" -type f | while read binfile; do + if file --mime "$binfile" | grep -q binary; then + : # Nothing to do for binary files + elif [[ "$binfile" =~ /activate(.csh|.fish|)$ ]]; then + sed -ri "s@VIRTUAL_ENV(=| )\".*\"@VIRTUAL_ENV\\1\"$sys_venv_dir\"@" "$binfile" + else + # Replace shebang line + sed -ri "1 s@^#\![^[:space:]]+/bin/python[0-9.]*@#\!$sys_venv_py@" "$binfile" fi done - cd - >$STDOUT_IF_DEBUG - - find build -iname '*.pyc' -exec rm {} \; - find build -iname '*.pyo' -exec rm {} \; - - # Finally, generate the package - echo "Creating package..." - - declare -a COMMAND_ARR=("fpm" "-s" "dir" "-t" "$FORMAT") + # Using `env -C` sets the directory where the package is built. + # Using `fpm --chdir` sets the root directory for source arguments. + declare -a COMMAND_ARR=( + env -C "$PYTHON_BUILDROOT" fpm + --chdir="$venv_dir" + --name="$PYTHON_PKG" + --version="$UNFILTERED_PYTHON_VERSION" + --input-type=dir + --output-type="$package_format" + --depends="$PYTHON3_PACKAGE" + --iteration="$ARVADOS_BUILDING_ITERATION" + --replaces="python-$PKG" + --url="https://arvados.org" + ) + # Append fpm flags corresponding to Python package metadata. + readarray -d "" -O "${#COMMAND_ARR[@]}" -t COMMAND_ARR < \ + <("$venv_dir/bin/python3" "$WORKSPACE/build/pypkg_info.py" \ + --delimiter=\\0 --format=fpm \ + metadata "$PKG" License Summary) + + if [[ -n "$target_arch" ]] && [[ "$target_arch" != "amd64" ]]; then + COMMAND_ARR+=("-a$target_arch") + fi if [[ "$MAINTAINER" != "" ]]; then COMMAND_ARR+=('--maintainer' "$MAINTAINER") @@ -611,35 +777,31 @@ fpm_build_virtualenv () { COMMAND_ARR+=('--vendor' "$VENDOR") fi - COMMAND_ARR+=('--url' 'https://arvados.org') - - # Get description - DESCRIPTION=`grep '\sdescription' $WORKSPACE/$PKG_DIR/setup.py|cut -f2 -d=|sed -e "s/[',\\"]//g"` - COMMAND_ARR+=('--description' "$DESCRIPTION") - - # Get license string - LICENSE_STRING=`grep license $WORKSPACE/$PKG_DIR/setup.py|cut -f2 -d=|sed -e "s/[',\\"]//g"` - COMMAND_ARR+=('--license' "$LICENSE_STRING") - if [[ "$DEBUG" != "0" ]]; then COMMAND_ARR+=('--verbose' '--log' 'info') fi - 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") - - systemd_unit="$WORKSPACE/$PKG_DIR/$PKG.service" + systemd_unit="$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 - COMMAND_ARR+=('--depends' "$PYTHON3_PACKAGE") - - # avoid warning - COMMAND_ARR+=('--deb-no-default-config-files') + 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 @@ -647,7 +809,7 @@ fpm_build_virtualenv () { declare -a fpm_args=() declare -a fpm_depends=() - fpminfo="$WORKSPACE/$PKG_DIR/fpm-info.sh" + fpminfo="$PKG_DIR/fpm-info.sh" if [[ -e "$fpminfo" ]]; then echo "Loading fpm overrides from $fpminfo" if ! source "$fpminfo"; then @@ -663,29 +825,21 @@ fpm_build_virtualenv () { # 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") + COMMAND_ARR+=("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. - # 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 - for binary in `ls $WORKSPACE/$PKG_DIR/bin`; do - COMMAND_ARR+=("usr/share/$python/dist/$PYTHON_PKG/bin/$binary=/usr/bin/") - done - fi + while read -d "" binpath; do + COMMAND_ARR+=("$binpath=/usr/$binpath") + done < <("$venv_dir/bin/python3" "$WORKSPACE/build/pypkg_info.py" --delimiter=\\0 binfiles "$PKG") # the python3-arvados-cwl-runner package comes with cwltool, expose that version - if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/$python/dist/python-arvados-cwl-runner/bin/cwltool" ]]; then - COMMAND_ARR+=("usr/share/$python/dist/python-arvados-cwl-runner/bin/cwltool=/usr/bin/") + if [[ "$PKG" == arvados-cwl-runner ]]; then + COMMAND_ARR+=("bin/cwltool=/usr/bin/cwltool") fi - COMMAND_ARR+=(".") + COMMAND_ARR+=(".=$sys_venv_dir") debug_echo -e "\n${COMMAND_ARR[@]}\n" @@ -698,140 +852,14 @@ fpm_build_virtualenv () { echo echo -e "\n${COMMAND_ARR[@]}\n" else - echo `ls *$FORMAT` - mv $WORKSPACE/$PKG_DIR/dist/*$FORMAT $WORKSPACE/packages/$TARGET/ + ls "$PYTHON_BUILDROOT"/*."$package_format" + mv "$PYTHON_BUILDROOT"/*."$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 [[ -z "$ARVADOS_BUILDING_VERSION" ]]; then - cd $WORKSPACE/$PKG_DIR - pwd - rm -rf dist/* - - # Get the latest setuptools - 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<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 () { +fpm_build() { # Source dir where fpm-info.sh (if any) will be found. SRC_DIR=$1 shift @@ -851,11 +879,7 @@ 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")" @@ -899,6 +923,7 @@ fpm_build () { declare -a fpm_args=() declare -a build_depends=() declare -a fpm_depends=() + declare -a fpm_conflicts=() declare -a fpm_exclude=() if [[ ! -d "$SRC_DIR" ]]; then echo >&2 "BUG: looking in wrong dir for fpm-info.sh: $pkgdir" @@ -934,6 +959,9 @@ 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 @@ -951,6 +979,8 @@ fpm_build () { FPM_RESULTS=$("${COMMAND_ARR[@]}") FPM_EXIT_CODE=$? + echo "fpm: exit code $FPM_EXIT_CODE" >>$STDOUT_IF_DEBUG + echo "$FPM_RESULTS" >>$STDOUT_IF_DEBUG fpm_verify $FPM_EXIT_CODE $FPM_RESULTS @@ -967,7 +997,7 @@ fpm_verify () { FPM_RESULTS=$@ FPM_PACKAGE_NAME='' - if [[ $FPM_RESULTS =~ ([A-Za-z0-9_\.-]*\.)(deb|rpm) ]]; then + if [[ $FPM_RESULTS =~ ([A-Za-z0-9_\.~-]*\.)(deb|rpm) ]]; then FPM_PACKAGE_NAME=${BASH_REMATCH[1]}${BASH_REMATCH[2]} fi