Merge "Use envlist for tox based roles"

2017-05-22 20:30:12 +00:00 · 2017-05-22 20:30:12 +00:00 · 1a57d14d34
commit 1a57d14d34
parent 5a4f0cd968 4e5a2a2230
6 changed files with 14 additions and 13 deletions
--- a/playbooks/tox/cover.yaml
+++ b/playbooks/tox/cover.yaml
@ -2,4 +2,5 @@
  roles:
    - extra-test-setup
    - revoke-sudo
-    - run-cover
+    - role: run-cover
+      envlist: cover
--- a/playbooks/tox/docs.yaml
+++ b/playbooks/tox/docs.yaml
@ -1,4 +1,5 @@
 - hosts: all
  roles:
    - revoke-sudo
-    - run-docs
+    - role: run-docs
+      envlist: venv
--- a/playbooks/tox/linters.yaml
+++ b/playbooks/tox/linters.yaml
@ -1,6 +1,5 @@
 - hosts: all
-  vars:
-    run_tox_envlist: pep8
  roles:
    - revoke-sudo
-    - run-tox
+    - role: run-tox
+      envlist: pep8
--- a/playbooks/tox/py27.yaml
+++ b/playbooks/tox/py27.yaml
@ -1,7 +1,6 @@
 - hosts: all
-  vars:
-    run_tox_envlist: py27
  roles:
    - extra-test-setup
    - revoke-sudo
-    - run-tox
+    - role: run-tox
+      envlist: py27
--- a/playbooks/tox/py35.yaml
+++ b/playbooks/tox/py35.yaml
@ -1,7 +1,6 @@
 - hosts: all
-  vars:
-    run_tox_envlist: py35
  roles:
    - extra-test-setup
    - revoke-sudo
-    - run-tox
+    - role: run-tox
+      envlist: py35
--- a/playbooks/tox/tarball.yaml
+++ b/playbooks/tox/tarball.yaml
@ -1,5 +1,7 @@
 - hosts: all
  roles:
    - revoke-sudo
-    - run-tarball
-    - run-wheel
+    - role: run-tarball
+      envlist: venv
+    - role: run-wheel
+      envlist: venv