From: Guillaume Abrioux Date: Wed, 6 Dec 2017 14:20:38 +0000 (+0100) Subject: ceph-ansible: get CEPH_STABLE_RELEASE back to tox X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F929%2Fhead;p=ceph-build.git ceph-ansible: get CEPH_STABLE_RELEASE back to tox get CEPH_STABLE_RELEASE back to tox.ini so we do not have to set explicitely CEPH_STABLE_RELEASE when running test locally. Signed-off-by: Guillaume Abrioux --- diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index 6b8353b59..fad4a9d31 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -513,11 +513,10 @@ update_vagrant_boxes() { start_tox() { # $1 = CEPH_DOCKER_IMAGE_TAG -# $2 = CEPH_STABLE_RELEASE (default value to $RELEASE which is injected by the job template) # the $SCENARIO var is injected by the job template. It maps # to an actual, defined, tox environment local release=${2:-$RELEASE} - if ! CEPH_DOCKER_IMAGE_TAG=$1 CEPH_STABLE_RELEASE=$release timeout 3h $VENV/tox -rv -e=$RELEASE-$ANSIBLE_VERSION-$SCENARIO --workdir=$WORKDIR -- --provider=libvirt; then + if ! CEPH_DOCKER_IMAGE_TAG=$1 timeout 3h $VENV/tox -rv -e=$RELEASE-$ANSIBLE_VERSION-$SCENARIO --workdir=$WORKDIR -- --provider=libvirt; then echo "ERROR: Job didn't complete successfully or got stuck for more than 3h." exit 1 fi