X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9e2e220996943f6de9a059a6b57c458f60f10e8e..2af7b0336b2b92e38f6966b8bbc233c05704815d:/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 1519e795a4..9d7e3777cd 100755 --- a/build/run-build-docker-jobs-image.sh +++ b/build/run-build-docker-jobs-image.sh @@ -1,22 +1,28 @@ #!/bin/bash +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 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 @@ -42,7 +48,20 @@ do exit 1 ;; *) - echo "WARNING: --tags is deprecated and doesn't do anything"; + version_tag="$2"; + shift 2 + ;; + esac + ;; + -r | --repo) + case "$2" in + "") + echo "ERROR: --repo needs a parameter"; + usage; + exit 1 + ;; + *) + REPO="$2"; shift 2 ;; esac @@ -66,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 @@ -85,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` @@ -115,26 +134,40 @@ timer_reset # clean up the docker build environment cd "$WORKSPACE" -python_sdk_ts=$(cd sdk/python && timestamp_from_git) -cwl_runner_ts=$(cd sdk/cwl && timestamp_from_git) +if [[ -z "$ARVADOS_BUILDING_VERSION" ]] && ! [[ -z "$version_tag" ]]; then + ARVADOS_BUILDING_VERSION="$version_tag" + ARVADOS_BUILDING_ITERATION="1" +fi + +calculate_python_sdk_cwl_package_versions -python_sdk_version=$(cd sdk/python && nohash_version_from_git 0.1)-2 -cwl_runner_version=$(cd sdk/cwl && nohash_version_from_git 1.0)-3 +echo cwl_runner_version $cwl_runner_version python_sdk_version $python_sdk_version -if [[ $python_sdk_ts -gt $cwl_runner_ts ]]; then - cwl_runner_version=$(cd sdk/python && nohash_version_from_git 1.0)-3 - gittag=$(cd sdk/python && git log --first-parent --max-count=1 --format=format:%H) +if [[ "${python_sdk_version}" != "${ARVADOS_BUILDING_VERSION}" ]]; then + python_sdk_version="${python_sdk_version}-1" else - gittag=$(cd sdk/cwl && git log --first-parent --max-count=1 --format=format:%H) + python_sdk_version="${ARVADOS_BUILDING_VERSION}-${ARVADOS_BUILDING_ITERATION}" fi -echo cwl_runner_version $cwl_runner_version python_sdk_version $python_sdk_version +# What we use to tag the Docker image. For release candidate +# packages, the OS package has a "~rc" suffix, but Python requires +# just an "rc" suffix. Arvados-cwl-runner will be expecting the +# Python-compatible version string when it tries to pull the Docker +# image, but --build-arg is expecting the OS package version. +cwl_runner_version_tag=$(echo -n $cwl_runner_version | sed s/~rc/rc/g) + +if [[ "${cwl_runner_version}" != "${ARVADOS_BUILDING_VERSION}" ]]; then + cwl_runner_version="${cwl_runner_version}-1" +else + cwl_runner_version="${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:$gittag . + --build-arg python_sdk_version=${python_sdk_version} \ + --build-arg cwl_runner_version=${cwl_runner_version} \ + --build-arg repo_version=${REPO} \ + -t arvados/jobs:$cwl_runner_version_tag . ECODE=$? @@ -157,31 +190,34 @@ if docker --version |grep " 1\.[0-9]\." ; then FORCE=-f fi -docker tag $FORCE arvados/jobs:$gittag arvados/jobs:latest +if ! [[ -z "$version_tag" ]]; then + docker tag $FORCE arvados/jobs:$cwl_runner_version_tag arvados/jobs:"$version_tag" + ECODE=$? -ECODE=$? + if [[ "$ECODE" != "0" ]]; then + EXITCODE=$(($EXITCODE + $ECODE)) + fi -if [[ "$ECODE" != "0" ]]; then - EXITCODE=$(($EXITCODE + $ECODE)) + checkexit $ECODE "docker tag" + title "docker tag complete (`timer`)" 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 - - docker_push arvados/jobs:$gittag - docker_push arvados/jobs:latest + if ! [[ -z "$version_tag" ]]; then + docker_push arvados/jobs:"$version_tag" + else + docker_push arvados/jobs:$cwl_runner_version_tag + fi title "upload arvados images finished (`timer`)" else title "upload arvados images SKIPPED because no --upload option set (`timer`)"