From 4e5a2a2230031cac897d7cee973b31bb5eec2ae9 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 19 May 2017 13:19:56 -0400
Subject: [PATCH] Use envlist for tox based roles
Ensure we pass the envlist variable to our roles.
Change-Id: I1340b5db310e401bcac321ee12138bd5777d2324
Depends-On: Icd8ed9f769c1b2ce7fcb9c3a75296f0279a24d9f
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
playbooks/tox/cover.yaml | 3 ++-
playbooks/tox/docs.yaml | 3 ++-
playbooks/tox/linters.yaml | 5 ++---
playbooks/tox/py27.yaml | 5 ++---
playbooks/tox/py35.yaml | 5 ++---
playbooks/tox/tarball.yaml | 6 ++++--
6 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/playbooks/tox/cover.yaml b/playbooks/tox/cover.yaml
index 642eb4e4..6212a117 100644
--- 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
diff --git a/playbooks/tox/docs.yaml b/playbooks/tox/docs.yaml
index 028e1c51..612e3532 100644
--- 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
diff --git a/playbooks/tox/linters.yaml b/playbooks/tox/linters.yaml
index d1e7f130..c0930e0a 100644
--- 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
diff --git a/playbooks/tox/py27.yaml b/playbooks/tox/py27.yaml
index fd45f271..7d439f12 100644
--- 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
diff --git a/playbooks/tox/py35.yaml b/playbooks/tox/py35.yaml
index 9c010212..61c6b7f0 100644
--- 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
diff --git a/playbooks/tox/tarball.yaml b/playbooks/tox/tarball.yaml
index 4d5a8f61..3f30e785 100644
--- 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