projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7593: Add sdk/cwl to package building.
[arvados.git]
/
jenkins
/
run-build-packages.sh
diff --git
a/jenkins/run-build-packages.sh
b/jenkins/run-build-packages.sh
index fcebf6c45cab14922d32d4953bf9248f19a3c030..b4d97e035dd0567cd20f1f5bff01abc70457b9ca 100755
(executable)
--- a/
jenkins/run-build-packages.sh
+++ b/
jenkins/run-build-packages.sh
@@
-1,6
+1,7
@@
#!/bin/bash
#!/bin/bash
-. ./run-library.sh
+. `dirname "$(readlink -f "$0")"`/run-library.sh
+. `dirname "$(readlink -f "$0")"`/libcloud-pin
read -rd "\000" helpmessage <<EOF
$(basename $0): Build Arvados packages
read -rd "\000" helpmessage <<EOF
$(basename $0): Build Arvados packages
@@
-95,7
+96,7
@@
case "$TARGET" in
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py \
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py \
-
virtualenv
pykka requests six pyexecjs jsonschema \
+ pykka requests six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@
-108,7
+109,7
@@
case "$TARGET" in
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py \
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py \
-
virtualenv
pykka requests six pyexecjs jsonschema \
+ pykka requests six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@
-121,7
+122,7
@@
case "$TARGET" in
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py \
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py \
-
virtualenv
pykka requests six pyexecjs jsonschema \
+ pykka requests six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@
-147,8
+148,8
@@
case "$TARGET" in
rsa uritemplate httplib2 ws4py \
pykka requests six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname pycurl
rsa uritemplate httplib2 ws4py \
pykka requests six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname pycurl
- python-daemon lockfile llfuse)
- PYTHON3_BACKPORTS=(docker-py six requests)
+ python-daemon lockfile llfuse
'pbr<1.0'
)
+ PYTHON3_BACKPORTS=(docker-py six requests
websocket-client
)
export PYCURL_SSL_LIBRARY=nss
;;
*)
export PYCURL_SSL_LIBRARY=nss
;;
*)
@@
-256,6
+257,9
@@
handle_python_package
cd "$WORKSPACE/sdk/python"
handle_python_package
cd "$WORKSPACE/sdk/python"
handle_python_package
+cd "$WORKSPACE/sdk/cwl"
+handle_python_package
+
cd "$WORKSPACE/services/fuse"
handle_python_package
cd "$WORKSPACE/services/fuse"
handle_python_package
@@
-270,6
+274,8
@@
handle_python_package
COMMIT_HASH=$(format_last_commit_here "%H")
SRC_BUILD_DIR=$(mktemp -d)
COMMIT_HASH=$(format_last_commit_here "%H")
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"
git clone $DASHQ_UNLESS_DEBUG "$WORKSPACE/.git" "$SRC_BUILD_DIR"
cd "$SRC_BUILD_DIR"
@@
-394,10
+400,14
@@
LIBCLOUD_DIR=$(mktemp -d)
(
cd $LIBCLOUD_DIR
git clone $DASHQ_UNLESS_DEBUG https://github.com/curoverse/libcloud.git .
(
cd $LIBCLOUD_DIR
git clone $DASHQ_UNLESS_DEBUG https://github.com/curoverse/libcloud.git .
- git checkout apache-libcloud-0.18.1.dev1
+ git checkout apache-libcloud-$LIBCLOUD_PIN
+ # libcloud is absurdly noisy without -q, so force -q here
+ OLD_DASHQ_UNLESS_DEBUG=$DASHQ_UNLESS_DEBUG
+ DASHQ_UNLESS_DEBUG=-q
handle_python_package
handle_python_package
+ DASHQ_UNLESS_DEBUG=$OLD_DASHQ_UNLESS_DEBUG
)
)
-fpm_build $LIBCLOUD_DIR
python
-apache-libcloud
+fpm_build $LIBCLOUD_DIR
"$PYTHON2_PKG_PREFIX"
-apache-libcloud
rm -rf $LIBCLOUD_DIR
# A few dependencies
rm -rf $LIBCLOUD_DIR
# A few dependencies