From d9b05879b322ee60dc7ec9b8a17a01bc89e730dd Mon Sep 17 00:00:00 2001
From: Aurelien Lourot <aurelien.lourot@canonical.com>
Date: Wed, 8 Jul 2020 11:15:25 +0200
Subject: [PATCH] Add Ussuri and Victoria tests

Closes-Bug: #1885935
Change-Id: Ia4ab72a73ab44c3263d627bc7f18c1dbafaae2ad
---
 src/tests/dev-basic-bionic-ussuri   | 12 ++++++++++++
 src/tests/dev-basic-focal-ussuri    | 10 ++++++++++
 src/tests/dev-basic-focal-victoria  | 12 ++++++++++++
 src/tests/dev-basic-groovy-victoria | 10 ++++++++++
 src/wheelhouse.txt                  |  2 --
 5 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100755 src/tests/dev-basic-bionic-ussuri
 create mode 100755 src/tests/dev-basic-focal-ussuri
 create mode 100755 src/tests/dev-basic-focal-victoria
 create mode 100755 src/tests/dev-basic-groovy-victoria

diff --git a/src/tests/dev-basic-bionic-ussuri b/src/tests/dev-basic-bionic-ussuri
new file mode 100755
index 0000000..61b2aa8
--- /dev/null
+++ b/src/tests/dev-basic-bionic-ussuri
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deploy on bionic-ussuri for keystone v3.
+"""
+
+from basic_deployment import SoftHSMBasicDeployment
+
+if __name__ == '__main__':
+    deployment = SoftHSMBasicDeployment(series='bionic', keystone_version=3,
+                                        openstack='cloud:bionic-ussuri',
+                                        source='cloud:bionic-ussuri')
+    deployment.run_tests()
diff --git a/src/tests/dev-basic-focal-ussuri b/src/tests/dev-basic-focal-ussuri
new file mode 100755
index 0000000..672ef89
--- /dev/null
+++ b/src/tests/dev-basic-focal-ussuri
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deploy on focal-ussuri for keystone v3.
+"""
+
+from basic_deployment import SoftHSMBasicDeployment
+
+if __name__ == '__main__':
+    deployment = SoftHSMBasicDeployment(series='focal', keystone_version=3)
+    deployment.run_tests()
diff --git a/src/tests/dev-basic-focal-victoria b/src/tests/dev-basic-focal-victoria
new file mode 100755
index 0000000..c1326c8
--- /dev/null
+++ b/src/tests/dev-basic-focal-victoria
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deploy on focal-victoria for keystone v3.
+"""
+
+from basic_deployment import SoftHSMBasicDeployment
+
+if __name__ == '__main__':
+    deployment = SoftHSMBasicDeployment(series='focal', keystone_version=3,
+                                        openstack='cloud:focal-victoria',
+                                        source='cloud:focal-victoria')
+    deployment.run_tests()
diff --git a/src/tests/dev-basic-groovy-victoria b/src/tests/dev-basic-groovy-victoria
new file mode 100755
index 0000000..de19038
--- /dev/null
+++ b/src/tests/dev-basic-groovy-victoria
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deploy on groovy-victoria for keystone v3.
+"""
+
+from basic_deployment import SoftHSMBasicDeployment
+
+if __name__ == '__main__':
+    deployment = SoftHSMBasicDeployment(series='groovy', keystone_version=3)
+    deployment.run_tests()
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 17c1230..a4d92cc 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1,3 +1 @@
-
-jinja2
 psutil