Add Antelope support

* sync charm-helpers to classic charms
* change openstack-origin/source default to antelope
* align testing with antelope
* add new antelope bundles
* add antelope bundles to tests.yaml
* add antelope tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases

func-test-pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/1024
Change-Id: I1982af08916ef0e6e61af84443109ed7ea0ac61c

.zuul.yaml

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

build-requirements.txt

@@ -1,7 +0,0 @@
-# NOTES(lourot):
-# * We don't install charmcraft via pip anymore because it anyway spins up a
-#   container and scp the system's charmcraft snap inside it. So the charmcraft
-#   snap is necessary on the system anyway.
-# * `tox -e build` successfully validated with charmcraft 1.2.1
-
-cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.

charmcraft.yaml

@@ -23,3 +23,6 @@ bases:
       - name: ubuntu
         channel: "22.10"
         architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [amd64, s390x, ppc64el, arm64]

osci.yaml

@@ -1,9 +1,9 @@
 - project:
     templates:
       - charm-unit-jobs-py310
-      - charm-zed-functional-jobs
+      - charm-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: keystone-kerberos
       build_type: charmcraft
-      charmcraft_channel: 2.0/stable
+      charmcraft_channel: 2.1/stable

pip.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file is managed centrally by release-tools and should not be modified
-# within individual charm repos.  See the 'global' dir contents for available
-# choices of tox.ini for OpenStack Charms:
-#     https://github.com/openstack-charmers/release-tools
-#
-# setuptools 58.0 dropped the support for use_2to3=true which is needed to
-# install blessings (an indirect dependency of charm-tools).
-#
-# More details on the beahvior of tox and virtualenv creation can be found at
-# https://github.com/tox-dev/tox/issues/448
-#
-# This script is wrapper to force the use of the pinned versions early in the
-# process when the virtualenv was created and upgraded before installing the
-# depedencies declared in the target.
-pip install 'pip<20.3' 'setuptools<50.0.0'
-pip "$@"

src/metadata.yaml

@@ -12,6 +12,7 @@ tags:
 series:
 - jammy
 - kinetic
+- lunar
 subordinate: true
 provides:
   keystone-fid-service-provider:

src/test-requirements.txt

@@ -4,9 +4,6 @@
 #     https://github.com/openstack-charmers/release-tools
 #
 
-# Need tox to be available from tox... inception yes, but its a workaround for now
-tox
-
 # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack

src/tests/bundles/jammy-antelope.yaml

@@ -0,0 +1,70 @@
+variables:
+  openstack-origin: &openstack-origin cloud:jammy-antelope
+
+local_overlay_enabled: False
+
+series: jammy
+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':
+    series: focal
+  '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: ch:mysql-router
+    channel: latest/edge
+
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    to:
+    - '0'
+    - '1'
+    - '2'
+    channel: latest/edge
+
+  keystone:
+    charm: ch:keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      token-provider: 'fernet'
+      token-expiration: 60
+    to:
+    - '3'
+    channel: latest/edge
+  keystone-kerberos:
+    charm: ../../../keystone-kerberos.charm
+    options:
+      kerberos-realm: 'TESTUBUNTU.COM'
+      kerberos-server: 'kerberos.testubuntu.com'
+      kerberos-domain: 'k8s'
+    resource:
+      keystone_keytab: keystone.keytab
+
+  kerberos-server:
+    charm: ch:openstack-charmers-next-kerberos-test-fixture
+    series: focal
+    num_units: 1
+    to:
+      - '4'
+  ubuntu-test-host:
+    charm: cs:ubuntu
+    num_units: 1
+    to:
+      - '5'

src/tests/bundles/lunar-antelope.yaml

@@ -3,7 +3,7 @@ variables:
 
 local_overlay_enabled: False
 
-series: jammy
+series: lunar
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
 machines:

src/tests/tests.yaml

@@ -1,15 +1,15 @@
 charm_name: keystone-kerberos
 
 smoke_bundles:
-  - jammy-yoga
+  - jammy-zed
 
 gate_bundles:
-  - jammy-yoga
+  - jammy-zed
 
 dev_bundles:
-  - jammy-yoga
+  - jammy-antelope
-  - jammy-zed
   - kinetic-zed
+  - lunar-antelope
 
 configure:
   - zaza.openstack.charm_tests.kerberos.setup.run_all_configuration_steps
@@ -20,6 +20,7 @@ tests:
 tests_options:
   force_deploy:
     - kinetic-zed
+    - lunar-antelope
 
 target_deploy_status:
   keystone-kerberos:

src/tox.ini

