Enable functional tests for bionic-train

This patch also updates the smoke test to run bionic-train.

Change-Id: Ic3375c957ded388935e2b435fbf6a477bf172b1d

tests/basic_deployment.py

@@ -54,7 +54,7 @@ class HAClusterBasicDeployment(OpenStackAmuletDeployment):
         """Deploy the entire test environment."""
         super(HAClusterBasicDeployment, self).__init__(series, openstack,
                                                        source, stable)
-        env_var = 'AMULET_OS_VIP'
+        env_var = 'TEST_VIP'
         self._vip = os.getenv(env_var, None)
         if not self._vip:
             amulet.raise_status(amulet.SKIP, msg="No vip provided with '%s' - "

tests/gate-basic-bionic-train

@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+#
+# Copyright 2019 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Amulet tests on a basic hacluster deployment on bionic-train."""
+
+from basic_deployment import HAClusterBasicDeployment
+
+if __name__ == '__main__':
+    deployment = HAClusterBasicDeployment(series='bionic',
+                                          openstack='cloud:bionic-train',
+                                          source='cloud:bionic-train')
+    deployment.run_tests()

tox.ini

@@ -105,7 +105,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-bionic-stein --no-destroy
+    bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-train --no-destroy
 
 [testenv:func-dev]
 # Charm Functional Test