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

osci.yaml

@@ -1,14 +1,15 @@
 - project:
     templates:
-      - charm-unit-jobs
+      - charm-yoga-unit-jobs
     check:
       jobs:
       - bionic-basic
       - focal-basic
-      - groovy-basic
       - hirsute-basic
       - impish-basic:
           voting: false
+      - jammy-basic:
+          voting: false
     vars:
       needs_charm_build: true
       charm_build_name: pacemaker-remote
@@ -18,10 +19,9 @@
     parent: func-target
     dependencies: 
       - osci-lint
-      - tox-py35
       - tox-py36
-      - tox-py37
       - tox-py38
+      - tox-py39
     vars:
       tox_extra_args: bionic-basic
 - job:
@@ -31,12 +31,6 @@
       - bionic-basic
     vars:
       tox_extra_args: focal-basic
-- job:
-    name: groovy-basic
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: groovy-basic
 - job:
     name: hirsute-basic
     parent: func-target
@@ -49,3 +43,9 @@
     dependencies: *smoke-jobs
     vars:
       tox_extra_args: impish-basic
+- job:
+    name: jammy-basic
+    parent: func-target
+    dependencies: *smoke-jobs
+    vars:
+      tox_extra_args: jammy-basic

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/jammy-basic.yaml

@@ -1,9 +1,9 @@
-series: groovy
+series: jammy
 
 applications:
 
   api:
-    charm: cs:groovy/ubuntu
+    charm: cs:ubuntu
     num_units: 3
 
   hacluster:
@@ -13,7 +13,7 @@ applications:
       cluster_count: 3
 
   compute:
-    charm: cs:groovy/ubuntu
+    charm: cs:ubuntu
     num_units: 1
 
   pacemaker-remote:

src/tests/tests.yaml

@@ -9,7 +9,8 @@ configure:
 gate_bundles:
   - bionic-basic
   - focal-basic
-  - groovy-basic
+  - hirsute-basic
+  - impish-basic
 
 smoke_bundles:
   - focal-basic
@@ -17,6 +18,7 @@ smoke_bundles:
 dev_bundles:
   - hirsute-basic
   - impish-basic
+  - jammy-basic
 
 target_deploy_status:
   # NOTE(lourot): cs:ubuntu has now an empty status message when ready:
@@ -29,7 +31,8 @@ target_deploy_status:
 
 tests_options:
   force_deploy:
-    # NOTE(lourot): cs:ubuntu doesn't support hirsute officially in its
+    # NOTE(lourot): cs:ubuntu doesn't support hirsute+ officially in its
     # metadata:
     - hirsute-basic
     - impish-basic
+    - jammy-basic

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