X-Git-Url: https://git.arvados.org/arvados-dev.git/blobdiff_plain/cd13ebefd14bc536d069f395bc866e902550ffff..501a707f36ac0b2ac13dc074020641b58128e175:/jenkins/run-build-packages.sh?ds=sidebyside diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh index 99d0681..1dae4bc 100755 --- a/jenkins/run-build-packages.sh +++ b/jenkins/run-build-packages.sh @@ -94,6 +94,15 @@ version_from_git() { echo "0.1.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).$git_hash" } +timestamp_from_git() { + # Generates a version number from the git log for the current working + # directory, and writes it to stdout. + local git_ts git_hash + declare $(TZ=UTC git log -n1 --first-parent --max-count=1 \ + --format=format:"git_ts=%ct git_hash=%h" .) + echo "$git_ts" +} + handle_python_package () { # This function assumes the current working directory is the python package directory if [[ "$UPLOAD" != 0 ]]; then @@ -199,7 +208,9 @@ build_and_scp_deb () { fi } -source /etc/profile.d/rvm.sh +if [[ -f /etc/profile.d/rvm.sh ]]; then + source /etc/profile.d/rvm.sh +fi # Make all files world-readable -- jenkins runs with umask 027, and has checked # out our git tree here @@ -301,7 +312,6 @@ if [[ "$DEBUG" != 0 ]]; then fi cd "$WORKSPACE" -PKG_VERSION=$(version_from_git) cd sdk/python handle_python_package @@ -343,6 +353,8 @@ else fi # Build arvados src deb package +cd "$WORKSPACE" +PKG_VERSION=$(version_from_git) cd $WORKSPACE/debs build_and_scp_deb $WORKSPACE/src-build-dir/=/usr/local/arvados/src arvados-src 'Curoverse, Inc.' '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" @@ -360,16 +372,34 @@ mkdir -p "$GOPATH/src/git.curoverse.com" ln -sfn "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git" # keepstore +cd "$GOPATH/src/git.curoverse.com/arvados.git/services/keepstore" +PKG_VERSION=$(version_from_git) go get "git.curoverse.com/arvados.git/services/keepstore" cd $WORKSPACE/debs build_and_scp_deb $GOPATH/bin/keepstore=/usr/bin/keepstore keepstore 'Curoverse, Inc.' 'dir' "$PKG_VERSION" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=Keepstore is the Keep storage daemon, accessible to clients on the LAN" # keepproxy +cd "$GOPATH/src/git.curoverse.com/arvados.git/sdk/go" +GO_SDK_VERSION=$(version_from_git) +GO_SDK_TIMESTAMP=$(timestamp_from_git) + +cd "$GOPATH/src/git.curoverse.com/arvados.git/services/keepproxy" +KEEPPROXY_VERSION=$(version_from_git) +KEEPPROXY_TIMESTAMP=$(timestamp_from_git) + +if [[ "$GO_SDK_TIMESTAMP" -gt "$KEEPPROXY_TIMESTAMP" ]]; then + PKG_VERSION=$GO_SDK_VERSION +else + PKG_VERSION=$KEEPPROXY_VERSION +fi + go get "git.curoverse.com/arvados.git/services/keepproxy" cd $WORKSPACE/debs build_and_scp_deb $GOPATH/bin/keepproxy=/usr/bin/keepproxy keepproxy 'Curoverse, Inc.' 'dir' "$PKG_VERSION" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=Keepproxy makes a Keep cluster accessible to clients that are not on the LAN" # crunchstat +cd "$GOPATH/src/git.curoverse.com/arvados.git/services/crunchstat" +PKG_VERSION=$(version_from_git) go get "git.curoverse.com/arvados.git/services/crunchstat" cd $WORKSPACE/debs build_and_scp_deb $GOPATH/bin/crunchstat=/usr/bin/crunchstat crunchstat 'Curoverse, Inc.' 'dir' "$PKG_VERSION" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=Crunchstat gathers cpu/memory/network statistics of running Crunch jobs" @@ -382,17 +412,23 @@ build_and_scp_deb $GOPATH/bin/crunchstat=/usr/bin/crunchstat crunchstat 'Curover # whip up a patch and send it upstream, but that will be for another day. Ward, # 2014-05-15 cd $WORKSPACE/debs -build_and_scp_deb $WORKSPACE/sdk/python python-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" +# Python version numbering is obscure. Strip dashes and replace them with dots +# to match our other version numbers. Cf. commit 4afcb8c, compliance with PEP-440. +build_and_scp_deb $WORKSPACE/sdk/python python-arvados-python-client 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){ gsub(/-/,".",$2); print $2 }' $WORKSPACE/sdk/python/arvados_python_client.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados Python SDK" # The FUSE driver # Please seem comment about --no-python-fix-name above; we stay consistent and do # not omit the python- prefix first. cd $WORKSPACE/debs -build_and_scp_deb $WORKSPACE/services/fuse python-arvados-fuse 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/fuse/arvados_fuse.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Keep FUSE driver" +# Python version numbering is obscure. Strip dashes and replace them with dots +# to match our other version numbers. Cf. commit 4afcb8c, compliance with PEP-440. +build_and_scp_deb $WORKSPACE/services/fuse python-arvados-fuse 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){ gsub(/-/,".",$2); print $2 }' $WORKSPACE/services/fuse/arvados_fuse.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Keep FUSE driver" # The node manager cd $WORKSPACE/debs -build_and_scp_deb $WORKSPACE/services/nodemanager arvados-node-manager 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/nodemanager/arvados_node_manager.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados node manager" +# Python version numbering is obscure. Strip dashes and replace them with dots +# to match our other version numbers. Cf. commit 4afcb8c, compliance with PEP-440. +build_and_scp_deb $WORKSPACE/services/nodemanager arvados-node-manager 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){ gsub(/-/,".",$2); print $2}' $WORKSPACE/services/nodemanager/arvados_node_manager.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados node manager" # A few dependencies for deppkg in python-gflags pyvcf google-api-python-client oauth2client \ @@ -407,9 +443,9 @@ if [[ ! -d "$WORKSPACE/common-workflow-language" ]]; then mkdir "$WORKSPACE/common-workflow-language" cd "$WORKSPACE" if [[ "$DEBUG" != 0 ]]; then - git clone https://github.com/rabix/common-workflow-language.git common-workflow-language + git clone https://github.com/common-workflow-language/common-workflow-language.git common-workflow-language else - git clone -q https://github.com/rabix/common-workflow-language.git common-workflow-language + git clone -q https://github.com/common-workflow-language/common-workflow-language.git common-workflow-language fi fi @@ -428,8 +464,9 @@ CWLTOOL_VERSION=`git log --first-parent --max-count=1 --format='format:0.1.%ct.% # Build cwltool package cd $WORKSPACE/debs - -build_and_scp_deb $WORKSPACE/common-workflow-language/reference cwltool 'Common Workflow Language Working Group' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/common-workflow-language/reference/cwltool.egg-info/PKG-INFO)" +# Python version numbering is obscure. Strip dashes and replace them with dots +# to match our other version numbers. Cf. commit 4afcb8c, compliance with PEP-440. +build_and_scp_deb $WORKSPACE/common-workflow-language/reference cwltool 'Common Workflow Language Working Group' 'python' "$(awk '($1 == "Version:"){ gsub(/-/,".",$2); print $2 }' $WORKSPACE/common-workflow-language/reference/cwltool.egg-info/PKG-INFO)" # Finally, publish the packages, if necessary if [[ "$UPLOAD" != 0 && "$CALL_FREIGHT" != 0 ]]; then