commit edcd88782ba5221cf804a3c4b5a3c8bb5ef44b67 Author: Luigi Toscano Date: Tue Oct 13 22:51:14 2020 +0200 scenario tests: call ensure-tox and run them for real Use the tox discovered by ensure-tox to run the tests. It seems they have been broken for a while for a while. Change-Id: I477b7af0a6733dd8e3d1c943f04118251c272134 diff --git a/playbooks/sahara-tests-scenario.yaml b/playbooks/sahara-tests-scenario.yaml index b196015..8851df1 100644 --- a/playbooks/sahara-tests-scenario.yaml +++ b/playbooks/sahara-tests-scenario.yaml @@ -12,6 +12,8 @@ - name: setup the sahara Scenario test environment include_role: name: setup-sahara-scenario-env + - include_role: + name: ensure-tox - name: run the Sahara scenario tests include_role: name: run-sahara-scenario diff --git a/roles/run-sahara-scenario/defaults/main.yaml b/roles/run-sahara-scenario/defaults/main.yaml index ebd1eba..9ec2f0b 100644 --- a/roles/run-sahara-scenario/defaults/main.yaml +++ b/roles/run-sahara-scenario/defaults/main.yaml @@ -5,3 +5,4 @@ sahara_scenario_conf: '{{ ansible_user_dir }}/template_vars.ini' sahara_scenario_test_template: 'fake.yaml.mako' sahara_scenario_tox_env: 'venv' sahara_enable_s3: False +tox_executable: 'tox' diff --git a/roles/run-sahara-scenario/tasks/main.yaml b/roles/run-sahara-scenario/tasks/main.yaml index 9a1b7ec..810a796 100644 --- a/roles/run-sahara-scenario/tasks/main.yaml +++ b/roles/run-sahara-scenario/tasks/main.yaml @@ -1,7 +1,7 @@ --- - name: run sahara-scenario shell: | - tox -e {{ sahara_scenario_tox_env }} --sitepackages -- sahara-scenario --verbose -V {{ sahara_scenario_conf }} \ + {{ tox_executable }} -e {{ sahara_scenario_tox_env }} --sitepackages -- sahara-scenario --verbose -V {{ sahara_scenario_conf }} \ etc/scenario/gate/credentials.yaml.mako \ etc/scenario/gate/edp.yaml.mako \ {% if sahara_enable_s3 -%}