Add Antelope support
* sync charm-helpers to classic charms * change openstack-origin/source default to antelope * align testing with antelope * add new antelope bundles * add antelope bundles to tests.yaml * add antelope tests to osci.yaml and .zuul.yaml * update build-on and run-on bases Change-Id: I532edd57f33ef93a9fb99f062bf4bb88cd406651
This commit is contained in:
parent
841d9a3c66
commit
909a96154b
@ -1,4 +1,4 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-zed-jobs
|
- openstack-python3-charm-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
@ -23,3 +23,6 @@ bases:
|
|||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
channel: "22.10"
|
channel: "22.10"
|
||||||
architectures: [amd64, s390x, ppc64el, arm64]
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
- name: ubuntu
|
||||||
|
channel: "23.04"
|
||||||
|
architectures: [amd64, s390x, ppc64el, arm64]
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs-py310
|
- charm-unit-jobs-py310
|
||||||
- charm-zed-functional-jobs
|
- charm-functional-jobs
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: placement
|
charm_build_name: placement
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
options:
|
options:
|
||||||
openstack-origin:
|
openstack-origin:
|
||||||
default: zed
|
default: antelope
|
||||||
|
@ -12,6 +12,7 @@ tags:
|
|||||||
series:
|
series:
|
||||||
- jammy
|
- jammy
|
||||||
- kinetic
|
- kinetic
|
||||||
|
- lunar
|
||||||
subordinate: false
|
subordinate: false
|
||||||
requires:
|
requires:
|
||||||
shared-db:
|
shared-db:
|
||||||
|
255
src/tests/bundles/jammy-antelope.yaml
Normal file
255
src/tests/bundles/jammy-antelope.yaml
Normal file
@ -0,0 +1,255 @@
|
|||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:jammy-antelope
|
||||||
|
|
||||||
|
local_overlay_enabled: False
|
||||||
|
|
||||||
|
series: jammy
|
||||||
|
|
||||||
|
comment:
|
||||||
|
- 'machines section to decide order of deployment. database sooner = faster'
|
||||||
|
machines:
|
||||||
|
'0':
|
||||||
|
constraints: mem=3072M
|
||||||
|
'1':
|
||||||
|
constraints: mem=3072M
|
||||||
|
'2':
|
||||||
|
constraints: mem=3072M
|
||||||
|
'3':
|
||||||
|
'4':
|
||||||
|
'5':
|
||||||
|
'6':
|
||||||
|
'7':
|
||||||
|
'8':
|
||||||
|
'9':
|
||||||
|
'10':
|
||||||
|
'11':
|
||||||
|
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
nova-cloud-controller-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
glance-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
neutron-api-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
placement-mysql-router:
|
||||||
|
charm: ch:mysql-router
|
||||||
|
channel: latest/edge
|
||||||
|
vault-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
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: ch:rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
constraints: mem=1G
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
glance:
|
||||||
|
charm: ch:glance
|
||||||
|
num_units: 1
|
||||||
|
constraints: mem=1G
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
keystone:
|
||||||
|
charm: ch:keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
admin-password: openstack
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-api:
|
||||||
|
charm: ch:neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
manage-neutron-plugin-legacy-mode: true
|
||||||
|
neutron-plugin: ovs
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: ch:neutron-openvswitch
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
neutron-gateway:
|
||||||
|
charm: ch:neutron-gateway
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
bridge-mappings: physnet1:br-ex
|
||||||
|
to:
|
||||||
|
- '7'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: ch:nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
network-manager: Neutron
|
||||||
|
debug: true
|
||||||
|
to:
|
||||||
|
- '8'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
nova-compute:
|
||||||
|
charm: ch:nova-compute
|
||||||
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
debug: true
|
||||||
|
to:
|
||||||
|
- '9'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
placement:
|
||||||
|
charm: ../../../placement.charm
|
||||||
|
num_units: 1
|
||||||
|
constraints: mem=1G
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
debug: true
|
||||||
|
to:
|
||||||
|
- '10'
|
||||||
|
|
||||||
|
vault:
|
||||||
|
num_units: 1
|
||||||
|
charm: ch:vault
|
||||||
|
to:
|
||||||
|
- '11'
|
||||||
|
channel: latest/edge
|
||||||
|
|
||||||
|
relations:
|
||||||
|
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:shared-db'
|
||||||
|
- 'nova-cloud-controller-mysql-router:shared-db'
|
||||||
|
- - 'nova-cloud-controller-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller'
|
||||||
|
- 'glance'
|
||||||
|
|
||||||
|
- - 'nova-cloud-controller'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'nova-compute'
|
||||||
|
- 'nova-cloud-controller'
|
||||||
|
|
||||||
|
- - 'nova-compute'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'nova-compute'
|
||||||
|
- 'glance'
|
||||||
|
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'glance-mysql-router:shared-db'
|
||||||
|
- - 'glance-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'glance'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'glance'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'neutron-gateway'
|
||||||
|
- 'nova-cloud-controller'
|
||||||
|
|
||||||
|
- - 'neutron-gateway:amqp'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'neutron-api:shared-db'
|
||||||
|
- 'neutron-api-mysql-router:shared-db'
|
||||||
|
- - 'neutron-api-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'nova-cloud-controller'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'neutron-openvswitch'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'neutron-api'
|
||||||
|
- 'neutron-gateway'
|
||||||
|
|
||||||
|
- - 'neutron-openvswitch'
|
||||||
|
- 'nova-compute'
|
||||||
|
|
||||||
|
- - 'neutron-openvswitch'
|
||||||
|
- 'rabbitmq-server'
|
||||||
|
|
||||||
|
- - 'placement:shared-db'
|
||||||
|
- 'placement-mysql-router:shared-db'
|
||||||
|
- - 'placement-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'placement'
|
||||||
|
- 'keystone'
|
||||||
|
|
||||||
|
- - 'placement'
|
||||||
|
- 'nova-cloud-controller'
|
||||||
|
|
||||||
|
- - 'vault:shared-db'
|
||||||
|
- 'vault-mysql-router:shared-db'
|
||||||
|
- - 'vault-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'keystone:certificates'
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'placement:certificates'
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'neutron-api:certificates'
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'glance:certificates'
|
||||||
|
- - 'vault:certificates'
|
||||||
|
- 'nova-cloud-controller:certificates'
|
@ -3,7 +3,7 @@ variables:
|
|||||||
|
|
||||||
local_overlay_enabled: False
|
local_overlay_enabled: False
|
||||||
|
|
||||||
series: jammy
|
series: lunar
|
||||||
|
|
||||||
comment:
|
comment:
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
- 'machines section to decide order of deployment. database sooner = faster'
|
@ -17,16 +17,17 @@ configure:
|
|||||||
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
|
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- jammy-yoga
|
- jammy-zed
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- jammy-yoga
|
- jammy-zed
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- jammy-yoga
|
- jammy-antelope
|
||||||
- jammy-zed
|
|
||||||
- kinetic-zed
|
- kinetic-zed
|
||||||
|
- lunar-antelope
|
||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- kinetic-zed
|
- kinetic-zed
|
||||||
|
- lunar-antelope
|
||||||
|
Loading…
Reference in New Issue
Block a user