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
channel: "22.04"
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
charm_build_name: keystone-saml-mellon
build_type: charmcraft
charmcraft_channel: 2.x/edge
charmcraft_channel: 2.x/stable

12
src/metadata.yaml
View File

@ -15,14 +15,12 @@ description: The main goal of this charm is to generate the necessary configurat
and using them in mappings defined by an operator or validating the existence of
referenced IDs.
tags:
- openstack
- identity
- federation
- idP
- openstack
- identity
- federation
- idP
series:
- jammy
- lunar
- mantic
- jammy
provides:
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
to:
- '3'
channel: latest/edge
channel: 2024.1/edge
glance:
charm: ch:glance
@ -87,7 +87,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: latest/edge
channel: 2024.1/edge
keystone:
charm: ch:keystone
@ -99,7 +99,7 @@ applications:
- '5'
- '6'
- '7'
channel: latest/edge
channel: 2024.1/edge
neutron-api:
charm: ch:neutron-api
@ -111,7 +111,7 @@ applications:
neutron-security-groups: true
to:
- '8'
channel: latest/edge
channel: 2024.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -121,12 +121,12 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '9'
channel: latest/edge
channel: 2024.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
num_units: 0
channel: latest/edge
channel: 2024.1/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -136,7 +136,7 @@ applications:
network-manager: Neutron
to:
- '10'
channel: latest/edge
channel: 2024.1/edge
nova-compute:
charm: ch:nova-compute
@ -150,7 +150,7 @@ applications:
to:
- '11'
- '12'
channel: latest/edge
channel: 2024.1/edge
openstack-dashboard:
charm: ch:openstack-dashboard
@ -161,7 +161,7 @@ applications:
- '13'
- '14'
- '15'
channel: latest/edge
channel: 2024.1/edge
rabbitmq-server:
charm: ch:rabbitmq-server
@ -184,7 +184,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '18'
channel: latest/edge
channel: 2024.1/edge
keystone-saml-mellon1:
charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
@ -198,6 +198,7 @@ applications:
test-saml-idp1:
charm: ch:ionutbalutoiu-test-saml-idp
series: focal
num_units: 1
options:
idp-name: 'test-saml-idp1'
@ -217,6 +218,7 @@ applications:
test-saml-idp2:
charm: ch:ionutbalutoiu-test-saml-idp
series: focal
num_units: 1
options:
idp-name: 'test-saml-idp2'

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

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

42
src/tests/tests.yaml
View File

@ -1,32 +1,29 @@
charm_name: keystone-saml-mellon
smoke_bundles:
- jammy-antelope
- jammy-caracal
gate_bundles:
- jammy-antelope
- jammy-antelope
- jammy-bobcat
- jammy-caracal
dev_bundles:
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
- noble-caracal
configure:
- 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_idp2
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
- zaza.openstack.charm_tests.glance.setup.add_lts_image
- zaza.openstack.charm_tests.nova.setup.create_flavors
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
- zaza.openstack.charm_tests.saml_mellon.setup.keystone_federation_setup_idp1
- zaza.openstack.charm_tests.saml_mellon.setup.keystone_federation_setup_idp2
- 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_idp2
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
- zaza.openstack.charm_tests.glance.setup.add_lts_image
- zaza.openstack.charm_tests.nova.setup.create_flavors
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
- zaza.openstack.charm_tests.saml_mellon.setup.keystone_federation_setup_idp1
- zaza.openstack.charm_tests.saml_mellon.setup.keystone_federation_setup_idp2
tests:
- zaza.openstack.charm_tests.saml_mellon.tests.CharmKeystoneSAMLMellonIDP1Test
- zaza.openstack.charm_tests.saml_mellon.tests.CharmKeystoneSAMLMellonIDP2Test
- zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
- zaza.openstack.charm_tests.saml_mellon.tests.CharmKeystoneSAMLMellonIDP1Test
- zaza.openstack.charm_tests.saml_mellon.tests.CharmKeystoneSAMLMellonIDP2Test
- zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
target_deploy_status:
ntp:
@ -55,5 +52,4 @@ target_deploy_status:
tests_options:
force_deploy:
- lunar-antelope
- mantic-bobcat
- noble-caracal

4
src/tox.ini
View File

@ -25,7 +25,9 @@ passenv =
CS_*
OS_*
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]
basepython = python3

12
tox.ini
View File

@ -59,12 +59,16 @@ commands =
[testenv:py3]
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}
[testenv:py310]
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}
[testenv:pep8]
@ -77,7 +81,9 @@ commands = flake8 {posargs} src unit_tests
# Technique based heavily upon
# https://github.com/openstack/nova/blob/master/tox.ini
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
setenv =
{[testenv]setenv}