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 * Add libpython3-dev to allow the charm to be built. This fixes a missing dependency with Cython Change-Id: Ic38e4fe77cec5af7e72d47b54dac2d66948af9b1
This commit is contained in:
@@ -4,6 +4,8 @@ parts:
|
|||||||
charm:
|
charm:
|
||||||
source: src/
|
source: src/
|
||||||
plugin: reactive
|
plugin: reactive
|
||||||
|
build-packages:
|
||||||
|
- libpython3-dev
|
||||||
build-snaps:
|
build-snaps:
|
||||||
- charm
|
- charm
|
||||||
build-environment:
|
build-environment:
|
||||||
|
@@ -1,185 +0,0 @@
|
|||||||
local_overlay_enabled: False
|
|
||||||
|
|
||||||
variables:
|
|
||||||
openstack-origin: &openstack-origin distro
|
|
||||||
|
|
||||||
series: kinetic
|
|
||||||
|
|
||||||
machines:
|
|
||||||
0:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
1:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
2:
|
|
||||||
constraints: "mem=3072M"
|
|
||||||
3:
|
|
||||||
4:
|
|
||||||
5:
|
|
||||||
6:
|
|
||||||
7:
|
|
||||||
8:
|
|
||||||
9:
|
|
||||||
10:
|
|
||||||
11:
|
|
||||||
12:
|
|
||||||
13:
|
|
||||||
14:
|
|
||||||
series: focal
|
|
||||||
|
|
||||||
# We specify machine placements for these to improve iteration
|
|
||||||
# time, given that machine "0" comes up way before machine "7"
|
|
||||||
applications:
|
|
||||||
|
|
||||||
keystone-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
aodh-mysql-router:
|
|
||||||
charm: ch:mysql-router
|
|
||||||
channel: latest/edge
|
|
||||||
gnocchi-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
|
|
||||||
|
|
||||||
aodh:
|
|
||||||
charm: ../../../aodh.charm
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: ch:rabbitmq-server
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
keystone:
|
|
||||||
charm: ch:keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceilometer:
|
|
||||||
charm: ch:ceilometer
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceph-osd:
|
|
||||||
charm: ch:ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '7'
|
|
||||||
- '8'
|
|
||||||
- '9'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
ceph-mon:
|
|
||||||
charm: ch:ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
expected-osd-count: 3
|
|
||||||
monitor-count: '3'
|
|
||||||
source: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '10'
|
|
||||||
- '11'
|
|
||||||
- '12'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
gnocchi:
|
|
||||||
charm: ch:gnocchi
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *openstack-origin
|
|
||||||
to:
|
|
||||||
- '13'
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
memcached:
|
|
||||||
charm: ch:memcached
|
|
||||||
num_units: 1
|
|
||||||
# Note that holding memcached at focal as it's not available at kinetic yet.
|
|
||||||
series: focal
|
|
||||||
to:
|
|
||||||
- '14'
|
|
||||||
|
|
||||||
nrpe:
|
|
||||||
charm: ch:nrpe
|
|
||||||
channel: latest/edge
|
|
||||||
|
|
||||||
relations:
|
|
||||||
|
|
||||||
- - 'keystone:shared-db'
|
|
||||||
- 'keystone-mysql-router:shared-db'
|
|
||||||
- - 'keystone-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
|
|
||||||
- - 'ceph-osd:mon'
|
|
||||||
- 'ceph-mon:osd'
|
|
||||||
|
|
||||||
- - 'aodh:shared-db'
|
|
||||||
- 'aodh-mysql-router:shared-db'
|
|
||||||
- - 'aodh-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'aodh:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'aodh:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'ceilometer:amqp'
|
|
||||||
- 'rabbitmq-server:amqp'
|
|
||||||
|
|
||||||
- - 'ceilometer:identity-credentials'
|
|
||||||
- 'keystone:identity-credentials'
|
|
||||||
|
|
||||||
- - 'ceilometer:identity-notifications'
|
|
||||||
- 'keystone:identity-notifications'
|
|
||||||
|
|
||||||
- - 'ceilometer:metric-service'
|
|
||||||
- 'gnocchi:metric-service'
|
|
||||||
|
|
||||||
- - 'gnocchi:identity-service'
|
|
||||||
- 'keystone:identity-service'
|
|
||||||
|
|
||||||
- - 'gnocchi:shared-db'
|
|
||||||
- 'gnocchi-mysql-router:shared-db'
|
|
||||||
- - 'gnocchi-mysql-router:db-router'
|
|
||||||
- 'mysql-innodb-cluster:db-router'
|
|
||||||
|
|
||||||
- - 'gnocchi:storage-ceph'
|
|
||||||
- 'ceph-mon:client'
|
|
||||||
|
|
||||||
- - 'gnocchi:coordinator-memcached'
|
|
||||||
- 'memcached:cache'
|
|
||||||
|
|
||||||
- - 'aodh:nrpe-external-master'
|
|
||||||
- 'nrpe:nrpe-external-master'
|
|
@@ -4,7 +4,6 @@ gate_bundles:
|
|||||||
- jammy-zed
|
- jammy-zed
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- jammy-antelope
|
- jammy-antelope
|
||||||
- kinetic-zed
|
|
||||||
- lunar-antelope
|
- lunar-antelope
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- jammy-yoga
|
- jammy-yoga
|
||||||
@@ -28,5 +27,4 @@ tests_options:
|
|||||||
# https://bugs.launchpad.net/charm-nrpe/+bug/1968008
|
# https://bugs.launchpad.net/charm-nrpe/+bug/1968008
|
||||||
- jammy-zed
|
- jammy-zed
|
||||||
- jammy-antelope
|
- jammy-antelope
|
||||||
- kinetic-zed
|
|
||||||
- lunar-antelope
|
- lunar-antelope
|
||||||
|
Reference in New Issue
Block a user