Release sync for 20.08

- Classic charms: sync charm-helpers.
- Classic ceph based charms:  also sync charms.ceph
- Reactive charms: trigger a rebuild
- sync tox.ini
- sync requirements.txt and test-requirements.txt
- Remove vault HA in functional tests as etcd/easyrsa were not included.
  In order to have a faster gate, the HA on vault is dropped and it will
  be tested in the vault gate test and other scenario tests.

Change-Id: I2eacde1d08734c32731df3dfa43da738871792a8

rebuild

@@ -2,4 +2,4 @@
 # when dependencies of the charm change,
 # but nothing in the charm needs to.
 # simply change the uuid to something new
-91754c32-a4d0-11ea-944e-47086ab8490d
+d994e036-d02c-11ea-b230-875ee8d654e2

src/tests/bundles/bionic-rocky.yaml

@@ -38,4 +38,4 @@ applications:
     num_units: 1
   vault:
     charm: cs:~openstack-charmers-next/vault
-    num_units: 3
+    num_units: 1

src/tests/bundles/bionic-stein.yaml

@@ -38,4 +38,4 @@ applications:
     num_units: 1
   vault:
     charm: cs:~openstack-charmers-next/vault
-    num_units: 3
+    num_units: 1

src/tests/bundles/bionic-train.yaml

@@ -38,4 +38,4 @@ applications:
     num_units: 1
   vault:
     charm: cs:~openstack-charmers-next/vault
-    num_units: 3
+    num_units: 1

src/tests/bundles/bionic-ussuri.yaml

@@ -36,4 +36,4 @@ applications:
     num_units: 1
   vault:
     charm: cs:~openstack-charmers-next/vault
-    num_units: 3
+    num_units: 1

src/tests/bundles/focal-ussuri.yaml

@@ -18,8 +18,6 @@ machines:
   '6':
   '7':
   '8':
-  '9':
-  '10':
 
 applications:
 
@@ -55,8 +53,8 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '4'
-      - '9'
-      - '10'
+      - '5'
+      - '6'
 
   barbican-vault:
     charm: ../../../barbican-vault
@@ -68,14 +66,12 @@ applications:
     options:
       source: *openstack-origin
     to:
-      - '5'
+      - '7'
 
   vault:
     charm: cs:~openstack-charmers-next/vault
-    num_units: 3
+    num_units: 1
     to:
-      - '6'
-      - '7'
       - '8'
 
 relations:

src/tests/bundles/overlays/local-charm-overlay.yaml.j2

@@ -1,16 +1,9 @@
 applications:
-  vault:
-    options:
-        vip: '{{ TEST_VIP00 }}'
   barbican:
     options:
         vip: '{{ TEST_VIP01 }}'
-  vault-hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
   barbican-hacluster:
     charm: cs:~openstack-charmers-next/hacluster
 relations:
-- - vault:ha
-  - vault-hacluster:ha
 - - barbican:ha
-  - barbican-hacluster:ha
+  - barbican-hacluster:ha

src/tests/tests.yaml

@@ -18,6 +18,3 @@ configure:
 - zaza.openstack.charm_tests.vault.setup.basic_setup
 tests:
 - zaza.openstack.charm_tests.barbican_vault.tests.BarbicanVaultUnsealVault
-tests_options:
-  force_deploy:
-    - focal-ussuri

test-requirements.txt

@@ -4,7 +4,7 @@
 #     https://github.com/openstack-charmers/release-tools
 #
 # Lint and unit test requirements
-flake8>=2.2.4
+flake8>=2.2.4,<=2.4.1
 stestr>=2.2.0
 requests>=2.18.4
 charms.reactive

tox.ini

@@ -50,6 +50,11 @@ basepython = python3.7
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py38]
+basepython = python3.8
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = -r{toxinidir}/test-requirements.txt