Merge branch '8345-llfuse-unpin' refs #8345

diff --git a/jenkins/package-build-dockerfiles/Makefile b/jenkins/package-build-dockerfiles/Makefile
index 70fbf282e666ddf5ee8b18e732ebff18af050cce..9216f8264bc7eef940fe6a3a1a3dcf147def239f 100644 (file)
--- a/jenkins/package-build-dockerfiles/Makefile
+++ b/jenkins/package-build-dockerfiles/Makefile
@@ -23,7 +23,7 @@ ubuntu1404/generated: common-generated-all
 common-generated-all: common-generated/golang-amd64.tar.gz
 
 common-generated/golang-amd64.tar.gz: common-generated
-       wget -cqO common-generated/golang-amd64.tar.gz https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
+       wget -cqO common-generated/golang-amd64.tar.gz http://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
 
 common-generated:
        mkdir common-generated

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 061bc99a627d50dde03d04b6f4f02d7a6d1a4a64..697092966bda6575d0ddaaafac635841555de650 100755 (executable)
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -398,6 +398,11 @@ cd $WORKSPACE/packages/$TARGET
 rm -rf "$WORKSPACE/sdk/python/build"
 fpm_build $WORKSPACE/sdk/python "${PYTHON2_PKG_PREFIX}-arvados-python-client" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/python/arvados_python_client.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados Python SDK" --deb-recommends=git
 
+# cwl-runner
+cd $WORKSPACE/packages/$TARGET
+rm -rf "$WORKSPACE/sdk/cwl/build"
+fpm_build $WORKSPACE/sdk/cwl "${PYTHON2_PKG_PREFIX}-arvados-cwl-runner" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/cwl/arvados_cwl_runner.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados CWL runner"
+
 # The PAM module
 if [[ $TARGET =~ debian|ubuntu ]]; then
     cd $WORKSPACE/packages/$TARGET

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 07a4bf48980823310db3bda767418f8a6c09191c..41b237bc7f8c88f4d31686ac87afee3be46bcfdd 100755 (executable)
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -79,6 +79,7 @@ sdk/go/manifest
 sdk/go/blockdigest
 sdk/go/streamer
 sdk/go/crunchrunner
+sdk/cwl
 tools/crunchstat-summary
 tools/keep-rsync
 
@@ -651,6 +652,7 @@ declare -a pythonstuff
 pythonstuff=(
     sdk/pam
     sdk/python
+    sdk/cwl
     services/fuse
     services/nodemanager
     tools/crunchstat-summary