ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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)
pull/2733/head
Guillaume Abrioux 2018-06-05 23:42:08 +02:00
parent 24ef47b0e5
commit 5eacc8f8d8
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
group_vars/all.yml.sample
View File

@ -28,6 +28,7 @@ dummy:
# luminous: 12 # luminous: 12
# mimic: 13 # mimic: 13
# nautilus: 14 # nautilus: 14
# dev: 99
# Directory to fetch cluster fsid, keys etc... # Directory to fetch cluster fsid, keys etc...
#fetch_directory: fetch/ #fetch_directory: fetch/

1
group_vars/rhcs.yml.sample
View File

@ -28,6 +28,7 @@ dummy:
# luminous: 12 # luminous: 12
# mimic: 13 # mimic: 13
# nautilus: 14 # nautilus: 14
# dev: 99
# Directory to fetch cluster fsid, keys etc... # Directory to fetch cluster fsid, keys etc...
fetch_directory: ~/ceph-ansible-keys fetch_directory: ~/ceph-ansible-keys

1
roles/ceph-defaults/defaults/main.yml
View File

@ -20,6 +20,7 @@ ceph_release_num:
luminous: 12 luminous: 12
mimic: 13 mimic: 13
nautilus: 14 nautilus: 14
dev: 99
# Directory to fetch cluster fsid, keys etc... # Directory to fetch cluster fsid, keys etc...
fetch_directory: fetch/ fetch_directory: fetch/

3
tests/conftest.py
View File

@ -25,7 +25,8 @@ def node(host, request):
'jewel': 10, 'jewel': 10,
'kraken': 11, 'kraken': 11,
'luminous': 12, 'luminous': 12,
'mimic': 13 'mimic': 13,
'dev': 99
} }
if not request.node.get_marker(node_type) and not request.node.get_marker('all'): 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) pytest.skip("Not a valid test for node type: %s" % node_type)