From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 5 Jun 2018 21:42:08 +0000 (+0200)
Subject: tests: add a dummy value for 'dev' release
X-Git-Tag: v3.2.0beta1~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5eacc8f8d8ce20fc187471a79543bbfb02388031;p=ceph-ansible.git

tests: add a dummy value for 'dev' release

Functional tests are broken when testing against 'dev' release (ceph).
Adding a dummy value here will make it possible to run ceph-ansible CI
against dev ceph release.

Typical error:

```
>       if request.node.get_marker("from_luminous") and ceph_release_num[ceph_stable_release] < ceph_release_num['luminous']:
E       KeyError: 'dev'
```

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit fd1487d93f21b609a637053f5b33cd2a4e408d00)
---

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index ed43dad40..cbdd4b58e 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -28,6 +28,7 @@ dummy:
 #  luminous: 12
 #  mimic: 13
 #  nautilus: 14
+#  dev: 99
 
 # Directory to fetch cluster fsid, keys etc...
 #fetch_directory: fetch/
diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index f825a9c34..2a4ed9135 100644
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -28,6 +28,7 @@ dummy:
 #  luminous: 12
 #  mimic: 13
 #  nautilus: 14
+#  dev: 99
 
 # Directory to fetch cluster fsid, keys etc...
 fetch_directory: ~/ceph-ansible-keys
diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 5ff67dd8a..f71d42f62 100644
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -20,6 +20,7 @@ ceph_release_num:
   luminous: 12
   mimic: 13
   nautilus: 14
+  dev: 99
 
 # Directory to fetch cluster fsid, keys etc...
 fetch_directory: fetch/
diff --git a/tests/conftest.py b/tests/conftest.py
index ebee2d186..6b53c64d8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -25,7 +25,8 @@ def node(host, request):
       'jewel': 10,
       'kraken': 11,
       'luminous': 12,
-      'mimic': 13
+      'mimic': 13,
+      'dev': 99
     }
     if not request.node.get_marker(node_type) and not request.node.get_marker('all'):
         pytest.skip("Not a valid test for node type: %s" % node_type)