X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bdbf7c4ee346fd1615f882255b3606d8d5360710..2e74236fa27822addd856f194befc28382990ce0:/build/run-build-docker-jobs-image.sh diff --git a/build/run-build-docker-jobs-image.sh b/build/run-build-docker-jobs-image.sh index 7186a22091..a7e3ee5466 100755 --- a/build/run-build-docker-jobs-image.sh +++ b/build/run-build-docker-jobs-image.sh @@ -5,21 +5,24 @@ function usage { echo >&2 - echo >&2 "usage: $0 [options]" + echo >&2 "usage: WORKSPACE=/path/to/arvados $0 [options]" echo >&2 echo >&2 "$0 options:" echo >&2 " -t, --tags version tag for docker" + echo >&2 " -r, --repo Arvados package repo to use: dev (default), testing, stable" echo >&2 " -u, --upload Upload the images (docker push)" echo >&2 " --no-cache Don't use build cache" echo >&2 " -h, --help Display this help and exit" echo >&2 - echo >&2 " If no options are given, just builds the images." + echo >&2 " WORKSPACE=path Path to the Arvados source tree to build from" + echo >&2 } upload=false +REPO=dev # NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros). -TEMP=`getopt -o hut: \ - --long help,upload,no-cache,tags: \ +TEMP=`getopt -o hut:r: \ + --long help,upload,no-cache,tags:,repo: \ -n "$0" -- "$@"` if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi @@ -50,6 +53,19 @@ do ;; esac ;; + -r | --repo) + case "$2" in + "") + echo "ERROR: --repo needs a parameter"; + usage; + exit 1 + ;; + *) + REPO="$2"; + shift 2 + ;; + esac + ;; --) shift break @@ -69,6 +85,16 @@ exit_cleanly() { exit $EXITCODE } +# Sanity check +if ! [[ -n "$WORKSPACE" ]]; then + usage; + echo >&2 "Error: WORKSPACE environment variable not set" + echo >&2 + exit 1 +fi + +echo $WORKSPACE + COLUMNS=80 . $WORKSPACE/build/run-library.sh @@ -88,16 +114,6 @@ docker_push () { checkexit $ECODE "docker push $*" } -# Sanity check -if ! [[ -n "$WORKSPACE" ]]; then - echo >&2 - echo >&2 "Error: WORKSPACE environment variable not set" - echo >&2 - exit 1 -fi - -echo $WORKSPACE - # find the docker binary DOCKER=`which docker.io` @@ -119,41 +135,51 @@ timer_reset cd "$WORKSPACE" if [[ -z "$ARVADOS_BUILDING_VERSION" ]] && ! [[ -z "$version_tag" ]]; then - ARVADOS_BUILDING_VERSION="$version_tag" - ARVADOS_BUILDING_ITERATION="1" + export ARVADOS_BUILDING_VERSION="$version_tag" + export ARVADOS_BUILDING_ITERATION="1" fi -python_sdk_ts=$(cd sdk/python && timestamp_from_git) -cwl_runner_ts=$(cd sdk/cwl && timestamp_from_git) - -python_sdk_version=$(cd sdk/python && nohash_version_from_git 0.1) -cwl_runner_version=$(cd sdk/cwl && nohash_version_from_git 1.0) +# This defines python_sdk_version and cwl_runner_version with python-style +# package suffixes (.dev/rc) +calculate_python_sdk_cwl_package_versions -if [[ $python_sdk_ts -gt $cwl_runner_ts ]]; then - cwl_runner_version=$(cd sdk/python && nohash_version_from_git 1.0) +if [[ -z "$cwl_runner_version" ]]; then + echo "ERROR: cwl_runner_version is empty"; + exit 1 fi echo cwl_runner_version $cwl_runner_version python_sdk_version $python_sdk_version +# For development and release candidate packages, the OS package has a "~dev" +# or "~rc" suffix, but Python requires a ".dev" or "rc" suffix. +# +# Arvados-cwl-runner will be expecting the Python-compatible version string +# when it tries to pull the Docker image, so we use that to tag the Docker +# image. +# +# The --build-arg docker invocation arguments are expecting the OS package +# version. +python_sdk_version_os=$(echo -n $python_sdk_version | sed s/.dev/~dev/g | sed s/rc/~rc/g) +cwl_runner_version_os=$(echo -n $cwl_runner_version | sed s/.dev/~dev/g | sed s/rc/~rc/g) + if [[ "${python_sdk_version}" != "${ARVADOS_BUILDING_VERSION}" ]]; then - python_sdk_version="${python_sdk_version}-1" + python_sdk_version_os="${python_sdk_version_os}-1" else - python_sdk_version="${ARVADOS_BUILDING_VERSION}-${ARVADOS_BUILDING_ITERATION}" + python_sdk_version_os="${ARVADOS_BUILDING_VERSION}-${ARVADOS_BUILDING_ITERATION}" fi -cwl_runner_version_orig=$cwl_runner_version - -if [[ "${cwl_runner_version}" != "${ARVADOS_BUILDING_VERSION}" ]]; then - cwl_runner_version="${cwl_runner_version}-1" +if [[ "${cwl_runner_version_os}" != "${ARVADOS_BUILDING_VERSION}" ]]; then + cwl_runner_version_os="${cwl_runner_version_os}-1" else - cwl_runner_version="${ARVADOS_BUILDING_VERSION}-${ARVADOS_BUILDING_ITERATION}" + cwl_runner_version_os="${ARVADOS_BUILDING_VERSION}-${ARVADOS_BUILDING_ITERATION}" fi cd docker/jobs docker build $NOCACHE \ - --build-arg python_sdk_version=${python_sdk_version} \ - --build-arg cwl_runner_version=${cwl_runner_version} \ - -t arvados/jobs:$cwl_runner_version_orig . + --build-arg python_sdk_version=${python_sdk_version_os} \ + --build-arg cwl_runner_version=${cwl_runner_version_os} \ + --build-arg repo_version=${REPO} \ + -t arvados/jobs:$cwl_runner_version . ECODE=$? @@ -175,38 +201,19 @@ if docker --version |grep " 1\.[0-9]\." ; then # -f flag removed in Docker 1.12 FORCE=-f fi -if ! [[ -z "$version_tag" ]]; then - docker tag $FORCE arvados/jobs:$cwl_runner_version_orig arvados/jobs:"$version_tag" -else - docker tag $FORCE arvados/jobs:$cwl_runner_version_orig arvados/jobs:latest -fi - -ECODE=$? - -if [[ "$ECODE" != "0" ]]; then - EXITCODE=$(($EXITCODE + $ECODE)) -fi - -checkexit $ECODE "docker tag" -title "docker tag complete (`timer`)" title "uploading images" timer_reset -if [[ "$ECODE" != "0" ]]; then +if [[ "$EXITCODE" != "0" ]]; then title "upload arvados images SKIPPED because build or tag failed" else if [[ $upload == true ]]; then ## 20150526 nico -- *sometimes* dockerhub needs re-login ## even though credentials are already in .dockercfg docker login -u arvados - if ! [[ -z "$version_tag" ]]; then - docker_push arvados/jobs:"$version_tag" - else - docker_push arvados/jobs:$cwl_runner_version_orig - docker_push arvados/jobs:latest - fi + docker_push arvados/jobs:$cwl_runner_version title "upload arvados images finished (`timer`)" else title "upload arvados images SKIPPED because no --upload option set (`timer`)"