From 4d0df9f02236f560279aaaaebf488b1a6c1e2fac Mon Sep 17 00:00:00 2001
From: Sagi Shnaidman <sshnaidm@redhat.com>
Date: Wed, 17 Jun 2020 02:12:27 +0300
Subject: [PATCH] Fix ansible-test errors

Add tox to requirements
Use only 3.6 python
Set ansible-test 2.9 as a gate job

Change-Id: I40757e1efc3ee297b44cda6c35cdce4c64ebaa4f
---
 .zuul.yaml                  | 2 +-
 test-requirements.txt       | 1 +
 tools/run-ansible-sanity.sh | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index a0032966..8212f661 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -243,7 +243,7 @@
     gate:
       jobs:
         - tox-pep8
-        - openstack-tox-linters
+        - openstack-tox-linters-ansible-2.9
         - ansible-collections-openstack-functional-devstack
         - ansible-collections-openstack-functional-devstack-releases
         - ansible-collections-openstack-functional-devstack-ansible-2.9
diff --git a/test-requirements.txt b/test-requirements.txt
index 2f45aec3..7941f47a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,3 +9,4 @@ yamllint
 rstcheck
 ruamel.yaml
 galaxy-importer
+tox
diff --git a/tools/run-ansible-sanity.sh b/tools/run-ansible-sanity.sh
index 77aed77a..004205ee 100644
--- a/tools/run-ansible-sanity.sh
+++ b/tools/run-ansible-sanity.sh
@@ -25,6 +25,7 @@ cp -a ${TOXDIR}/{plugins,meta,scripts,tests,docs} ${ANSIBLE_COLLECTIONS_PATH}/an
 cd ${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/openstack/cloud/
 ansible-test sanity -v \
     --venv \
+    --python 3.6 \
     --skip-test metaclass-boilerplate \
     --skip-test future-import-boilerplate \
     plugins/ docs/ meta/ scripts/ tests/