]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-volume: set CEPH_ANSIBLE_BRANCH properly 1711/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Mon, 23 Nov 2020 16:45:05 +0000 (17:45 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 23 Nov 2020 16:45:05 +0000 (17:45 +0100)
At the moment it's using ceph-ansible@master to deploy octopus and
nautilus which is wrong.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
ceph-volume-ansible-prs/build/build

index e752d1df5ed12a275b8e23903e851b55e4d58a8c..644b22cbfa0971eb7f495621d8e11cb61de9c5af 100644 (file)
@@ -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