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 ed43dad4092f356674a47a37d7426c1964ec8fba..cbdd4b58e06551a613ea7fb49aaaa9b631976194 100644 (file)
--- 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 f825a9c347c36c7a9da73db8162dd9f6a902b0c3..2a4ed9135f664e44b6fb32c2fde63bbf97ff37c9 100644 (file)
--- 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 5ff67dd8ae21d6a85a908e39fe72e0c4a7df6e44..f71d42f62ec7bc78014c277e302b63870a777d43 100644 (file)
--- 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 ebee2d1864e056220f6b678be56adac2adcfe167..6b53c64d8934defbe7e6f45b1b4cbecedd18f650 100644 (file)
--- 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)