projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15649-libcloud-azure'
[arvados.git]
/
build
/
run-build-packages-python-and-ruby.sh
diff --git
a/build/run-build-packages-python-and-ruby.sh
b/build/run-build-packages-python-and-ruby.sh
index 8d593ac3c7e6d8d4035d30ee2cc3f298f89084a8..f9b61179cae7d21f9e0129bb6d4b00c3d9f64a32 100755
(executable)
--- a/
build/run-build-packages-python-and-ruby.sh
+++ b/
build/run-build-packages-python-and-ruby.sh
@@
-1,9
+1,12
@@
#!/bin/bash
#!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
COLUMNS=80
. `dirname "$(readlink -f "$0")"`/run-library.sh
COLUMNS=80
. `dirname "$(readlink -f "$0")"`/run-library.sh
-#. `dirname "$(readlink -f "$0")"`/libcloud-pin
+#. `dirname "$(readlink -f "$0")"`/libcloud-pin
.sh
read -rd "\000" helpmessage <<EOF
$(basename $0): Build Arvados Python packages and Ruby gems
read -rd "\000" helpmessage <<EOF
$(basename $0): Build Arvados Python packages and Ruby gems
@@
-23,12
+26,10
@@
WORKSPACE=path Path to the Arvados source tree to build packages from
EOF
EOF
-EXITCODE=0
-
exit_cleanly() {
trap - INT
report_outcomes
exit_cleanly() {
trap - INT
report_outcomes
- exit $
EXITCODE
+ exit $
{#failures[@]}
}
gem_wrapper() {
}
gem_wrapper() {
@@
-53,6
+54,9
@@
python_wrapper() {
timer_reset
cd "$package_directory"
timer_reset
cd "$package_directory"
+ if [[ $DEBUG > 0 ]]; then
+ echo `pwd`
+ fi
handle_python_package
checkexit $? "$package_name python package build"
handle_python_package
checkexit $? "$package_name python package build"
@@
-114,9
+118,6
@@
if [[ "$DEBUG" != 0 ]]; then
DASHQ_UNLESS_DEBUG=
fi
DASHQ_UNLESS_DEBUG=
fi
-EASY_INSTALL2=$(find_easy_install -$PYTHON2_VERSION "")
-EASY_INSTALL3=$(find_easy_install -$PYTHON3_VERSION 3)
-
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
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
@@
-140,6
+141,7
@@
fi
chmod o+r "$WORKSPACE" -R
# More cleanup - make sure all executables that we'll package are 755
chmod o+r "$WORKSPACE" -R
# More cleanup - make sure all executables that we'll package are 755
+cd "$WORKSPACE"
find -type d -name 'bin' |xargs -I {} find {} -type f |xargs -I {} chmod 755 {}
# Now fix our umask to something better suited to building and publishing
find -type d -name 'bin' |xargs -I {} find {} -type f |xargs -I {} chmod 755 {}
# Now fix our umask to something better suited to building and publishing
@@
-148,8
+150,6
@@
umask 0022
debug_echo "umask is" `umask`
debug_echo "umask is" `umask`
-FPM_GEM_PREFIX=$($GEM environment gemdir)
-
gem_wrapper arvados "$WORKSPACE/sdk/ruby"
gem_wrapper arvados-cli "$WORKSPACE/sdk/cli"
gem_wrapper arvados-login-sync "$WORKSPACE/services/login-sync"
gem_wrapper arvados "$WORKSPACE/sdk/ruby"
gem_wrapper arvados-cli "$WORKSPACE/sdk/cli"
gem_wrapper arvados-login-sync "$WORKSPACE/services/login-sync"
@@
-159,8
+159,8
@@
if [ ${#failures[@]} -ne 0 ]; then
GEM_BUILD_FAILURES=${#failures[@]}
fi
GEM_BUILD_FAILURES=${#failures[@]}
fi
-python_wrapper arvados-pam "$WORKSPACE/sdk/pam"
python_wrapper arvados-python-client "$WORKSPACE/sdk/python"
python_wrapper arvados-python-client "$WORKSPACE/sdk/python"
+python_wrapper arvados-pam "$WORKSPACE/sdk/pam"
python_wrapper arvados-cwl-runner "$WORKSPACE/sdk/cwl"
python_wrapper arvados_fuse "$WORKSPACE/services/fuse"
python_wrapper arvados-node-manager "$WORKSPACE/services/nodemanager"
python_wrapper arvados-cwl-runner "$WORKSPACE/sdk/cwl"
python_wrapper arvados_fuse "$WORKSPACE/services/fuse"
python_wrapper arvados-node-manager "$WORKSPACE/services/nodemanager"
@@
-171,11
+171,22
@@
if [ $((${#failures[@]} - $GEM_BUILD_FAILURES)) -ne 0 ]; then
fi
if [[ "$UPLOAD" != 0 ]]; then
fi
if [[ "$UPLOAD" != 0 ]]; then
+
+ if [[ $DEBUG > 0 ]]; then
+ EXTRA_UPLOAD_FLAGS=" --verbose"
+ else
+ EXTRA_UPLOAD_FLAGS=""
+ fi
+
+ if [[ ! -e "$WORKSPACE/packages" ]]; then
+ mkdir -p "$WORKSPACE/packages"
+ fi
+
title "Start upload python packages"
timer_reset
title "Start upload python packages"
timer_reset
- if [ "$
GEM
_BUILD_FAILURES" -eq 0 ]; then
- /usr/local/arvados-dev/jenkins/run_upload_packages.py --workspace $WORKSPACE python
+ if [ "$
PYTHON
_BUILD_FAILURES" -eq 0 ]; then
+ /usr/local/arvados-dev/jenkins/run_upload_packages.py
$EXTRA_UPLOAD_FLAGS
--workspace $WORKSPACE python
else
echo "Skipping python packages upload, there were errors building the packages"
fi
else
echo "Skipping python packages upload, there were errors building the packages"
fi
@@
-185,8
+196,8
@@
if [[ "$UPLOAD" != 0 ]]; then
title "Start upload ruby gems"
timer_reset
title "Start upload ruby gems"
timer_reset
- if [ "$
PYTHON
_BUILD_FAILURES" -eq 0 ]; then
- /usr/local/arvados-dev/jenkins/run_upload_packages.py --workspace $WORKSPACE gems
+ if [ "$
GEM
_BUILD_FAILURES" -eq 0 ]; then
+ /usr/local/arvados-dev/jenkins/run_upload_packages.py
$EXTRA_UPLOAD_FLAGS
--workspace $WORKSPACE gems
else
echo "Skipping ruby gem upload, there were errors building the packages"
fi
else
echo "Skipping ruby gem upload, there were errors building the packages"
fi