From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 8 Nov 2016 16:34:16 +0000 (-0600)
Subject: tests: updates tox to test the new scenarios
X-Git-Tag: v2.0~9^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=99fc84276ebc3024c7f44fe0c088a668122054a4;p=ceph-ansible.git

tests: updates tox to test the new scenarios

This also turns on -vv for ansible and adds an environment for
ansible==1.9.4 testing.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

Resolves: testing#updates
---

diff --git a/tox.ini b/tox.ini
index 94c08c614..f819fb7e0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {ansible2.1,ansible2.2}-{initial-members}
+envlist = {ansible2.1}-{xenial-conf-tests,xenial-mon-osd,centos7-mon-osd}
 skipsdist = True
 
 [testenv]
@@ -11,16 +11,19 @@ setenv=
   ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config
   ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions
 deps=
+  ansible1.9: ansible==1.9.4
   ansible2.1: ansible==2.1
   ansible2.2: ansible==2.2
   -r{toxinidir}/tests/requirements.txt
 changedir=
-  initial-members: {toxinidir}/tests/functional/ubuntu/16.04/mon/initial_members
+  xenial-conf-tests: {toxinidir}/tests/functional/ubuntu/16.04/mon
+  xenial-mon-osd: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd
+  centos7-mon-osd: {toxinidir}/tests/functional/centos/7/mon-osd
 commands=
   vagrant up --no-provision --provider=virtualbox
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
-  ansible-playbook -i {changedir}/hosts {toxinidir}/site.yml.sample
+  ansible-playbook -vv -i {changedir}/hosts {toxinidir}/site.yml.sample
 
   py.test -v
   vagrant destroy --force