X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/98e4a92f007533b2924604e4f83da9a6d15e0ef3..06fac7e369df875da835e8bab1eff72c5188c9d8:/build/run-build-packages.sh diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh index a07b308179..9030072d59 100755 --- a/build/run-build-packages.sh +++ b/build/run-build-packages.sh @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: AGPL-3.0 -. `dirname "$(readlink -f "$0")"`/run-library.sh -. `dirname "$(readlink -f "$0")"`/libcloud-pin.sh +. `dirname "$(readlink -f "$0")"`/run-library.sh || exit 1 +. `dirname "$(readlink -f "$0")"`/libcloud-pin.sh || exit 1 read -rd "\000" helpmessage < - Distribution to build packages for (default: debian9) + Distribution to build packages for (default: debian10) --only-build Build only a specific package (or $ONLY_BUILD from environment) +--force-build + Build even if the package exists upstream or if it has already been + built locally --command Build command to execute (defaults to the run command defined in the Docker image) @@ -35,18 +38,19 @@ EOF # set to --no-cache-dir to disable pip caching CACHE_FLAG= -MAINTAINER="Ward Vandewege " -VENDOR="Veritas Genetics, Inc." +MAINTAINER="Arvados Package Maintainers " +VENDOR="The Arvados Project" # End of user configuration DEBUG=${ARVADOS_DEBUG:-0} +FORCE_BUILD=${FORCE_BUILD:-0} EXITCODE=0 -TARGET=debian9 +TARGET=debian10 COMMAND= PARSEDOPTS=$(getopt --name "$0" --longoptions \ - help,build-bundle-packages,debug,target:,only-build: \ + help,build-bundle-packages,debug,target:,only-build:,force-build \ -- "" "$@") if [ $? -ne 0 ]; then exit 1 @@ -66,6 +70,9 @@ while [ $# -gt 0 ]; do --only-build) ONLY_BUILD="$2"; shift ;; + --force-build) + FORCE_BUILD=1 + ;; --debug) DEBUG=1 ;; @@ -95,18 +102,12 @@ if [[ "$DEBUG" != 0 ]]; then DASHQ_UNLESS_DEBUG= fi -declare -a PYTHON_BACKPORTS PYTHON3_BACKPORTS +declare -a PYTHON3_BACKPORTS -PYTHON2_VERSION=2.7 PYTHON3_VERSION=$(python3 -c 'import sys; print("{v.major}.{v.minor}".format(v=sys.version_info))') ## These defaults are suitable for any Debian-based distribution. # You can customize them as needed in distro sections below. -PYTHON2_PACKAGE=python$PYTHON2_VERSION -PYTHON2_PKG_PREFIX=python -PYTHON2_PREFIX=/usr -PYTHON2_INSTALL_LIB=lib/python$PYTHON2_VERSION/dist-packages - PYTHON3_PACKAGE=python$PYTHON3_VERSION PYTHON3_PKG_PREFIX=python3 PYTHON3_PREFIX=/usr @@ -122,12 +123,9 @@ case "$TARGET" in ;; centos*) FORMAT=rpm - PYTHON2_PACKAGE=$(rpm -qf "$(which python$PYTHON2_VERSION)" --queryformat '%{NAME}\n') - PYTHON2_PKG_PREFIX=$PYTHON2_PACKAGE - PYTHON2_INSTALL_LIB=lib/python$PYTHON2_VERSION/site-packages PYTHON3_PACKAGE=$(rpm -qf "$(which python$PYTHON3_VERSION)" --queryformat '%{NAME}\n') PYTHON3_PKG_PREFIX=$PYTHON3_PACKAGE - PYTHON3_PREFIX=/opt/rh/rh-python36/root/usr + PYTHON3_PREFIX=/usr PYTHON3_INSTALL_LIB=lib/python$PYTHON3_VERSION/site-packages export PYCURL_SSL_LIBRARY=nss ;; @@ -157,14 +155,6 @@ if [[ "$?" != 0 ]]; then exit 1 fi -PYTHON2_FPM_INSTALLER=(--python-easyinstall "$(find_python_program easy_install-$PYTHON2_VERSION easy_install)") -install3=$(find_python_program easy_install-$PYTHON3_VERSION easy_install3 pip-$PYTHON3_VERSION pip3) -if [[ $install3 =~ easy_ ]]; then - PYTHON3_FPM_INSTALLER=(--python-easyinstall "$install3") -else - PYTHON3_FPM_INSTALLER=(--python-pip "$install3") -fi - RUN_BUILD_PACKAGES_PATH="`dirname \"$0\"`" RUN_BUILD_PACKAGES_PATH="`( cd \"$RUN_BUILD_PACKAGES_PATH\" && pwd )`" # absolutized and normalized if [ -z "$RUN_BUILD_PACKAGES_PATH" ] ; then @@ -224,7 +214,7 @@ if [[ -z "$ONLY_BUILD" ]] || [[ "libarvados-perl" = "$ONLY_BUILD" ]] ; then perl Makefile.PL INSTALL_BASE=install >"$STDOUT_IF_DEBUG" && \ make install INSTALLDIRS=perl >"$STDOUT_IF_DEBUG" && \ - fpm_build install/lib/=/usr/share libarvados-perl \ + fpm_build "$WORKSPACE/sdk/perl" install/lib/=/usr/share libarvados-perl \ dir "$(version_from_git)" install/man/=/usr/share/man \ "$WORKSPACE/apache-2.0.txt=/usr/share/doc/libarvados-perl/apache-2.0.txt" && \ mv --no-clobber libarvados-perl*.$FORMAT "$WORKSPACE/packages/$TARGET/" @@ -269,10 +259,8 @@ debug_echo -e "\nPython packages\n" git checkout $DASHQ_UNLESS_DEBUG "$COMMIT_HASH" echo "$COMMIT_HASH" >git-commit.version - cd "$SRC_BUILD_DIR" - PKG_VERSION=$(version_from_git) cd $WORKSPACE/packages/$TARGET - fpm_build $SRC_BUILD_DIR/=/usr/local/arvados/src arvados-src 'dir' "$PKG_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" + 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 @@ -295,7 +283,7 @@ package_go_binary services/crunch-dispatch-local crunch-dispatch-local \ "Dispatch Crunch containers on the local system" package_go_binary services/crunch-dispatch-slurm crunch-dispatch-slurm \ "Dispatch Crunch containers to a SLURM cluster" -package_go_binary services/crunch-run crunch-run \ +package_go_binary cmd/arvados-server crunch-run \ "Supervise a single Crunch container" package_go_binary services/crunchstat crunchstat \ "Gather cpu/memory/network statistics of running Crunch jobs" @@ -309,7 +297,7 @@ package_go_binary services/keepstore keepstore \ "Keep storage daemon, accessible to clients on the LAN" package_go_binary services/keep-web keep-web \ "Static web hosting service for user data stored in Arvados Keep" -package_go_binary services/ws arvados-ws \ +package_go_binary cmd/arvados-server arvados-ws \ "Arvados Websocket server" package_go_binary tools/sync-groups arvados-sync-groups \ "Synchronize remote groups into Arvados from an external source" @@ -319,31 +307,27 @@ package_go_binary tools/keep-rsync keep-rsync \ "Copy all data from one set of Keep servers to another" package_go_binary tools/keep-exercise keep-exercise \ "Performance testing tool for Arvados Keep" +package_go_so lib/pam pam_arvados.so libpam-arvados-go \ + "Arvados PAM authentication module" -# The Python SDK - Should be built first because it's needed by others -fpm_build_virtualenv "arvados-python-client" "sdk/python" - -# Arvados cwl runner -fpm_build_virtualenv "arvados-cwl-runner" "sdk/cwl" - -# The PAM module -fpm_build_virtualenv "libpam-arvados" "sdk/pam" +# The Python SDK - Python3 package +fpm_build_virtualenv "arvados-python-client" "sdk/python" "python3" -# The FUSE driver -fpm_build_virtualenv "arvados-fuse" "services/fuse" +# Arvados cwl runner - Python3 package +fpm_build_virtualenv "arvados-cwl-runner" "sdk/cwl" "python3" -# The node manager -fpm_build_virtualenv "arvados-node-manager" "services/nodemanager" +# The FUSE driver - Python3 package +fpm_build_virtualenv "arvados-fuse" "services/fuse" "python3" # The Arvados crunchstat-summary tool -fpm_build_virtualenv "crunchstat-summary" "tools/crunchstat-summary" - -# The Python SDK - Python3 package -fpm_build_virtualenv "arvados-python-client" "sdk/python" "python3" +fpm_build_virtualenv "crunchstat-summary" "tools/crunchstat-summary" "python3" # The Docker image cleaner fpm_build_virtualenv "arvados-docker-cleaner" "services/dockercleaner" "python3" +# The Arvados user activity tool +fpm_build_virtualenv "arvados-user-activity" "tools/user-activity" "python3" + # The cwltest package, which lives out of tree cd "$WORKSPACE" if [[ -e "$WORKSPACE/cwltest" ]]; then @@ -352,7 +336,7 @@ fi git clone https://github.com/common-workflow-language/cwltest.git # 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" +fpm_build_virtualenv "cwltest" "cwltest" "python3" rm -rf "$WORKSPACE/cwltest" calculate_go_package_version arvados_server_version cmd/arvados-server