From: Guillaume Abrioux Date: Mon, 23 Nov 2020 16:45:05 +0000 (+0100) Subject: ceph-volume: set CEPH_ANSIBLE_BRANCH properly X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8e6c596254bf8f102778eae7b9640a6d8c4d3b8c;p=ceph-build.git ceph-volume: set CEPH_ANSIBLE_BRANCH properly At the moment it's using ceph-ansible@master to deploy octopus and nautilus which is wrong. Signed-off-by: Guillaume Abrioux --- diff --git a/ceph-volume-ansible-prs/build/build b/ceph-volume-ansible-prs/build/build index e752d1df..644b22cb 100644 --- a/ceph-volume-ansible-prs/build/build +++ b/ceph-volume-ansible-prs/build/build @@ -22,10 +22,14 @@ update_vagrant_boxes cd src/ceph-volume/ceph_volume/tests/functional/$SUBCOMMAND -if [[ "$ghprbTargetBranch" == "mimic" ]]; then +if [[ "$ghprbTargetBranch" == "luminous" ]]; then CEPH_ANSIBLE_BRANCH="stable-3.2" -elif [[ "$ghprbTargetBranch" == "luminous" ]]; then +elif [[ "$ghprbTargetBranch" == "mimic" ]]; then CEPH_ANSIBLE_BRANCH="stable-3.2" +elif [[ "$ghprbTargetBranch" == "nautilus" ]]; then + CEPH_ANSIBLE_BRANCH="stable-4.0" +elif [[ "$ghprbTargetBranch" == "octopus" ]]; then + CEPH_ANSIBLE_BRANCH="stable-5.0" else CEPH_ANSIBLE_BRANCH="master" fi