Update Amulet defs, series metadata and c-h sync

- Sync charm helpers if applicable.

- Fix test executable hashbags for virtualenv prep.

- Add Yakkety-Newton Amulet test definitions.

- Prep Xenial-Ocata Amulet test definitions (not yet enabled).

- Prep Zesty-Ocata Amulet test definitions (not yet enabled).

- Remove Precise charm series metadata if present.

- Remove Precise Amulet test definitions if present.

Change-Id: I743661420f50b10527816c1b840440949cc39b39

tests/basic_deployment.py

@@ -173,8 +173,8 @@ class NovaBasicDeployment(OpenStackAmuletDeployment):
             {'name': 'neutron-gateway'},
             {'name': 'percona-cluster', 'constraints': {'mem': '3072M'}},
         ]
-        super(NovaBasicDeployment, self)._add_services(this_service,
-                                                       other_services)
+        super(NovaBasicDeployment, self)._add_services(
+            this_service, other_services, no_origin=['nova-compute-proxy'])
 
     def _add_relations(self):
         """Add all of the relations for the services."""

tests/gate-basic-xenial-ocata

@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 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 nova compute deployment on xenial-ocata."""
+
+from basic_deployment import NovaBasicDeployment
+
+if __name__ == '__main__':
+    deployment = NovaBasicDeployment(series='xenial',
+                                     openstack='cloud:xenial-ocata',
+                                     source='cloud:xenial-updates/ocata')
+    deployment.run_tests()

tests/gate-basic-zesty-ocata

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 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 nova compute deployment on zesty-ocata."""
+
+from basic_deployment import NovaBasicDeployment
+
+if __name__ == '__main__':
+    deployment = NovaBasicDeployment(series='zesty')
+    deployment.run_tests()