canonical · rgildein · Jan 27, 2022 · Jan 24, 2022 · Jan 24, 2022 · Jan 26, 2022
diff --git a/tests/functional/bundles/hacluster.yaml b/tests/functional/bundles/hacluster.yaml
diff --git a/tests/functional/bundles/overlays/hacluster.yaml.j2 b/tests/functional/bundles/overlays/hacluster.yaml.j2
diff --git a/tests/functional/bundles/ceph.yaml → tests/functional/tests/bundles/ceph.yaml b/tests/functional/bundles/ceph.yaml → tests/functional/tests/bundles/ceph.yaml
diff --git a/tests/functional/bundles/openstack.yaml → ...s/functional/tests/bundles/openstack.yaml b/tests/functional/bundles/openstack.yaml → ...s/functional/tests/bundles/openstack.yaml
diff --git a/tests/functional/requirements.txt → ...unctional/tests/bundles/overlays/.gitkeep b/tests/functional/requirements.txt → ...unctional/tests/bundles/overlays/.gitkeep
diff --git a/tests/functional/configure/__init__.py → tests/functional/tests/configure/__init__.py b/tests/functional/configure/__init__.py → tests/functional/tests/configure/__init__.py
diff --git a/tests/functional/configure/ceph.py → tests/functional/tests/configure/ceph.py b/tests/functional/configure/ceph.py → tests/functional/tests/configure/ceph.py
diff --git a/...s/functional/configure/neutron_gateway.py → ...tional/tests/configure/neutron_gateway.py b/...s/functional/configure/neutron_gateway.py → ...tional/tests/configure/neutron_gateway.py
diff --git a/tests/functional/tests.yaml → tests/functional/tests/tests.yaml b/tests/functional/tests.yaml → tests/functional/tests/tests.yaml
@@ -17,8 +17,8 @@ configure:
     - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
     - zaza.openstack.charm_tests.nova.setup.create_flavors
     - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
-    - configure.neutron_gateway.setup_ha_routers
-    - configure.neutron_gateway.setup_ha_networks
+    - tests.configure.neutron_gateway.setup_ha_routers
+    - tests.configure.neutron_gateway.setup_ha_networks
   - ceph:
-    - configure.ceph.set_up_devices_class
-    - configure.ceph.create_replication_rules
+    - tests.configure.ceph.set_up_devices_class
+    - tests.configure.ceph.create_replication_rules
diff --git a/tox.ini b/tox.ini
@@ -64,13 +64,15 @@ commands =
 
 [testenv:func]
 basepython = python3
+changedir = {toxinidir}/tests/functional
 commands =
-    functest-run-suite --test-directory {toxinidir}/tests/functional {posargs}
+    functest-run-suite {posargs}
 
 [testenv:func-target]
 basepython = python3
+changedir = {toxinidir}/tests/functional
 commands =
-    functest-run-suite --test-directory {toxinidir}/tests/functional --bundle {posargs}
+    functest-run-suite  --bundle {posargs}
 
 
 # tools configuration