From 3248bc36d2e473c28dd500e08d4485f9e3fb9354 Mon Sep 17 00:00:00 2001 From: Deepak Date: Tue, 4 Oct 2016 23:27:13 +0530 Subject: [PATCH] Update test-vars.yml for repositories Renamed in os_horizon role repo Changed test-vars.yml to os_horizon-overrides.yml Removed test-vars.yml Change-Id: If3cf9b788fe8c20e2f2dff6fbd6cc2efba0c5efe Partial-Bug: #1629284 --- tests/{test-vars.yml => os_horizon-overrides.yml} | 0 tests/test-horizon-functional.yml | 2 -- tests/test-install-horizon.yml | 1 - tox.ini | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) rename tests/{test-vars.yml => os_horizon-overrides.yml} (100%) diff --git a/tests/test-vars.yml b/tests/os_horizon-overrides.yml similarity index 100% rename from tests/test-vars.yml rename to tests/os_horizon-overrides.yml diff --git a/tests/test-horizon-functional.yml b/tests/test-horizon-functional.yml index 09cc9153..77e21dd9 100644 --- a/tests/test-horizon-functional.yml +++ b/tests/test-horizon-functional.yml @@ -59,7 +59,6 @@ delay: 10 vars_files: - common/test-vars.yml - - test-vars.yml - name: Playbook for tempest testing of horizon hosts: utility_all @@ -72,4 +71,3 @@ {{ tempest_bin | dirname }}/run_tempest.sh --no-virtual-env --serial tempest_horizon.tests.scenario.test_dashboard_basic_ops.TestDashboardBasicOps vars_files: - common/test-vars.yml - - test-vars.yml diff --git a/tests/test-install-horizon.yml b/tests/test-install-horizon.yml index 26e36804..eee58871 100644 --- a/tests/test-install-horizon.yml +++ b/tests/test-install-horizon.yml @@ -46,4 +46,3 @@ - role: "os_horizon" vars_files: - common/test-vars.yml - - test-vars.yml diff --git a/tox.ini b/tox.ini index 4e029ea6..b03e9e31 100644 --- a/tox.ini +++ b/tox.ini @@ -139,7 +139,7 @@ deps = commands = {[testenv:ansible]commands} ansible-playbook -i {toxinidir}/tests/inventory \ - -e @{toxinidir}/tests/test-vars.yml \ + -e @{toxinidir}/tests/os_horizon-overrides.yml \ {toxinidir}/tests/test.yml -vvvv {[testenv:func_logs]commands}