Add yoga bundles and release-tool syncs

* charm-helpers sync for classic charms
* pin pyparsing for aodhclient
* pin cffi for py35
* add non-voting focal-yoga bundle
* add non-voting jammy-yoga bundle
* add series metadata for jammy
* switch xena bundles to voting
* run focal-ussuri as smoke tests
* remove trusty, xenial, and groovy metadata and tests

Change-Id: I8a26d0f2e116cfde9047da8d264739d9a0b623f8

osci.yaml

@@ -3,16 +3,14 @@
       - charm-unit-jobs
     check:
       jobs:
-      - xenial-ha-mysql
-      - xenial-postgres
-      - xenial-mysql
       - bionic-postgres
       - bionic-mysql
       - focal-mysql8
-      - groovy-mysql8
       - hirsute-mysql8
       - impish-mysql8:
           voting: false
+      - jammy-mysql8:
+          voting: false
     vars:
       needs_charm_build: true
       charm_build_name: vault
@@ -29,28 +27,10 @@
     vars:
       tox_extra_args: bionic-mysql
 - job:
-    name: xenial-ha-mysql
+    name: bionic-postgres
     parent: func-target
     dependencies: &smoke-jobs
       - bionic-mysql
-    vars:
-      tox_extra_args: xenial-ha-mysql
-- job:
-    name: xenial-postgres
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: xenial-postgres
-- job:
-    name: xenial-mysql
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: xenial-mysql
-- job:
-    name: bionic-postgres
-    parent: func-target
-    dependencies: *smoke-jobs
     vars:
       tox_extra_args: bionic-postgres
 - job:
@@ -59,12 +39,6 @@
     dependencies: *smoke-jobs
     vars:
       tox_extra_args: focal-mysql8
-- job:
-    name: groovy-mysql8
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: groovy-mysql8
 - job:
     name: hirsute-mysql8
     parent: func-target
@@ -77,3 +51,9 @@
     dependencies: *smoke-jobs
     vars:
       tox_extra_args: impish-mysql8
+- job:
+    name: jammy-mysql8
+    parent: func-target
+    dependencies: *smoke-jobs
+    vars:
+      tox_extra_args: jammy-mysql8

src/metadata.yaml

@@ -12,7 +12,6 @@ description: |
   credentials, SQL/NoSQL databases, X.509 certificates,
   SSH credentials, and more.
 series:
-- xenial
 - bionic
 - focal
 - groovy

src/tests/bundles/jammy-mysql8.yaml

@@ -1,7 +1,7 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-series: groovy
+series: jammy
 
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'

src/tests/bundles/overlays/xenial-ha-mysql.yaml.j2

@@ -1,4 +0,0 @@
-applications:
-  vault:
-    options:
-        vip: '{{ OS_VIP00 }}'

src/tests/bundles/xenial-ha-mysql.yaml

@@ -1,32 +0,0 @@
-series: xenial
-services:
-  vault:
-    num_units: 3
-    series: xenial
-    charm: vault
-    options:
-        vip: 'ADD YOUR VIP HERE'
-  hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-  easyrsa:
-    charm: cs:~containers/easyrsa
-    num_units: 1
-    series: bionic
-  etcd:
-    charm: cs:etcd
-    num_units: 3
-    series: bionic
-    options:
-      channel: 3.1/stable
-relations:
-- - vault:shared-db
-  - mysql:shared-db
-- - etcd:certificates
-  - easyrsa:client
-- - etcd:db
-  - vault:etcd
-- - vault:ha
-  - hacluster:ha

src/tests/bundles/xenial-mysql.yaml

@@ -1,40 +0,0 @@
-series: xenial
-services:
-  vault:
-    num_units: 1
-    series: xenial
-    charm: vault
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:xenial-queens
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: cloud:xenial-queens
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: cloud:xenial-queens
-      osd-encrypt: true
-      osd-encrypt-keymanager: vault
-    storage:
-      osd-devices: 10G,2
-relations:
-- - vault:shared-db
-  - mysql:shared-db
-- - keystone:shared-db
-  - mysql:shared-db
-- - vault:certificates
-  - keystone:certificates
-- - vault:secrets
-  - ceph-osd:secrets-storage
-- - ceph-mon:osd
-  - ceph-osd:mon

src/tests/bundles/xenial-postgres.yaml

@@ -1,12 +0,0 @@
-series: xenial
-services:
-  vault:
-    num_units: 1
-    series: xenial
-    charm: ../../../vault
-  postgresql:
-    charm: cs:postgresql
-    num_units: 1
-relations:
-- - vault:db
-  - postgresql:db

src/tests/tests.yaml

@@ -3,19 +3,15 @@ charm_name: vault
 configure:
 - zaza.openstack.charm_tests.vault.setup.basic_setup
 
-dev_bundles:
-- bionic
-- hirsute-mysql8
-- impish-mysql8
-
 gate_bundles:
-- xenial-ha-mysql
-- xenial-postgres
-- xenial-mysql
 - bionic-postgres
 - bionic-mysql
 - focal-mysql8
-- groovy-mysql8
+- hirsute-mysql8
+- impish-mysql8
+
+dev_bundles:
+- jammy-mysql8
 
 smoke_bundles:
 - focal-mysql8
@@ -46,4 +42,6 @@ tests:
 
 tests_options:
   force_deploy:
+    - hirsute-mysql8
     - impish-mysql8
+    - jammy-mysql8

test-requirements.txt

@@ -5,8 +5,6 @@
 #
 pyparsing<3.0.0  # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
 cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
-
-
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 stestr>=2.2.0