]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-ansible: get CEPH_STABLE_RELEASE back to tox 929/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Wed, 6 Dec 2017 14:20:38 +0000 (15:20 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Tue, 12 Dec 2017 08:40:11 +0000 (09:40 +0100)
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 <gabrioux@redhat.com>
scripts/build_utils.sh

index 6b8353b5978a301dca8d85fb9e84cab131b244af..fad4a9d31aef352907f1b16a07297a36274d8493 100644 (file)
@@ -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