Add Kinetic and Zed support

* sync charm-helpers to classic charms
* change openstack-origin/source default to zed
* align testing with zed
* add new zed bundles
* add zed bundles to tests.yaml
* add zed tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases
* add bindep.txt for py310
* sync tox.ini and requirements.txt for ruamel
* use charmcraft_channel 1.7/stable

Change-Id: I054650d578c30b5c865cbd7a567eb5d7c8032d01
This commit is contained in:
Corey Bryant 2022-06-10 20:14:45 +00:00
parent 567e457800
commit 5ade0a3b69
12 changed files with 27 additions and 121 deletions

View File

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

4
bindep.txt Normal file
View File

@ -0,0 +1,4 @@
libffi-dev [platform:dpkg]
libpq-dev [platform:dpkg]
libxml2-dev [platform:dpkg]
libxslt1-dev [platform:dpkg]

View File

@ -8,6 +8,7 @@ parts:
- python3-dev
override-build: |
apt-get install ca-certificates -y
apt-get install $(bindep -b)
tox -e build-reactive
override-stage: |
echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
@ -21,13 +22,10 @@ parts:
bases:
- build-on:
- name: ubuntu
channel: "20.04"
channel: "22.04"
architectures:
- amd64
run-on:
- name: ubuntu
channel: "20.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]

View File

@ -2,9 +2,9 @@
templates:
- charm-unit-jobs-py38
- charm-unit-jobs-py310
- charm-xena-functional-jobs
- charm-yoga-functional-jobs
- charm-zed-functional-jobs
vars:
needs_charm_build: true
charm_build_name: barbican
build_type: charmcraft
charmcraft_channel: 1.7/stable

View File

@ -8,6 +8,9 @@
# requirements.txt
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.
# NOTE: newer versions of cryptography require a Rust compiler to build,
# see
# * https://github.com/openstack-charmers/zaza/issues/421
@ -15,9 +18,8 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
#
cryptography<3.4
# Build requirements
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
git+https://github.com/juju/charm-tools#egg=charm-tools
charm-tools==2.8.3; python_version < '3.10'
git+https://github.com/juju/charm-tools.git; python_version >= '3.10'
simplejson

View File

@ -45,6 +45,6 @@ options:
description: |
Maximum allowed http request size against the barbican-api.
openstack-origin:
default: yoga
default: zed
use-internal-endpoints:
default: True

View File

@ -8,7 +8,6 @@ description: |
tags:
- openstack
series:
- focal
- jammy
subordinate: false
requires:

View File

@ -1,81 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga
local_overlay_enabled: False
series: &series focal
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
barbican-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
barbican:
series: *series
charm: ../../../barbican.charm
num_units: 1
options:
openstack-origin: *openstack-origin
debug: true
to:
- '4'
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '5'
channel: latest/edge
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-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'

View File

@ -1,9 +1,9 @@
variables:
openstack-origin: &openstack-origin cloud:focal-xena
openstack-origin: &openstack-origin cloud:jammy-zed
local_overlay_enabled: False
series: &series focal
series: &series jammy
machines:
'0':

View File

@ -3,7 +3,7 @@ variables:
local_overlay_enabled: False
series: &series impish
series: &series kinetic
machines:
'0':

View File

@ -1,15 +1,14 @@
charm_name: barbican
smoke_bundles:
- focal-xena
gate_bundles:
- focal-xena
- impish-xena
dev_bundles:
- focal-yoga
- jammy-yoga
gate_bundles:
- jammy-yoga
dev_bundles:
- jammy-yoga
- jammy-zed
- kinetic-zed
tests:
- zaza.openstack.charm_tests.barbican.tests.BarbicanTest
tests_options:
force_deploy:
- impish-xena
- jammy-yoga
- kinetic-zed

19
tox.ini
View File

@ -34,7 +34,7 @@ setenv = VIRTUAL_ENV={envdir}
LAYER_PATH={toxinidir}/layers
INTERFACE_PATH={toxinidir}/interfaces
JUJU_REPOSITORY={toxinidir}/build
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
passenv = no_proxy http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
install_command =
{toxinidir}/pip.sh install {opts} {packages}
allowlist_externals =
@ -68,21 +68,6 @@ basepython = python3
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py36]
basepython = python3.6
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:py39]
basepython = python3.9
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py310]
basepython = python3.10
deps = -r{toxinidir}/test-requirements.txt
@ -91,7 +76,7 @@ commands = stestr run --slowest {posargs}
[testenv:pep8]
basepython = python3
deps = flake8==3.9.2
charm-tools==2.8.3
git+https://github.com/juju/charm-tools.git
commands = flake8 {posargs} src unit_tests
[testenv:func-target]