From b025d3d39b9513010f4ddef582810f4d93fc8cd6 Mon Sep 17 00:00:00 2001
From: Camille Rodriguez <camille.rodriguez@canonical.com>
Date: Mon, 26 Aug 2019 14:47:31 -0400
Subject: [PATCH] Add disco-stein bundle to gate tests

The bundle disco-stein was in the dev bundles because
a bug with the Python 3.7 syntax prevented the success of
the deployment of HA clusters. This bug is fixed, we can
reintegrate disco-stein in the gate bundles.

Other small additions:
- removing sitepackages in tox.ini to avoid test env pollution
- skip_missing_interpreters in tox.ini set to False to avoid false
positives by skipping missing interpreters.

LP Related-Bug: #1823718

Change-Id: I432a562efb84e486034f97f433186a31a80d4b2d
---
 src/tests/gate-basic-disco-stein | 10 ++++++++++
 src/tox.ini                      |  4 ++++
 src/wheelhouse.txt               |  3 +++
 tox.ini                          |  7 +++++--
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100755 src/tests/gate-basic-disco-stein
 create mode 100644 src/wheelhouse.txt

diff --git a/src/tests/gate-basic-disco-stein b/src/tests/gate-basic-disco-stein
new file mode 100755
index 0000000..5cbc6e7
--- /dev/null
+++ b/src/tests/gate-basic-disco-stein
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deploy on bionic-stein for keystone v3.
+"""
+
+from basic_deployment import SoftHSMBasicDeployment
+
+if __name__ == '__main__':
+    deployment = SoftHSMBasicDeployment(series='disco', keystone_version=3)
+    deployment.run_tests()
diff --git a/src/tox.ini b/src/tox.ini
index 4c5f90e..ffdb931 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -4,6 +4,10 @@
 [tox]
 envlist = pep8
 skipsdist = True
+# NOTE(beisner): Avoid build/test env pollution by not enabling sitepackages.
+sitepackages = False
+# NOTE(beisner): Avoid false positives by not skipping missing interpreters.
+skip_missing_interpreters = False
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
new file mode 100644
index 0000000..17c1230
--- /dev/null
+++ b/src/wheelhouse.txt
@@ -0,0 +1,3 @@
+
+jinja2
+psutil
diff --git a/tox.ini b/tox.ini
index 846123f..c6fd536 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,10 @@
 [tox]
 skipsdist = True
 envlist = pep8,py37
-skip_missing_interpreters = True
+# NOTE(beisner): Avoid build/test env pollution by not enabling sitepackages.
+sitepackages = False
+# NOTE(beisner): Avoid false positives by not skipping missing interpreters.
+skip_missing_interpreters = False
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -53,7 +56,7 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:pep8]
-basepython = python3.5
+basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} src unit_tests