X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/dfb9598282b677ead60f91c14f5e96405735d42f..5d56a1af42f64df57ef7a1bcef6d016ff2310900:/build/run-build-packages.sh diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh index 3173aa7057..7829c8c6cd 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 <" -VENDOR="Veritas Genetics, Inc." +MAINTAINER="Arvados Package Maintainers " +VENDOR="The Arvados Project" # End of user configuration @@ -102,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 @@ -129,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 ;; @@ -223,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/" @@ -268,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 @@ -288,6 +277,8 @@ package_go_binary cmd/arvados-server arvados-controller \ "Arvados cluster controller daemon" package_go_binary cmd/arvados-server arvados-dispatch-cloud \ "Arvados cluster cloud dispatch" +package_go_binary cmd/arvados-server arvados-dispatch-lsf \ + "Dispatch Arvados containers to an LSF cluster" package_go_binary services/arv-git-httpd arvados-git-httpd \ "Provide authenticated http access to Arvados-hosted git repositories" package_go_binary services/crunch-dispatch-local crunch-dispatch-local \ @@ -308,7 +299,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" @@ -318,31 +309,35 @@ 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 python->python3 metapackages +build_metapackage "arvados-fuse" "services/fuse" +build_metapackage "arvados-python-client" "services/fuse" +build_metapackage "arvados-cwl-runner" "sdk/cwl" +build_metapackage "crunchstat-summary" "tools/crunchstat-summary" +build_metapackage "arvados-docker-cleaner" "services/dockercleaner" +build_metapackage "arvados-user-activity" "tools/user-activity" + # The cwltest package, which lives out of tree cd "$WORKSPACE" if [[ -e "$WORKSPACE/cwltest" ]]; then @@ -351,7 +346,10 @@ 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" +# The python->python3 metapackage +build_metapackage "cwltest" "cwltest" +cd "$WORKSPACE" rm -rf "$WORKSPACE/cwltest" calculate_go_package_version arvados_server_version cmd/arvados-server @@ -405,8 +403,8 @@ if [[ "$?" == "0" ]] ; then 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 - RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake npm:install >"$STDOUT_IF_DEBUG" - RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake assets:precompile >"$STDOUT_IF_DEBUG" + 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/