From 2493fbe9083ea1d98777d5933d575e12d00d1498 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 10 Nov 2017 18:22:22 +0100 Subject: [PATCH] ceph-ansible: set CEPH_STABLE_RELEASE in start_tox() according to ceph/ceph-ansible#2165 we need to set `CEPH_STABLE_RELEASE` in ceph/ceph-build. Signed-off-by: Guillaume Abrioux --- ceph-ansible-nightly/build/build | 4 +++- scripts/build_utils.sh | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ceph-ansible-nightly/build/build b/ceph-ansible-nightly/build/build index ad5b0547..9e0a7000 100644 --- a/ceph-ansible-nightly/build/build +++ b/ceph-ansible-nightly/build/build @@ -17,7 +17,9 @@ update_vagrant_boxes if [ "$RELEASE" == 'jewel' ] && [ "$CEPH_ANSIBLE_BRANCH" == 'stable-2.2' -o "$CEPH_ANSIBLE_BRANCH" == 'stable-3.0' ]; then start_tox tag-stable-3.0-jewel-centos-7 elif [ "$RELEASE" == 'luminous' ] && [ "$CEPH_ANSIBLE_BRANCH" == 'stable-3.0' ]; then - start_tox tag-stable-3.0-jewel-centos-7 + # start_tox(): + # first, we play stable-3.0 delpoying jewel and then we test a new deployment with luminous. + start_tox tag-stable-3.0-jewel-centos-7 jewel start_tox tag-stable-3.0-luminous-centos-7 elif [ "$RELEASE" == 'luminous' ] && [ "$CEPH_ANSIBLE_BRANCH" == 'master' ]; then start_tox tag-build-master-luminous-ubuntu-16.04 diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index 91fe0ec4..11e2252b 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -457,9 +457,12 @@ 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 - if ! CEPH_DOCKER_IMAGE_TAG=$1 timeout 3h $VENV/tox -rv -e=$RELEASE-$ANSIBLE_VERSION-$SCENARIO --workdir=$WORKDIR -- --provider=libvirt; then +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 echo "ERROR: Job didn't complete successfully or got stuck for more than 3h." exit 1 fi -- 2.47.3