Add yoga bundles and release-tool syncs

* charm-helpers sync for classic charms
* sync from release-tools
* switch to release-specific zosci functional tests
* run focal-ussuri as smoke tests
* remove trusty, xenial, and groovy metadata/tests
* drop py35 and add py39

Change-Id: I4d6b684a1257cc6bbb703b4a98d90e9f71972d9f

osci.yaml

@@ -1,23 +1,12 @@
 - project:
     templates:
-      - charm-unit-jobs
-      # using overridden, shorter functional list because the charm does
-      # already in the tests.yaml
-      # - charm-functional-jobs
-    check:
-      jobs:
-      - impish-xena:
-          voting: false
-      - hirsute-wallaby
-      - focal-xena:
-          voting: false
-      - groovy-victoria
-      - focal-wallaby
-      - focal-victoria
-      - focal-ussuri
-      - bionic-ussuri
-      - bionic-train
-      - bionic-stein
+      - charm-yoga-unit-jobs
+      - charm-yoga-functional-jobs
+      - charm-xena-functional-jobs
+      - charm-wallaby-functional-jobs
+      - charm-victoria-functional-jobs
+      - charm-ussuri-functional-jobs
+      - charm-stein-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: barbican-vault

requirements.txt

@@ -9,6 +9,7 @@
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 # Build requirements
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
 charm-tools==2.8.3
 
 simplejson

src/tests/bundles/focal-yoga.yaml

@@ -0,0 +1,104 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-yoga
+
+series: focal
+
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+  '8':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  vault-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  barbican-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  barbican:
+    charm: cs:~openstack-charmers-next/barbican
+    num_units: 3
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+      - '5'
+      - '6'
+
+  barbican-vault:
+    charm: ../../../barbican-vault
+    num_units: 0
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '7'
+
+  vault:
+    charm: cs:~openstack-charmers-next/vault
+    num_units: 1
+    to:
+      - '8'
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'barbican:shared-db'
+    - 'barbican-mysql-router:shared-db'
+  - - 'barbican-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'keystone:identity-service'
+    - 'barbican:identity-service'
+
+  - - 'rabbitmq-server:amqp'
+    - 'barbican:amqp'
+
+  - - 'barbican-vault:secrets'
+    - 'barbican:secrets'
+
+  - - 'vault:secrets'
+    - 'barbican-vault:secrets-storage'

src/tests/bundles/jammy-yoga.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/tests.yaml

@@ -2,18 +2,19 @@ charm_name: barbican-vault
 smoke_bundles:
 - focal-ussuri
 gate_bundles:
-- groovy-victoria
-- focal-xena
-- focal-wallaby
-- focal-victoria
-- focal-ussuri
-- bionic-ussuri
-- bionic-train
 - bionic-stein
-dev_bundles:
-- impish-xena
+- bionic-ussuri
+- focal-ussuri
+- focal-victoria
+- focal-wallaby
+- focal-xena
 - hirsute-wallaby
+- impish-xena
+dev_bundles:
 - bionic-rocky
+- bionic-train
+- focal-yoga
+- jammy-yoga
 target_deploy_status:
   barbican-vault:
     workload-status: waiting
@@ -28,5 +29,5 @@ tests:
 tests_options:
   force_deploy:
     - hirsute-wallaby
-    - groovy-victoria
     - impish-xena
+    - jammy-yoga

test-requirements.txt

@@ -3,6 +3,8 @@
 # choices of *requirements.txt files for OpenStack Charms:
 #     https://github.com/openstack-charmers/release-tools
 #
+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

tox.ini

@@ -75,6 +75,11 @@ basepython = python3.8
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py39]
+basepython = python3.9
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2