openstack/charm-keystone-saml-mellon
Code Issues Proposed changes

Add Kinetic and Zed support

Browse Source 
* 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 2.0/stable
* drop reactive plugin overrides
* move interface/layer env vars to charmcraft.yaml

Change-Id: I4cae0a313230a8617beac36a2dbfe0c019c5e0de
This commit is contained in:
Corey Bryant 2022-06-10 20:14:47 +00:00
parent bfa9711e37
commit 1167cc6133
17 changed files with 73 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

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

73
charmcraft.yaml
View File

@ -10,6 +10,11 @@ parts:
- libssl-dev
- libxml2-dev
- libxslt1-dev
- rustc
- cargo
build-environment:
- CHARM_INTERFACES_DIR: /root/project/interfaces/
- CHARM_LAYERS_DIR: /root/project/layers/
override-build: |
apt-get install ca-certificates -y
tox -e build-reactive
@ -27,27 +32,47 @@ parts:
chmod +x src/charm.py
bases:
- name: ubuntu
channel: "20.04"
architectures: [amd64]
- name: ubuntu
channel: "20.04"
architectures: [arm64]
- name: ubuntu
channel: "20.04"
architectures: [ppc64el]
- name: ubuntu
channel: "20.04"
architectures: [s390x]
- name: ubuntu
channel: "22.04"
architectures: [amd64]
- name: ubuntu
channel: "22.04"
architectures: [arm64]
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
- name: ubuntu
channel: "22.04"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
- name: ubuntu
channel: "22.10"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
- name: ubuntu
channel: "22.10"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "22.10"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [s390x]
- name: ubuntu
channel: "22.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.10"
architectures: [s390x]

4
osci.yaml
View File

@ -1,9 +1,7 @@
- project:
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: keystone-saml-mellon

23
requirements.txt
View File

@ -3,28 +3,7 @@
# choices of *requirements.txt files for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
#
# NOTE(lourot): This might look like a duplication of test-requirements.txt but
# some tox targets use only test-requirements.txt whereas charm-build uses only
# requirements.txt
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
# NOTE: newer versions of cryptography require a Rust compiler to build,
# see
# * https://github.com/openstack-charmers/zaza/issues/421
# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
#
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
git+https://github.com/juju/charm-tools.git
simplejson
# Newer versions use keywords that didn't exist in python 3.5 yet (e.g.
# "ModuleNotFoundError")
# NOTE(lourot): This might look like a duplication of test-requirements.txt but
# some tox targets use only test-requirements.txt whereas charm-build uses only
# requirements.txt
importlib-metadata<3.0.0; python_version < '3.6'
importlib-resources<3.0.0; python_version < '3.6'

2
src/metadata.yaml
View File

@ -20,8 +20,8 @@ tags:
- federation
- idP
series:
- focal
- jammy
- kinetic
provides:
keystone-fid-service-provider:
interface: keystone-fid-service-provider

16
src/tests/bundles/jammy-yoga.yaml
View File

@ -152,11 +152,6 @@ applications:
- '12'
channel: latest/edge
ntp:
charm: cs:ntp
series: focal
num_units: 0
openstack-dashboard:
charm: ch:openstack-dashboard
num_units: 3
@ -194,7 +189,7 @@ applications:
channel: latest/edge
keystone-saml-mellon1:
charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
num_units: 0
options:
idp-name: 'test-saml-idp1'
@ -214,8 +209,7 @@ applications:
auth-user-password: 'userpass1'
keystone-saml-mellon2:
series: groovy
charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
num_units: 0
options:
idp-name: 'test-saml-idp2'
@ -348,12 +342,6 @@ relations:
- - 'cinder-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ntp:juju-info'
- 'nova-compute:juju-info'
- - 'ntp:juju-info'
- 'neutron-gateway:juju-info'
- - 'keystone'
- 'keystone-saml-mellon1'
- - 'keystone'

19
src/tests/bundles/focal-yoga.yaml → src/tests/bundles/jammy-zed.yaml
View File

@ -1,9 +1,9 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga
openstack-origin: &openstack-origin cloud:jammy-zed
local_overlay_enabled: False
series: focal
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -152,10 +152,6 @@ applications:
- '12'
channel: latest/edge
ntp:
charm: cs:ntp
num_units: 0
openstack-dashboard:
charm: ch:openstack-dashboard
num_units: 3
@ -193,7 +189,7 @@ applications:
channel: latest/edge
keystone-saml-mellon1:
charm: ../../../keystone-saml-mellon_ubuntu-20.04-amd64.charm
charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
num_units: 0
options:
idp-name: 'test-saml-idp1'
@ -212,8 +208,7 @@ applications:
auth-user-password: 'userpass1'
keystone-saml-mellon2:
series: focal
charm: ../../../keystone-saml-mellon_ubuntu-20.04-amd64.charm
charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
num_units: 0
options:
idp-name: 'test-saml-idp2'
@ -345,12 +340,6 @@ relations:
- - 'cinder-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ntp:juju-info'
- 'nova-compute:juju-info'
- - 'ntp:juju-info'
- 'neutron-gateway:juju-info'
- - 'keystone'
- 'keystone-saml-mellon1'
- - 'keystone'

