diff --git a/validations_libs/constants.py b/validations_libs/constants.py index da5f9f4e..0947b884 100644 --- a/validations_libs/constants.py +++ b/validations_libs/constants.py @@ -14,7 +14,7 @@ # import os -DEFAULT_VALIDATIONS_BASEDIR = '/usr/share/ansible/' +DEFAULT_VALIDATIONS_BASEDIR = '/usr/share/ansible' ANSIBLE_VALIDATION_DIR = '/usr/share/ansible/validation-playbooks' diff --git a/validations_libs/tests/cli/test_run.py b/validations_libs/tests/cli/test_run.py index da718f8e..370c0229 100644 --- a/validations_libs/tests/cli/test_run.py +++ b/validations_libs/tests/cli/test_run.py @@ -71,7 +71,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': {'key': 'value'}, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': None, 'python_interpreter': sys.executable, @@ -101,7 +101,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': {'key': 'value2'}, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': None, 'python_interpreter': sys.executable, @@ -143,7 +143,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': {'key': 'value'}, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': None, 'python_interpreter': sys.executable, @@ -171,7 +171,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': None, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': {'key': 'value'}, 'python_interpreter': sys.executable, @@ -201,7 +201,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': None, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': {'ANSIBLE_STDOUT_CALLBACK': 'default'}, 'python_interpreter': sys.executable, @@ -229,7 +229,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': None, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': {'key': 'value2'}, 'python_interpreter': sys.executable, @@ -259,7 +259,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': {'key': 'value'}, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': {'key2': 'value2'}, 'python_interpreter': sys.executable, @@ -298,7 +298,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': {'key': 'value'}, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': {'key2': 'value2'}, 'python_interpreter': sys.executable, @@ -322,7 +322,7 @@ class TestRun(BaseCommand): 'group': [], 'extra_vars': {'key': 'value'}, 'validations_dir': '/usr/share/ansible/validation-playbooks', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'validation_name': ['foo'], 'extra_env_vars': {'key2': 'value2'}, 'python_interpreter': sys.executable, diff --git a/validations_libs/tests/test_validation_actions.py b/validations_libs/tests/test_validation_actions.py index 79f2fc25..60e97e4c 100644 --- a/validations_libs/tests/test_validation_actions.py +++ b/validations_libs/tests/test_validation_actions.py @@ -88,7 +88,7 @@ class TestValidationActions(TestCase): run_called_args = { 'workdir': '/var/log/validations/artifacts/123_fake.yaml_time', 'playbook': '/tmp/foo/fake.yaml', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'playbook_dir': '/tmp/foo', 'parallel_run': True, 'inventory': 'tmp/inventory.yaml', @@ -148,7 +148,7 @@ class TestValidationActions(TestCase): run_called_args = { 'workdir': '/var/log/validations/artifacts/123_fake.yaml_time', 'playbook': '/tmp/foo/fake.yaml', - 'base_dir': '/usr/share/ansible/', + 'base_dir': '/usr/share/ansible', 'playbook_dir': '/tmp/foo', 'parallel_run': True, 'inventory': 'tmp/inventory.yaml',