Merge "zuul: Use all rather than all-plugin for tox_envlist"
diff --git a/.zuul.yaml b/.zuul.yaml
index 9ee33cf..edd812c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -31,7 +31,8 @@
neutron-trunk: true
tempest_concurrency: 2
tempest_test_regex: (?!.*\[.*\bslow\b.*\])(^patrole_tempest_plugin\.tests\.api)
- tox_envlist: all-plugin
+ tox_envlist: all
+ tox_extra_args: --sitepackages
- job:
name: patrole-base-multinode
@@ -60,7 +61,8 @@
neutron: true
tempest_concurrency: 1
tempest_test_regex: (?=.*\[.*\bslow\b.*\])(^patrole_tempest_plugin\.tests\.api)
- tox_envlist: all-plugin
+ tox_envlist: all
+ tox_extra_args: --sitepackages
- job:
name: patrole-admin
diff --git a/README.rst b/README.rst
index 6ca3747..31cd3b7 100644
--- a/README.rst
+++ b/README.rst
@@ -153,10 +153,11 @@
will run the same set of tests as the default gate jobs.
- You can also run Patrole tests using `tox`_. To do so, ``cd`` into the
+ You can also run Patrole tests using `tox`_, but as Patrole needs access to
+ global packages use ``--sitepackages`` argument. To do so, ``cd`` into the
**Tempest** directory and run::
- $ tox -eall-plugin -- patrole_tempest_plugin.tests.api
+ $ tox -eall --sitepackages -- patrole_tempest_plugin.tests.api
.. note::