Add gitreview, zuul, groovy and victoria bits

Also refresh tox config and requirements from release-tools templates.

Change-Id: I015d8a85cd86da8ee65549a13fbc6d8ee56704a0

.gitreview

@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/charm-keystone-kerberos.git

.zuul.yaml

@@ -0,0 +1,4 @@
+- project:
+    templates:
+      - openstack-python3-charm-jobs
+      - openstack-cover-jobs

requirements.txt

@@ -5,4 +5,6 @@
 #
 # Build requirements
 charm-tools>=2.4.4
-simplejson
+# importlib-resources 1.1.0 removed Python 3.5 support
+importlib-resources<1.1.0
+simplejson

src/metadata.yaml

@@ -12,6 +12,7 @@ tags:
 series:
   - bionic
   - focal
+  - groovy
 subordinate: true
 provides:
   keystone-fid-service-provider:

src/tests/bundles/focal-ussuri.yaml

@@ -1,3 +1,6 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
 series: focal
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
@@ -5,27 +8,42 @@ machines:
   '0':
     constraints: mem=3072M
   '1':
+    constraints: mem=3072M
   '2':
+    constraints: mem=3072M
   '3':
+  '4':
+  '5':
 relations:
 - - keystone:shared-db
-  - mysql:shared-db
+  - keystone-mysql-router:shared-db
+- - keystone-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
 - - keystone
   - keystone-kerberos
 applications:
-  mysql:
+  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers-next/mysql-router
-    num_units: 1
+
+  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
       token-provider: 'fernet'
       token-expiration: 60
     to:
-    - '1'
+    - '3'
   keystone-kerberos:
     charm: ../../../keystone-kerberos
     options:
@@ -39,9 +57,9 @@ applications:
     charm: cs:~openstack-charmers-next/kerberos-test-fixture
     num_units: 1
     to:
-      - '2'
+      - '4'
   ubuntu-test-host:
     charm: cs:ubuntu
     num_units: 1
     to:
-      - '3'
+      - '5'

src/tests/bundles/focal-victoria.yaml

@@ -0,0 +1,65 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-victoria
+
+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':
+relations:
+- - keystone:shared-db
+  - keystone-mysql-router:shared-db
+- - keystone-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - keystone
+  - keystone-kerberos
+applications:
+  keystone-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
+      token-provider: 'fernet'
+      token-expiration: 60
+    to:
+    - '3'
+  keystone-kerberos:
+    charm: ../../../keystone-kerberos
+    options:
+      kerberos-realm: 'TESTUBUNTU.COM'
+      kerberos-server: 'kerberos.testubuntu.com'
+      kerberos-domain: 'k8s'
+    resource:
+      keystone_keytab: keystone.keytab
+
+  kerberos-server:
+    charm: cs:~openstack-charmers-next/kerberos-test-fixture
+    num_units: 1
+    to:
+      - '4'
+  ubuntu-test-host:
+    charm: cs:ubuntu
+    num_units: 1
+    to:
+      - '5'

src/tests/bundles/groovy-victoria.yaml

@@ -0,0 +1,65 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: groovy
+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':
+relations:
+- - keystone:shared-db
+  - keystone-mysql-router:shared-db
+- - keystone-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - keystone
+  - keystone-kerberos
+applications:
+  keystone-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
+      token-provider: 'fernet'
+      token-expiration: 60
+    to:
+    - '3'
+  keystone-kerberos:
+    charm: ../../../keystone-kerberos
+    options:
+      kerberos-realm: 'TESTUBUNTU.COM'
+      kerberos-server: 'kerberos.testubuntu.com'
+      kerberos-domain: 'k8s'
+    resource:
+      keystone_keytab: keystone.keytab
+
+  kerberos-server:
+    charm: cs:~openstack-charmers-next/kerberos-test-fixture
+    num_units: 1
+    to:
+      - '4'
+  ubuntu-test-host:
+    charm: cs:ubuntu
+    num_units: 1
+    to:
+      - '5'

src/tests/tests.yaml

@@ -6,16 +6,18 @@ gate_bundles:
   - bionic-rocky
   - bionic-stein
   - bionic-train
-dev_bundles:
   - bionic-ussuri
   - focal-ussuri
+dev_bundles:
+  - focal-victoria
+  - groovy-victoria
 configure:
   - zaza.openstack.charm_tests.kerberos.setup.run_all_configuration_steps
 tests:
   - zaza.openstack.charm_tests.kerberos.tests.CharmKeystoneKerberosTest
 tests_options:
   force_deploy:
-    - focal-ussuri
+    - groovy-victoria
 target_deploy_status:
   keystone-kerberos:
     workload-status: blocked

src/tox.ini

@@ -47,4 +47,4 @@ commands =
     functest-run-suite --keep-model --bundle {posargs}
 
 [testenv:venv]
-commands = {posargs}
+commands = {posargs}

test-requirements.txt

@@ -1,6 +1,7 @@
-# This file is managed centrally.  If you find the need to modify this as a
+# This file is managed centrally by release-tools and should not be modified
-# one-off, please don't.  Intead, consult #openstack-charms and ask about
+# within individual charm repos.  See the 'global' dir contents for available
-# requirements management in charms via bot-control.  Thank you.
+# choices of *requirements.txt files for OpenStack Charms:
+#     https://github.com/openstack-charmers/release-tools
 #
 # Lint and unit test requirements
 flake8>=2.2.4,<=2.4.1
@@ -11,3 +12,12 @@ mock>=1.2
 nose>=1.3.7
 coverage>=3.6
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
+#
+# Revisit for removal / mock improvement:
+netifaces        # vault
+psycopg2-binary  # vault
+tenacity         # vault
+pbr              # vault
+cryptography     # vault, keystone-saml-mellon
+lxml             # keystone-saml-mellon
+hvac             # vault, barbican-vault

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
@@ -89,4 +94,4 @@ commands = {posargs}
 
 [flake8]
 # E402 ignore necessary for path append before sys module import in actions
-ignore = E402,W504
+ignore = E402,W503