| commit | ba2f479dc24e0978c23fc6928f9bba41d91acf22 | [log] [tgz] |
|---|---|---|
| author | Andreas Jaeger <aj@suse.com> | Fri Jan 12 16:48:52 2018 +0100 |
| committer | Andreas Jaeger <aj@suse.com> | Fri Jan 12 16:49:47 2018 +0100 |
| tree | 27511c580bae5915668a2ba4c21327ecd523f2c4 | |
| parent | f110a4ba1ffb050a539127b446cdf704bb8213ed [diff] |
Rename tox_venvlist For consistency with the tox jobs, use tox_envlist instead of tox_venvlist. See https://docs.openstack.org/infra/zuul-jobs/jobs.html#job-tox for definition of tox job. All projects using tox_venvlist have been changed to use tox_envlist as well (see dependencies). Now we can rename tox_venvlist to tox_envlist - and then the projects can remove tox_venvlist and use only tox_envlist. Change-Id: I67a20b1faa77ff0166ad96fd95432c11948abc74 Depends-On: I035584aaeaa71b62c1d0c7e0a62dbf053a3488b6 Depends-On: I2fb02ead3b45c2a05d28f59fd28d062a3b40e07e Depends-On: Id03d4c1351d5a002dc9d73247d0315bef274f627 Depends-On: Iff3093e61c7d2cb684667d5bc5f2a75580569aab
diff --git a/.zuul.yaml b/.zuul.yaml index 10788d7..1c34d4a 100644 --- a/.zuul.yaml +++ b/.zuul.yaml
@@ -24,7 +24,7 @@ * legacy-tempest-dsvm-neutron-full * gate-tempest-dsvm-neutron-full-ubuntu-xenial vars: - tox_venvlist: full + tox_envlist: full devstack_localrc: ENABLE_FILE_INJECTION: True
diff --git a/roles/run-tempest/README.rst b/roles/run-tempest/README.rst index b5defb7..33dcce9 100644 --- a/roles/run-tempest/README.rst +++ b/roles/run-tempest/README.rst
@@ -29,7 +29,7 @@ # Line with only a comment. (tempest\.(api|scenario|thirdparty)).*$ # Run only api scenario and third party -.. zuul:rolevar:: tox_venvlist +.. zuul:rolevar:: tox_envlist :default: smoke The Tempest tox environment to run.
diff --git a/roles/run-tempest/defaults/main.yaml b/roles/run-tempest/defaults/main.yaml index 3e57511..85e94f2 100644 --- a/roles/run-tempest/defaults/main.yaml +++ b/roles/run-tempest/defaults/main.yaml
@@ -1,3 +1,3 @@ devstack_base_dir: /opt/stack tempest_test_regex: '' -tox_venvlist: smoke +tox_envlist: smoke
diff --git a/roles/run-tempest/tasks/main.yaml b/roles/run-tempest/tasks/main.yaml index 297cd72..87898db 100644 --- a/roles/run-tempest/tasks/main.yaml +++ b/roles/run-tempest/tasks/main.yaml
@@ -21,7 +21,7 @@ when: num_cores|int > 3 - name: Run Tempest - command: tox -e {{tox_venvlist}} -- {{tempest_test_regex|quote}} --concurrency={{tempest_concurrency|default(default_concurrency)}} + command: tox -e {{tox_envlist}} -- {{tempest_test_regex|quote}} --concurrency={{tempest_concurrency|default(default_concurrency)}} args: chdir: "{{devstack_base_dir}}/tempest" become: true