Update amulet test definitions

Enable Queens, and set Queens as the smoke gate

Remove soon-to-be deprecated combos

Change-Id: I905aabc8d2168e87b6d341bac45a38991f26cc57

tests/gate-basic-trusty-kilo

@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-"""Amulet tests on a basic ceph deployment on trusty-kilo."""
-
-from basic_deployment import CephBasicDeployment
-
-if __name__ == '__main__':
-    deployment = CephBasicDeployment(series='trusty',
-                                     openstack='cloud:trusty-kilo',
-                                     source='cloud:trusty-updates/kilo')
-    deployment.run_tests()

tests/gate-basic-trusty-liberty

@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-"""Amulet tests on a basic ceph deployment on trusty-liberty."""
-
-from basic_deployment import CephBasicDeployment
-
-if __name__ == '__main__':
-    deployment = CephBasicDeployment(series='trusty',
-                                     openstack='cloud:trusty-liberty',
-                                     source='cloud:trusty-updates/liberty')
-    deployment.run_tests()

tests/gate-basic-xenial-newton

@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-"""Amulet tests on a basic ceph deployment on xenial-newton."""
-
-from basic_deployment import CephBasicDeployment
-
-if __name__ == '__main__':
-    deployment = CephBasicDeployment(series='xenial',
-                                     openstack='cloud:xenial-newton',
-                                     source='cloud:xenial-updates/newton')
-    deployment.run_tests()

tox.ini

@@ -60,7 +60,7 @@ basepython = python2.7
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
-    bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-pike --no-destroy
+    bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-queens --no-destroy
 
 [testenv:func27-dfs]
 # Charm Functional Test