ansible: bump version to 2.12 to 2.15

- Ansible 2.9 is not supported since May 2022 - requirements versions filter removed to use latest versions Signed-off-by: Teoman ONAY <[email protected]> (cherry picked from commit e4cb989)
ceph · Dec 6, 2023 · ad42894 · ad42894
1 parent 94e70a4
commit ad42894
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
-testinfra>=3,<4
-pytest-xdist==1.28.0
-pytest>=4.6,<5.0
-ansible>=2.9,<2.10,!=2.9.10
-Jinja2>=2.10
+pytest-testinfra
+pytest-xdist
+pytest
+ansible>4,<9
+Jinja2
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -4,7 +4,7 @@
 def node(host, request):
     ansible_vars = host.ansible.get_variables()
 
-    if request.node.get_closest_marker("no_client") and ansible_vars['group_names'] == ['clients']:
+    if request.node.get_closest_marker("no_client") and 'clients' in ansible_vars['group_names']:
         pytest.skip("Not a valid test for client nodes")
 
     if request.node.get_closest_marker("client") and 'clients' not in ansible_vars['group_names']:

diff --git a/tests/functional/pytest.ini b/tests/functional/pytest.ini
@@ -1,3 +1,6 @@
 [pytest]
 markers =
   admin: for admin nodes
+  no_client: for non client nodes
+  client: for client nodes
+  osd: for osd nodes
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1,5 +1,5 @@
-testinfra>=3,<4
-pytest-xdist==1.28.0
-pytest>=4.6,<5.0
-ansible>=2.9,<2.10,!=2.9.10
-Jinja2>=2.10
+pytest-testinfra
+pytest-xdist
+pytest
+ansible>4,<9
+Jinja2