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

Updates for caracal testing support 

These updates, on the master branch, are to support testing the caracal
packages and support of the charms for caracal.  They do NOT lock the charms
down, and don't change the testing branches to stable branches.

Change-Id: I24b07f1078ccd803333d2878f7da45af410be27b
This commit is contained in:
Alex Kavanagh 2024-02-09 18:15:47 +00:00 committed by Billy Olsen
parent 59ea5c27c3
commit 2720bd1e48
No known key found for this signature in database
GPG Key ID: 6A8CA9BDB5995260
10 changed files with 92 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
charmcraft.yaml
View File

@ -56,67 +56,3 @@ bases:
- name: ubuntu - name: ubuntu
channel: "22.04" channel: "22.04"
architectures: [arm64] architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "23.04"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.04"
architectures: [arm64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "23.10"
architectures: [arm64]

2
osci.yaml
View File

@ -6,4 +6,4 @@
needs_charm_build: true needs_charm_build: true
charm_build_name: keystone-saml-mellon charm_build_name: keystone-saml-mellon
build_type: charmcraft build_type: charmcraft
charmcraft_channel: 2.x/edge charmcraft_channel: 2.x/stable

2
src/metadata.yaml
View File

@ -21,8 +21,6 @@ tags:
- idP - idP
series: series:
- jammy - jammy
- lunar
- mantic
provides: provides:
keystone-fid-service-provider: keystone-fid-service-provider:
interface: keystone-fid-service-provider interface: keystone-fid-service-provider

22
src/tests/bundles/jammy-antelope.yaml
View File

@ -78,7 +78,7 @@ applications:
block-device: None block-device: None
to: to:
- '3' - '3'
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -87,7 +87,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@ -99,7 +99,7 @@ applications:
- '5' - '5'
- '6' - '6'
- '7' - '7'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -111,7 +111,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
to: to:
- '8' - '8'
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -121,12 +121,12 @@ applications:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
to: to:
- '9' - '9'
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
num_units: 0 num_units: 0
channel: latest/edge channel: 2024.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@ -136,7 +136,7 @@ applications:
network-manager: Neutron network-manager: Neutron
to: to:
- '10' - '10'
channel: latest/edge channel: 2024.1/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -150,7 +150,7 @@ applications:
to: to:
- '11' - '11'
- '12' - '12'
channel: latest/edge channel: 2024.1/edge
openstack-dashboard: openstack-dashboard:
charm: ch:openstack-dashboard charm: ch:openstack-dashboard
@ -161,7 +161,7 @@ applications:
- '13' - '13'
- '14' - '14'
- '15' - '15'
channel: latest/edge channel: 2024.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
@ -184,7 +184,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '18' - '18'
channel: latest/edge channel: 2024.1/edge
keystone-saml-mellon1: keystone-saml-mellon1:
charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
@ -198,6 +198,7 @@ applications:
test-saml-idp1: test-saml-idp1:
charm: ch:ionutbalutoiu-test-saml-idp charm: ch:ionutbalutoiu-test-saml-idp
series: focal
num_units: 1 num_units: 1
options: options:
idp-name: 'test-saml-idp1' idp-name: 'test-saml-idp1'
@ -217,6 +218,7 @@ applications:
test-saml-idp2: test-saml-idp2:
charm: ch:ionutbalutoiu-test-saml-idp charm: ch:ionutbalutoiu-test-saml-idp
series: focal
num_units: 1 num_units: 1
options: options:
idp-name: 'test-saml-idp2' idp-name: 'test-saml-idp2'

22
src/tests/bundles/jammy-bobcat.yaml
View File

@ -78,7 +78,7 @@ applications:
block-device: None block-device: None
to: to:
- '3' - '3'
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -87,7 +87,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@ -99,7 +99,7 @@ applications:
- '5' - '5'
- '6' - '6'
- '7' - '7'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -111,7 +111,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
to: to:
- '8' - '8'
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -121,12 +121,12 @@ applications:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
to: to:
- '9' - '9'
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
num_units: 0 num_units: 0
channel: latest/edge channel: 2024.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@ -136,7 +136,7 @@ applications:
network-manager: Neutron network-manager: Neutron
to: to:
- '10' - '10'
channel: latest/edge channel: 2024.1/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -150,7 +150,7 @@ applications:
to: to:
- '11' - '11'
- '12' - '12'
channel: latest/edge channel: 2024.1/edge
openstack-dashboard: openstack-dashboard:
charm: ch:openstack-dashboard charm: ch:openstack-dashboard
@ -161,7 +161,7 @@ applications:
- '13' - '13'
- '14' - '14'
- '15' - '15'
channel: latest/edge channel: 2024.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
@ -184,7 +184,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '18' - '18'
channel: latest/edge channel: 2024.1/edge
keystone-saml-mellon1: keystone-saml-mellon1:
charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
@ -198,6 +198,7 @@ applications:
test-saml-idp1: test-saml-idp1:
charm: ch:ionutbalutoiu-test-saml-idp charm: ch:ionutbalutoiu-test-saml-idp
series: focal
num_units: 1 num_units: 1
options: options:
idp-name: 'test-saml-idp1' idp-name: 'test-saml-idp1'
@ -217,6 +218,7 @@ applications:
test-saml-idp2: test-saml-idp2:
charm: ch:ionutbalutoiu-test-saml-idp charm: ch:ionutbalutoiu-test-saml-idp
series: focal
num_units: 1 num_units: 1
options: options:
idp-name: 'test-saml-idp2' idp-name: 'test-saml-idp2'

32
src/tests/bundles/mantic-bobcat.yaml → src/tests/bundles/jammy-caracal.yaml
View File

@ -1,9 +1,9 @@
variables: variables:
openstack-origin: &openstack-origin distro openstack-origin: &openstack-origin cloud:jammy-caracal
local_overlay_enabled: True local_overlay_enabled: True
series: mantic series: jammy
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
@ -78,7 +78,7 @@ applications:
block-device: None block-device: None
to: to:
- '3' - '3'
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -87,7 +87,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@ -99,7 +99,7 @@ applications:
- '5' - '5'
- '6' - '6'
- '7' - '7'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -111,7 +111,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
to: to:
- '8' - '8'
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -121,12 +121,12 @@ applications:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
to: to:
- '9' - '9'
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
num_units: 0 num_units: 0
channel: latest/edge channel: 2024.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@ -136,7 +136,7 @@ applications:
network-manager: Neutron network-manager: Neutron
to: to:
- '10' - '10'
channel: latest/edge channel: 2024.1/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -150,7 +150,7 @@ applications:
to: to:
- '11' - '11'
- '12' - '12'
channel: latest/edge channel: 2024.1/edge
openstack-dashboard: openstack-dashboard:
charm: ch:openstack-dashboard charm: ch:openstack-dashboard
@ -161,7 +161,7 @@ applications:
- '13' - '13'
- '14' - '14'
- '15' - '15'
channel: latest/edge channel: 2024.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
@ -184,10 +184,10 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '18' - '18'
channel: latest/edge channel: 2024.1/edge
keystone-saml-mellon1: keystone-saml-mellon1:
charm: ../../../keystone-saml-mellon_ubuntu-23.10-amd64.charm charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
num_units: 0 num_units: 0
options: options:
idp-name: 'test-saml-idp1' idp-name: 'test-saml-idp1'
@ -198,8 +198,8 @@ applications:
test-saml-idp1: test-saml-idp1:
charm: ch:ionutbalutoiu-test-saml-idp charm: ch:ionutbalutoiu-test-saml-idp
num_units: 1
series: focal series: focal
num_units: 1
options: options:
idp-name: 'test-saml-idp1' idp-name: 'test-saml-idp1'
protocol-name: 'mapped' protocol-name: 'mapped'
@ -207,7 +207,7 @@ applications:
auth-user-password: 'userpass1' auth-user-password: 'userpass1'
keystone-saml-mellon2: keystone-saml-mellon2:
charm: ../../../keystone-saml-mellon_ubuntu-23.10-amd64.charm charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
num_units: 0 num_units: 0
options: options:
idp-name: 'test-saml-idp2' idp-name: 'test-saml-idp2'
@ -218,8 +218,8 @@ applications:
test-saml-idp2: test-saml-idp2:
charm: ch:ionutbalutoiu-test-saml-idp charm: ch:ionutbalutoiu-test-saml-idp
num_units: 1
series: focal series: focal
num_units: 1
options: options:
idp-name: 'test-saml-idp2' idp-name: 'test-saml-idp2'
protocol-name: 'mapped' protocol-name: 'mapped'

30
src/tests/bundles/lunar-antelope.yaml → src/tests/bundles/noble-caracal.yaml
View File

@ -3,7 +3,7 @@ variables:
local_overlay_enabled: True local_overlay_enabled: True
series: lunar series: noble
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
@ -78,7 +78,7 @@ applications:
block-device: None block-device: None
to: to:
- '3' - '3'
channel: latest/edge channel: 2024.1/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -87,7 +87,7 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '4' - '4'
channel: latest/edge channel: 2024.1/edge
keystone: keystone:
charm: ch:keystone charm: ch:keystone
@ -99,7 +99,7 @@ applications:
- '5' - '5'
- '6' - '6'
- '7' - '7'
channel: latest/edge channel: 2024.1/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -111,7 +111,7 @@ applications:
neutron-security-groups: true neutron-security-groups: true
to: to:
- '8' - '8'
channel: latest/edge channel: 2024.1/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -121,12 +121,12 @@ applications:
bridge-mappings: physnet1:br-ex bridge-mappings: physnet1:br-ex
to: to:
- '9' - '9'
channel: latest/edge channel: 2024.1/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
num_units: 0 num_units: 0
channel: latest/edge channel: 2024.1/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@ -136,7 +136,7 @@ applications:
network-manager: Neutron network-manager: Neutron
to: to:
- '10' - '10'
channel: latest/edge channel: 2024.1/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -150,7 +150,7 @@ applications:
to: to:
- '11' - '11'
- '12' - '12'
channel: latest/edge channel: 2024.1/edge
openstack-dashboard: openstack-dashboard:
charm: ch:openstack-dashboard charm: ch:openstack-dashboard
@ -161,7 +161,7 @@ applications:
- '13' - '13'
- '14' - '14'
- '15' - '15'
channel: latest/edge channel: 2024.1/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
@ -184,10 +184,10 @@ applications:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '18' - '18'
channel: latest/edge channel: 2024.1/edge
keystone-saml-mellon1: keystone-saml-mellon1:
charm: ../../../keystone-saml-mellon_ubuntu-23.03-amd64.charm charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
num_units: 0 num_units: 0
options: options:
idp-name: 'test-saml-idp1' idp-name: 'test-saml-idp1'
@ -198,8 +198,8 @@ applications:
test-saml-idp1: test-saml-idp1:
charm: ch:ionutbalutoiu-test-saml-idp charm: ch:ionutbalutoiu-test-saml-idp
num_units: 1
series: focal series: focal
num_units: 1
options: options:
idp-name: 'test-saml-idp1' idp-name: 'test-saml-idp1'
protocol-name: 'mapped' protocol-name: 'mapped'
@ -207,7 +207,7 @@ applications:
auth-user-password: 'userpass1' auth-user-password: 'userpass1'
keystone-saml-mellon2: keystone-saml-mellon2:
charm: ../../../keystone-saml-mellon_ubuntu-23.03-amd64.charm charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
num_units: 0 num_units: 0
options: options:
idp-name: 'test-saml-idp2' idp-name: 'test-saml-idp2'
@ -218,8 +218,8 @@ applications:
test-saml-idp2: test-saml-idp2:
charm: ch:ionutbalutoiu-test-saml-idp charm: ch:ionutbalutoiu-test-saml-idp
num_units: 1
series: focal series: focal
num_units: 1
options: options:
idp-name: 'test-saml-idp2' idp-name: 'test-saml-idp2'
protocol-name: 'mapped' protocol-name: 'mapped'

14
src/tests/tests.yaml
View File

@ -1,16 +1,13 @@
charm_name: keystone-saml-mellon charm_name: keystone-saml-mellon
smoke_bundles: smoke_bundles:
- jammy-antelope - jammy-caracal
gate_bundles: gate_bundles:
- jammy-antelope - jammy-antelope
dev_bundles:
- jammy-bobcat - jammy-bobcat
- lunar-antelope - jammy-caracal
- mantic-bobcat dev_bundles:
- noble-caracal
configure: configure:
- zaza.openstack.charm_tests.vault.setup.auto_initialize - zaza.openstack.charm_tests.vault.setup.auto_initialize
- zaza.openstack.charm_tests.saml_mellon.setup.attach_saml_resources_idp1 - zaza.openstack.charm_tests.saml_mellon.setup.attach_saml_resources_idp1
@ -55,5 +52,4 @@ target_deploy_status:
tests_options: tests_options:
force_deploy: force_deploy:
- lunar-antelope - noble-caracal
- mantic-bobcat

4
src/tox.ini
View File

@ -25,7 +25,9 @@ passenv =
CS_* CS_*
OS_* OS_*
TEST_* TEST_*
deps = -r{toxinidir}/test-requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
[testenv:pep8] [testenv:pep8]
basepython = python3 basepython = python3

12
tox.ini
View File

@ -59,12 +59,16 @@ commands =
[testenv:py3] [testenv:py3]
basepython = python3 basepython = python3
deps = -r{toxinidir}/test-requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
[testenv:py310] [testenv:py310]
basepython = python3.10 basepython = python3.10
deps = -r{toxinidir}/test-requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
[testenv:pep8] [testenv:pep8]
@ -77,7 +81,9 @@ commands = flake8 {posargs} src unit_tests
# Technique based heavily upon # Technique based heavily upon
# https://github.com/openstack/nova/blob/master/tox.ini # https://github.com/openstack/nova/blob/master/tox.ini
basepython = python3 basepython = python3
deps = -r{toxinidir}/requirements.txt deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}