@@ -6,32 +6,26 @@
 
 [tox]
 envlist = pep8
-skipsdist = True
 # NOTE: Avoid build/test env pollution by not enabling sitepackages.
 sitepackages = False
 # NOTE: Avoid false positives by not skipping missing interpreters.
 skip_missing_interpreters = False
-# NOTES:
-# * We avoid the new dependency resolver by pinning pip < 20.3, see
-#   https://github.com/pypa/pip/issues/9187
-# * Pinning dependencies requires tox >= 3.2.0, see
-#   https://tox.readthedocs.io/en/latest/config.html#conf-requires
-# * It is also necessary to pin virtualenv as a newer virtualenv would still
-#   lead to fetching the latest pip in the func* tox targets, see
-#   https://stackoverflow.com/a/38133283
-requires = pip < 20.3
-           virtualenv < 20.0
-# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
-minversion = 3.18.0
 
 [testenv]
+# We use tox mainly for virtual environment management for test requirements
+# and do not install the charm code as a Python package into that environment.
+# Ref: https://tox.wiki/en/latest/config.html#skip_install
+skip_install = True
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
 allowlist_externals = juju
-passenv = HOME TERM CS_* OS_* TEST_*
+passenv =
+    HOME
+    TERM
+    CS_*
+    OS_*
+    TEST_*
 deps = -r{toxinidir}/test-requirements.txt
-install_command =
-  pip install {opts} {packages}
 
 [testenv:pep8]
 basepython = python3

tox.ini

@@ -5,51 +5,49 @@
 #     https://github.com/openstack-charmers/release-tools
 
 [tox]
-skipsdist = True
 envlist = pep8,py3
 # NOTE: Avoid build/test env pollution by not enabling sitepackages.
 sitepackages = False
 # NOTE: Avoid false positives by not skipping missing interpreters.
 skip_missing_interpreters = False
-# NOTES:
-# * We avoid the new dependency resolver by pinning pip < 20.3, see
-#   https://github.com/pypa/pip/issues/9187
-# * Pinning dependencies requires tox >= 3.2.0, see
-#   https://tox.readthedocs.io/en/latest/config.html#conf-requires
-# * It is also necessary to pin virtualenv as a newer virtualenv would still
-#   lead to fetching the latest pip in the func* tox targets, see
-#   https://stackoverflow.com/a/38133283
-requires =
-  pip < 20.3
-  virtualenv < 20.0
-  setuptools<50.0.0
-
-# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
-minversion = 3.18.0
 
 [testenv]
+# We use tox mainly for virtual environment management for test requirements
+# and do not install the charm code as a Python package into that environment.
+# Ref: https://tox.wiki/en/latest/config.html#skip_install
+skip_install = True
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          TERM=linux
+         CHARM_LAYERS_DIR={toxinidir}/layers
+         CHARM_INTERFACES_DIR={toxinidir}/interfaces
          JUJU_REPOSITORY={toxinidir}/build
-passenv = no_proxy http_proxy https_proxy JUJU_REPOSITORY
+passenv =
-install_command =
+    no_proxy
-  {toxinidir}/pip.sh install {opts} {packages}
+    http_proxy
+    https_proxy
+    CHARM_INTERFACES_DIR
+    CHARM_LAYERS_DIR
+    JUJU_REPOSITORY
 allowlist_externals =
     charmcraft
     bash
     tox
-    rename.sh
+    {toxinidir}/rename.sh
 deps =
     -r{toxinidir}/requirements.txt
 
 [testenv:build]
 basepython = python3
-deps = -r{toxinidir}/build-requirements.txt
+# charmcraft clean is done to ensure that
+# `tox -e build` always performs a clean, repeatable build.
+# For faster rebuilds during development,
+# directly run `charmcraft -v pack && ./rename.sh`.
 commands =
     charmcraft clean
     charmcraft -v pack
     {toxinidir}/rename.sh
+    charmcraft clean
 
 [testenv:build-reactive]
 basepython = python3
@@ -77,18 +75,6 @@ deps = flake8==3.9.2
        git+https://github.com/juju/charm-tools.git
 commands = flake8 {posargs} src unit_tests
 
-[testenv:func-target]
-# Hack to get functional tests working in the charmcraft
-# world. We should fix this.
-basepython = python3
-passenv = HOME TERM CS_* OS_* TEST_*
-deps = -r{toxinidir}/src/test-requirements.txt
-changedir = {toxinidir}/src
-commands =
-  bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi"
-  tox --version
-  tox -e func-target {posargs}
-
 [testenv:cover]
 # Technique based heavily upon
 # https://github.com/openstack/nova/blob/master/tox.ini