From: Alfredo Deza Date: Fri, 9 Nov 2018 18:34:22 +0000 (-0500) Subject: ceph-volume-nightly use stable-3.2 if luminous or mimic is targetted X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec0f445910bcabfa3dad1496a31f3cc4fd3cd32a;p=ceph-build.git ceph-volume-nightly use stable-3.2 if luminous or mimic is targetted Signed-off-by: Alfredo Deza --- diff --git a/ceph-volume-nightly/build/build b/ceph-volume-nightly/build/build index f03c0990..6c410268 100644 --- a/ceph-volume-nightly/build/build +++ b/ceph-volume-nightly/build/build @@ -21,4 +21,13 @@ update_vagrant_boxes cd src/ceph-volume/ceph_volume/tests/functional/$SUBCOMMAND -VAGRANT_RELOAD_FLAGS="--debug --no-provision" CEPH_DEV_BRANCH=$CEPH_BRANCH $VENV/tox --workdir=$WORKDIR -vre $DISTRO-$OBJECTSTORE-$SCENARIO -- --provider=libvirt +if [[ "$CEPH_DEV_BRANCH" == "mimic" ]]; then + CEPH_ANSIBLE_BRANCH="stable-3.2" +elif [[ "$CEPH_DEV_BRANCH" == "luminous" ]]; then + CEPH_ANSIBLE_BRANCH="stable-3.2" +else + CEPH_ANSIBLE_BRANCH="master" +fi + + +VAGRANT_RELOAD_FLAGS="--debug --no-provision" CEPH_ANSIBLE_BRANCH=$CEPH_ANSIBLE_BRANCH CEPH_DEV_BRANCH=$CEPH_BRANCH $VENV/tox --workdir=$WORKDIR -vre $DISTRO-$OBJECTSTORE-$SCENARIO -- --provider=libvirt