Update Amulet defs, series metadata and c-h sync

- 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: I4c4518e5415220e0e89c0893c0079a565771e131

src/metadata.yaml

@@ -7,6 +7,7 @@ series:
 # Trusty disabled pending https://bugs.launchpad.net/bugs/1609498
 # - trusty
  - xenial
+ - yakkety
 subordinate: true
 description: |
   Barbican provides a secure storage for keys and other secrets and

src/tests/basic_deployment.py

@@ -63,7 +63,7 @@ class SoftHSMBasicDeployment(OpenStackAmuletDeployment):
             {'name': 'keystone'}
         ]
         super(SoftHSMBasicDeployment, self)._add_services(
-            this_service, other_services)
+            this_service, other_services, no_origin=['barbican-softhsm'])
 
     def _add_relations(self):
         """Add all of the relations for the services."""

src/tests/gate-basic-xenial-ocata

@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deploy on xenial-ocata for keystone v3.
+"""
+
+from basic_deployment import SoftHSMBasicDeployment
+
+if __name__ == '__main__':
+    deployment = SoftHSMBasicDeployment(series='xenial', keystone_version=3,
+                                        openstack='cloud:xenial-ocata',
+                                        source='cloud:xenial-updates/ocata')
+    deployment.run_tests()

src/tests/gate-basic-zesty-ocata

@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic aodh deployment on zesty-ocata for keystone v3.
+"""
+
+from basic_deployment import SoftHSMBasicDeployment
+
+if __name__ == '__main__':
+    deployment = SoftHSMBasicDeployment(series='zesty', keystone_version=3)
+    deployment.run_tests()