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: Ib4f6ab11e68e966e63d438497aa195ebb1e55f15
This commit is contained in:
Jadon Naas
parent
f0f593eff9
commit
b442b50d43
@ -20,20 +20,9 @@ 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]
|
||||
run-on:
|
||||
- name: ubuntu
|
||||
channel: "22.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
|
||||
- name: ubuntu
|
||||
channel: "23.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
- name: ubuntu
|
||||
channel: "23.10"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
|
||||
@ -18,7 +18,6 @@ tags:
|
||||
series:
|
||||
- focal
|
||||
- jammy
|
||||
- mantic
|
||||
provides:
|
||||
keystone-fid-service-provider:
|
||||
interface: keystone-fid-service-provider
|
||||
|
||||
@ -6,3 +6,4 @@
|
||||
needs_charm_build: true
|
||||
charm_build_name: keystone-openidc
|
||||
build_type: charmcraft
|
||||
charmcraft_channel: 2.x/stable
|
||||
|
||||
@ -84,7 +84,7 @@ applications:
|
||||
block-device: None
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
@ -93,7 +93,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
@ -105,7 +105,7 @@ applications:
|
||||
- '5'
|
||||
- '6'
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
@ -117,7 +117,7 @@ applications:
|
||||
neutron-security-groups: true
|
||||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
@ -127,7 +127,7 @@ applications:
|
||||
network-manager: Neutron
|
||||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
@ -141,7 +141,7 @@ applications:
|
||||
to:
|
||||
- '10'
|
||||
- '11'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
ntp:
|
||||
charm: ch:ntp
|
||||
@ -156,7 +156,7 @@ applications:
|
||||
- '12'
|
||||
- '13'
|
||||
- '14'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
@ -179,7 +179,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '17'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
keystone-openidc:
|
||||
charm: ../../keystone-openidc.charm
|
||||
@ -209,11 +209,11 @@ applications:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
to:
|
||||
- '18'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
openidc-test-fixture:
|
||||
charm: ch:openidc-test-fixture
|
||||
|
||||
@ -84,7 +84,7 @@ applications:
|
||||
block-device: None
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
@ -93,7 +93,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
@ -105,7 +105,7 @@ applications:
|
||||
- '5'
|
||||
- '6'
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
@ -117,7 +117,7 @@ applications:
|
||||
neutron-security-groups: true
|
||||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
@ -127,7 +127,7 @@ applications:
|
||||
network-manager: Neutron
|
||||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
@ -141,7 +141,7 @@ applications:
|
||||
to:
|
||||
- '10'
|
||||
- '11'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
ntp:
|
||||
charm: ch:ntp
|
||||
@ -156,7 +156,7 @@ applications:
|
||||
- '12'
|
||||
- '13'
|
||||
- '14'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
@ -179,7 +179,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '17'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
keystone-openidc:
|
||||
charm: ../../keystone-openidc.charm
|
||||
@ -209,11 +209,11 @@ applications:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
to:
|
||||
- '18'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
openidc-test-fixture:
|
||||
charm: ch:openidc-test-fixture
|
||||
|
||||
@ -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'
|
||||
@ -84,7 +84,7 @@ applications:
|
||||
block-device: None
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
@ -93,7 +93,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
@ -105,7 +105,7 @@ applications:
|
||||
- '5'
|
||||
- '6'
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
@ -117,7 +117,7 @@ applications:
|
||||
neutron-security-groups: true
|
||||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
@ -127,7 +127,7 @@ applications:
|
||||
network-manager: Neutron
|
||||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
@ -141,7 +141,7 @@ applications:
|
||||
to:
|
||||
- '10'
|
||||
- '11'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
ntp:
|
||||
charm: ch:ntp
|
||||
@ -156,7 +156,7 @@ applications:
|
||||
- '12'
|
||||
- '13'
|
||||
- '14'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
@ -179,7 +179,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '17'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
keystone-openidc:
|
||||
charm: ../../keystone-openidc.charm
|
||||
@ -209,11 +209,11 @@ applications:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
to:
|
||||
- '18'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
openidc-test-fixture:
|
||||
charm: ch:openidc-test-fixture
|
||||
@ -3,7 +3,7 @@ variables:
|
||||
|
||||
local_overlay_enabled: True
|
||||
|
||||
series: lunar
|
||||
series: noble
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
@ -84,7 +84,7 @@ applications:
|
||||
block-device: None
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
glance:
|
||||
charm: ch:glance
|
||||
@ -93,7 +93,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
@ -105,7 +105,7 @@ applications:
|
||||
- '5'
|
||||
- '6'
|
||||
- '7'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
@ -117,7 +117,7 @@ applications:
|
||||
neutron-security-groups: true
|
||||
to:
|
||||
- '8'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
@ -127,7 +127,7 @@ applications:
|
||||
network-manager: Neutron
|
||||
to:
|
||||
- '9'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
@ -141,7 +141,7 @@ applications:
|
||||
to:
|
||||
- '10'
|
||||
- '11'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
ntp:
|
||||
charm: ch:ntp
|
||||
@ -156,7 +156,7 @@ applications:
|
||||
- '12'
|
||||
- '13'
|
||||
- '14'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
@ -179,7 +179,7 @@ applications:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '17'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
keystone-openidc:
|
||||
charm: ../../keystone-openidc.charm
|
||||
@ -209,11 +209,11 @@ applications:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
to:
|
||||
- '18'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
openidc-test-fixture:
|
||||
charm: ch:openidc-test-fixture
|
||||
@ -1,30 +1,27 @@
|
||||
charm_name: keystone-openidc
|
||||
|
||||
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.openidc.setup.configure_keystone_openidc
|
||||
- zaza.openstack.charm_tests.openidc.setup.keystone_federation_setup_site1
|
||||
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
|
||||
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
|
||||
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
|
||||
- zaza.openstack.charm_tests.nova.setup.create_flavors
|
||||
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
|
||||
- zaza.openstack.charm_tests.vault.setup.auto_initialize
|
||||
- zaza.openstack.charm_tests.openidc.setup.configure_keystone_openidc
|
||||
- zaza.openstack.charm_tests.openidc.setup.keystone_federation_setup_site1
|
||||
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
|
||||
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
|
||||
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
|
||||
- zaza.openstack.charm_tests.nova.setup.create_flavors
|
||||
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
|
||||
|
||||
tests:
|
||||
- zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
|
||||
- zaza.openstack.charm_tests.openidc.tests.TestToken
|
||||
- zaza.openstack.charm_tests.openidc.tests.TestLaunchInstance
|
||||
- zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
|
||||
- zaza.openstack.charm_tests.openidc.tests.TestToken
|
||||
- zaza.openstack.charm_tests.openidc.tests.TestLaunchInstance
|
||||
|
||||
target_deploy_status:
|
||||
keystone-openidc:
|
||||
@ -41,5 +38,4 @@ target_deploy_status:
|
||||
workload-status-message-prefix: 'chrony: Ready'
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- lunar-antelope
|
||||
- mantic-bobcat
|
||||
- noble-caracal
|
||||
|
||||
51
tox.ini
51
tox.ini
@ -40,36 +40,57 @@ 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:py36]
|
||||
basepython = python3.6
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-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}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py38]
|
||||
basepython = python3.8
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-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}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py39]
|
||||
basepython = python3.9
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-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}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py310]
|
||||
basepython = python3.10
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-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}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py311]
|
||||
basepython = python3.11
|
||||
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
|
||||
|
||||
[testenv:py3]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-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}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:pep8]
|
||||
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
|
||||
commands = flake8 {posargs} src unit_tests tests
|
||||
|
||||
@ -77,7 +98,9 @@ commands = flake8 {posargs} src unit_tests 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}
|
||||
@ -107,7 +130,7 @@ commands = {posargs}
|
||||
|
||||
[testenv:build]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/build-requirements.txt
|
||||
deps =
|
||||
# NOTE(lourot): charmcraft 1.0.0 used to generate
|
||||
# nova-compute-nvidia-vgpu.charm, which is the behaviour expected by OSCI.
|
||||
# However charmcraft 1.2.1 now generates
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user