Enable jammy-antelope voting and drop kinetic-zed tests
* Voting was turned on for jammy-antelope in the project-template for charm-functional-jobs in zosci-config * Voting for jammy-antelope bundles with non-standard names is turned on in individual charms * Kinetic-zed bundles/tests are removed Change-Id: If0d46c9efe32c533fa79b5c52447f00ed3887a51
This commit is contained in:
Corey Bryant
parent
07d0b94cdb
commit
856093cda9
24
osci.yaml
24
osci.yaml
|
|
@ -5,14 +5,8 @@
|
|||
jobs:
|
||||
- jammy-zed-ha
|
||||
- jammy-zed-ha-ovn
|
||||
- kinetic-zed-ha:
|
||||
voting: false
|
||||
- kinetic-zed-ha-ovn:
|
||||
voting: false
|
||||
- jammy-antelope-ha:
|
||||
voting: false
|
||||
- jammy-antelope-ha-ovn:
|
||||
voting: false
|
||||
- jammy-antelope-ha
|
||||
- jammy-antelope-ha-ovn
|
||||
- lunar-antelope-ha:
|
||||
voting: false
|
||||
- lunar-antelope-ha-ovn:
|
||||
|
|
@ -40,20 +34,6 @@
|
|||
- jammy-zed-ha
|
||||
vars:
|
||||
tox_extra_args: '-- jammy-zed-ha-ovn'
|
||||
- job:
|
||||
name: kinetic-zed-ha
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- jammy-zed-ha
|
||||
vars:
|
||||
tox_extra_args: '-- kinetic-zed-ha'
|
||||
- job:
|
||||
name: kinetic-zed-ha-ovn
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- jammy-zed-ha
|
||||
vars:
|
||||
tox_extra_args: '-- kinetic-zed-ha-ovn'
|
||||
- job:
|
||||
name: jammy-antelope-ha
|
||||
parent: func-target
|
||||
|
|
|
|||
|
|
@ -1,237 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
local_overlay_enabled: True
|
||||
|
||||
series: &series kinetic
|
||||
relations:
|
||||
- - glance:image-service
|
||||
- nova-cloud-controller:image-service
|
||||
- - glance:image-service
|
||||
- nova-compute:image-service
|
||||
- - glance-mysql-router:shared-db
|
||||
- glance:shared-db
|
||||
- - keystone-mysql-router:shared-db
|
||||
- keystone:shared-db
|
||||
- - neutron-mysql-router:shared-db
|
||||
- neutron-api:shared-db
|
||||
- - nova-mysql-router:shared-db
|
||||
- nova-cloud-controller:shared-db
|
||||
- - octavia-mysql-router:shared-db
|
||||
- octavia:shared-db
|
||||
- - keystone:identity-service
|
||||
- glance:identity-service
|
||||
- - keystone:identity-service
|
||||
- nova-cloud-controller:identity-service
|
||||
- - keystone:identity-service
|
||||
- neutron-api:identity-service
|
||||
- - keystone:identity-service
|
||||
- octavia:identity-service
|
||||
- - nova-compute:cloud-compute
|
||||
- nova-cloud-controller:cloud-compute
|
||||
- - rabbitmq-server:amqp
|
||||
- neutron-api:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- glance:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- nova-cloud-controller:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- nova-compute:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- octavia:amqp
|
||||
- - neutron-api:neutron-api
|
||||
- nova-cloud-controller:neutron-api
|
||||
- - neutron-api:neutron-load-balancer
|
||||
- octavia:neutron-api
|
||||
- - glance-simplestreams-sync:juju-info
|
||||
- octavia-diskimage-retrofit:juju-info
|
||||
- - keystone:identity-service
|
||||
- glance-simplestreams-sync:identity-service
|
||||
- - keystone:identity-credentials
|
||||
- octavia-diskimage-retrofit:identity-credentials
|
||||
- [ placement, placement-mysql-router ]
|
||||
- [ placement, keystone ]
|
||||
- [ placement, nova-cloud-controller ]
|
||||
- - neutron-api-plugin-ovn:neutron-plugin
|
||||
- neutron-api:neutron-plugin-api-subordinate
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - ovn-central:certificates
|
||||
- vault:certificates
|
||||
- - ovn-central:ovsdb-cms
|
||||
- neutron-api-plugin-ovn:ovsdb-cms
|
||||
- - neutron-api:certificates
|
||||
- vault:certificates
|
||||
- - ovn-chassis:nova-compute
|
||||
- nova-compute:neutron-plugin
|
||||
- - ovn-chassis-octavia:ovsdb-subordinate
|
||||
- octavia:ovsdb-subordinate
|
||||
- - ovn-chassis-octavia:certificates
|
||||
- vault:certificates
|
||||
- - ovn-chassis-octavia:ovsdb
|
||||
- ovn-central:ovsdb
|
||||
- - ovn-central:ovsdb-cms
|
||||
- octavia:ovsdb-cms
|
||||
- - ovn-chassis:certificates
|
||||
- vault:certificates
|
||||
- - ovn-chassis:ovsdb
|
||||
- ovn-central:ovsdb
|
||||
- - vault:certificates
|
||||
- neutron-api-plugin-ovn:certificates
|
||||
- - vault:certificates
|
||||
- glance:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- nova-cloud-controller:certificates
|
||||
- - vault:certificates
|
||||
- placement:certificates
|
||||
- - vault:certificates
|
||||
- octavia:certificates
|
||||
- - vault:certificates
|
||||
- glance-simplestreams-sync:certificates
|
||||
- - hacluster-octavia:ha
|
||||
- octavia:ha
|
||||
- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
applications:
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
channel: latest/edge
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
channel: latest/edge
|
||||
octavia-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
nova-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
neutron-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:
|
||||
constraints: mem=3072M
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
channel: latest/edge
|
||||
neutron-api:
|
||||
constraints: cores=4
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
flat-network-providers: physnet1
|
||||
enable-ml2-port-security: True
|
||||
neutron-security-groups: True
|
||||
channel: latest/edge
|
||||
nova-cloud-controller:
|
||||
constraints: mem=7168M
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
network-manager: Neutron
|
||||
channel: latest/edge
|
||||
nova-compute:
|
||||
constraints: mem=7168M
|
||||
charm: ch:nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
channel: latest/edge
|
||||
hacluster-octavia:
|
||||
series: *series
|
||||
charm: ch:hacluster
|
||||
channel: latest/edge
|
||||
ovn-chassis-octavia:
|
||||
series: *series
|
||||
charm: ch:ovn-chassis
|
||||
channel: latest/edge
|
||||
options:
|
||||
ovn-source: distro
|
||||
octavia:
|
||||
constraints: cores=8
|
||||
series: *series
|
||||
charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
loadbalancer-topology: 'ACTIVE_STANDBY'
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
channel: latest/edge
|
||||
glance-simplestreams-sync:
|
||||
charm: ch:glance-simplestreams-sync
|
||||
num_units: 1
|
||||
options:
|
||||
use_swift: False
|
||||
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/releases/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson', max: 1,
|
||||
item_filters: [
|
||||
'release~(jammy)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)']}]"
|
||||
channel: latest/edge
|
||||
octavia-diskimage-retrofit:
|
||||
charm: ch:octavia-diskimage-retrofit
|
||||
options:
|
||||
amp-image-tag: 'octavia-amphora'
|
||||
retrofit-series: *series
|
||||
channel: latest/edge
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: true
|
||||
channel: latest/edge
|
||||
neutron-api-plugin-ovn:
|
||||
charm: ch:neutron-api-plugin-ovn
|
||||
channel: latest/edge
|
||||
ovn-central:
|
||||
constraints: mem=3072M
|
||||
charm: ch:ovn-central
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
channel: latest/edge
|
||||
ovn-chassis:
|
||||
charm: ch:ovn-chassis
|
||||
channel: latest/edge
|
||||
options:
|
||||
ovn-source: distro
|
||||
vault:
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
channel: latest/edge
|
||||
|
|
@ -1,231 +0,0 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
local_overlay_enabled: True
|
||||
|
||||
series: &series kinetic
|
||||
relations:
|
||||
- - glance:image-service
|
||||
- nova-cloud-controller:image-service
|
||||
- - glance:image-service
|
||||
- nova-compute:image-service
|
||||
- - glance-mysql-router:shared-db
|
||||
- glance:shared-db
|
||||
- - keystone-mysql-router:shared-db
|
||||
- keystone:shared-db
|
||||
- - neutron-mysql-router:shared-db
|
||||
- neutron-api:shared-db
|
||||
- - nova-mysql-router:shared-db
|
||||
- nova-cloud-controller:shared-db
|
||||
- - octavia-mysql-router:shared-db
|
||||
- octavia:shared-db
|
||||
- - keystone:identity-service
|
||||
- glance:identity-service
|
||||
- - keystone:identity-service
|
||||
- nova-cloud-controller:identity-service
|
||||
- - keystone:identity-service
|
||||
- neutron-api:identity-service
|
||||
- - keystone:identity-service
|
||||
- octavia:identity-service
|
||||
- - nova-compute:cloud-compute
|
||||
- nova-cloud-controller:cloud-compute
|
||||
- - rabbitmq-server:amqp
|
||||
- neutron-api:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- glance:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- nova-cloud-controller:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- nova-compute:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- octavia:amqp
|
||||
- - neutron-api:neutron-api
|
||||
- nova-cloud-controller:neutron-api
|
||||
- - neutron-api:neutron-load-balancer
|
||||
- octavia:neutron-api
|
||||
- - rabbitmq-server:amqp
|
||||
- neutron-openvswitch:amqp
|
||||
- - neutron-api:neutron-plugin-api
|
||||
- neutron-openvswitch:neutron-plugin-api
|
||||
- - neutron-openvswitch:neutron-plugin
|
||||
- nova-compute:neutron-plugin
|
||||
- - rabbitmq-server:amqp
|
||||
- neutron-openvswitch-octavia:amqp
|
||||
- - neutron-api:neutron-plugin-api
|
||||
- neutron-openvswitch-octavia:neutron-plugin-api
|
||||
- - neutron-openvswitch-octavia:neutron-plugin
|
||||
- octavia:neutron-openvswitch
|
||||
- - hacluster-octavia:ha
|
||||
- octavia:ha
|
||||
- - glance-simplestreams-sync:juju-info
|
||||
- octavia-diskimage-retrofit:juju-info
|
||||
- - keystone:identity-service
|
||||
- glance-simplestreams-sync:identity-service
|
||||
- - keystone:identity-credentials
|
||||
- octavia-diskimage-retrofit:identity-credentials
|
||||
- [ placement, placement-mysql-router ]
|
||||
- [ placement, keystone ]
|
||||
- [ placement, nova-cloud-controller ]
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - vault:certificates
|
||||
- glance:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- neutron-api:certificates
|
||||
- - vault:certificates
|
||||
- nova-cloud-controller:certificates
|
||||
- - vault:certificates
|
||||
- octavia:certificates
|
||||
- - vault:certificates
|
||||
- octavia-diskimage-retrofit:certificates
|
||||
- - vault:certificates
|
||||
- glance-simplestreams-sync:certificates
|
||||
- - vault:certificates
|
||||
- placement:certificates
|
||||
- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
applications:
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
channel: latest/edge
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
channel: latest/edge
|
||||
octavia-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
nova-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
neutron-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:
|
||||
constraints: mem=3072M
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
channel: latest/edge
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
flat-network-providers: physnet1
|
||||
enable-ml2-port-security: True
|
||||
neutron-security-groups: True
|
||||
enable-dvr: True
|
||||
manage-neutron-plugin-legacy-mode: True
|
||||
channel: latest/edge
|
||||
neutron-openvswitch:
|
||||
series: *series
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
options:
|
||||
debug: True
|
||||
enable-local-dhcp-and-metadata: True
|
||||
use-dvr-snat: True
|
||||
prevent-arp-spoofing: False
|
||||
firewall-driver: openvswitch
|
||||
bridge-mappings: physnet1:br-ex
|
||||
channel: latest/edge
|
||||
neutron-openvswitch-octavia:
|
||||
series: *series
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
options:
|
||||
debug: True
|
||||
prevent-arp-spoofing: False
|
||||
firewall-driver: openvswitch
|
||||
channel: latest/edge
|
||||
nova-cloud-controller:
|
||||
constraints: mem=7168M
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
network-manager: Neutron
|
||||
channel: latest/edge
|
||||
nova-compute:
|
||||
constraints: mem=7168M
|
||||
charm: ch:nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
channel: latest/edge
|
||||
hacluster-octavia:
|
||||
charm: ch:hacluster
|
||||
num_units: 0
|
||||
channel: latest/edge
|
||||
octavia:
|
||||
constraints: cores=8
|
||||
series: *series
|
||||
charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
loadbalancer-topology: 'ACTIVE_STANDBY'
|
||||
vip: 'ADD YOUR VIP HERE'
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
channel: latest/edge
|
||||
glance-simplestreams-sync:
|
||||
charm: ch:glance-simplestreams-sync
|
||||
num_units: 1
|
||||
options:
|
||||
use_swift: False
|
||||
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/releases/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson', max: 1,
|
||||
item_filters: [
|
||||
'release~(jammy)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)']}]"
|
||||
channel: latest/edge
|
||||
octavia-diskimage-retrofit:
|
||||
charm: ch:octavia-diskimage-retrofit
|
||||
options:
|
||||
amp-image-tag: 'octavia-amphora'
|
||||
retrofit-series: *series
|
||||
channel: latest/edge
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: true
|
||||
channel: latest/edge
|
||||
vault:
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
channel: latest/edge
|
||||
|
|
@ -10,8 +10,6 @@ smoke_bundles:
|
|||
dev_bundles:
|
||||
- jammy-antelope-ha-ovn
|
||||
- jammy-antelope-ha
|
||||
- kinetic-zed-ha-ovn
|
||||
- kinetic-zed-ha
|
||||
- lunar-antelope-ha-ovn
|
||||
- lunar-antelope-ha
|
||||
|
||||
|
|
@ -74,7 +72,5 @@ tests_options:
|
|||
policyd:
|
||||
service: octavia
|
||||
force_deploy:
|
||||
- kinetic-zed-ha-ovn
|
||||
- kinetic-zed-ha
|
||||
- lunar-antelope-ha-ovn
|
||||
- lunar-antelope-ha
|
||||
|
|
|
|||
Loading…
Reference in New Issue