21
src/tests/bundles/focal-xena.yaml → src/tests/bundles/kinetic-zed.yaml
View File

@ -1,9 +1,9 @@
variables:
openstack-origin: &openstack-origin cloud:focal-xena
openstack-origin: &openstack-origin distro
local_overlay_enabled: False
series: focal
series: kinetic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -152,10 +152,6 @@ applications:
- '12'
channel: latest/edge
ntp:
charm: cs:ntp
num_units: 0
openstack-dashboard:
charm: ch:openstack-dashboard
num_units: 3
@ -193,7 +189,7 @@ applications:
channel: latest/edge
keystone-saml-mellon1:
charm: ../../../keystone-saml-mellon_ubuntu-20.04-amd64.charm
charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
num_units: 0
options:
idp-name: 'test-saml-idp1'
@ -205,6 +201,7 @@ applications:
test-saml-idp1:
charm: ch:ionutbalutoiu-test-saml-idp
num_units: 1
series: focal
options:
idp-name: 'test-saml-idp1'
protocol-name: 'mapped'
@ -212,8 +209,7 @@ applications:
auth-user-password: 'userpass1'
keystone-saml-mellon2:
series: focal
charm: ../../../keystone-saml-mellon_ubuntu-20.04-amd64.charm
charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
num_units: 0
options:
idp-name: 'test-saml-idp2'
@ -225,6 +221,7 @@ applications:
test-saml-idp2:
charm: ch:ionutbalutoiu-test-saml-idp
num_units: 1
series: focal
options:
idp-name: 'test-saml-idp2'
protocol-name: 'mapped'
@ -345,12 +342,6 @@ relations:
- - 'cinder-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ntp:juju-info'
- 'nova-compute:juju-info'
- - 'ntp:juju-info'
- 'neutron-gateway:juju-info'
- - 'keystone'
- 'keystone-saml-mellon1'
- - 'keystone'

1
src/tests/bundles/overlays/focal-wallaby.yaml.j2
View File

@ -1 +0,0 @@
ha.yaml.j2

1
src/tests/bundles/overlays/focal-xena.yaml.j2
View File

@ -1 +0,0 @@
ha.yaml.j2

1
src/tests/bundles/overlays/focal-yoga.yaml.j2
View File

@ -1 +0,0 @@
ha.yaml.j2

0
src/tests/bundles/overlays/focal-ussuri.yaml.j2 → src/tests/bundles/overlays/jammy-zed.yaml.j2
View File

0
src/tests/bundles/overlays/focal-victoria.yaml.j2 → src/tests/bundles/overlays/kinetic-zed.yaml.j2
View File

9
src/tests/tests.yaml
View File

@ -1,14 +1,15 @@
charm_name: keystone-saml-mellon
smoke_bundles:
- focal-xena
- jammy-yoga
gate_bundles:
- focal-xena
- jammy-yoga
dev_bundles:
- focal-yoga
- jammy-yoga
- jammy-zed
- kinetic-zed
configure:
- zaza.openstack.charm_tests.vault.setup.auto_initialize
@ -54,4 +55,4 @@ target_deploy_status:
tests_options:
force_deploy:
- jammy-yoga
- kinetic-zed

6
src/wheelhouse.txt
View File

@ -1,8 +1,4 @@
# NOTE(lourot): newer versions of cryptography require a Rust compiler to build,
# see
# * https://github.com/openstack-charmers/zaza/issues/421
# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
cryptography<3.4
cryptography
lxml
psutil

18
test-requirements.txt
View File

@ -4,7 +4,6 @@
# 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
@ -13,25 +12,10 @@ stestr>=2.2.0
# https://github.com/mtreinish/stestr/issues/145
cliff<3.0.0
# Dependencies of stestr. Newer versions use keywords that didn't exist in
# python 3.5 yet (e.g. "ModuleNotFoundError")
importlib-metadata<3.0.0; python_version < '3.6'
importlib-resources<3.0.0; python_version < '3.6'
# Some Zuul nodes sometimes pull newer versions of these dependencies which
# dropped support for python 3.5:
osprofiler<2.7.0;python_version<'3.6'
stevedore<1.31.0;python_version<'3.6'
debtcollector<1.22.0;python_version<'3.6'
oslo.utils<=3.41.0;python_version<'3.6'
requests>=2.18.4
charms.reactive
# Newer mock seems to have some syntax which is newer than python3.5 (e.g.
# f'{something}'
mock>=1.2,<4.0.0; python_version < '3.6'
mock>=1.2; python_version >= '3.6'
mock>=1.2
nose>=1.3.7
coverage>=3.6

19
tox.ini
View File

@ -19,10 +19,8 @@ minversion = 3.18.0
setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0
TERM=linux
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 JUJU_REPOSITORY
install_command =
{toxinidir}/pip.sh install {opts} {packages}
allowlist_externals =
@ -54,21 +52,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