Add yoga bundles and release-tool syncs
* charm-helpers sync for classic charms * pin pyparsing for aodhclient * pin cffi for py35 * add non-voting focal-yoga bundle * add non-voting jammy-yoga bundle * add series metadata for jammy * switch xena bundles to voting * run focal-ussuri as smoke tests * remove trusty, xenial, and groovy metadata and tests Change-Id: I490952f9273faa4ff75f2aef7574376ef6eb28ee
This commit is contained in:
parent
b9b859c023
commit
270e6f58b8
22
osci.yaml
22
osci.yaml
|
@ -3,19 +3,21 @@
|
||||||
- charm-unit-jobs
|
- charm-unit-jobs
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- impish-xena:
|
- bionic-rocky
|
||||||
|
- bionic-stein
|
||||||
|
- bionic-train
|
||||||
|
- bionic-ussuri
|
||||||
|
- focal-ussuri
|
||||||
|
- focal-victoria
|
||||||
|
- focal-wallaby
|
||||||
|
- focal-xena
|
||||||
|
- focal-yoga:
|
||||||
voting: false
|
voting: false
|
||||||
- hirsute-wallaby
|
- hirsute-wallaby
|
||||||
- groovy-victoria
|
- impish-xena:
|
||||||
- focal-xena:
|
voting: false
|
||||||
|
- jammy-yoga:
|
||||||
voting: false
|
voting: false
|
||||||
- focal-wallaby
|
|
||||||
- focal-victoria
|
|
||||||
- focal-ussuri
|
|
||||||
- bionic-ussuri
|
|
||||||
- bionic-train
|
|
||||||
- bionic-stein
|
|
||||||
- bionic-rocky
|
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: octavia-dashboard
|
charm_build_name: octavia-dashboard
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||||
|
|
||||||
# Build requirements
|
# Build requirements
|
||||||
|
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||||
charm-tools==2.8.3
|
charm-tools==2.8.3
|
||||||
|
|
||||||
simplejson
|
simplejson
|
||||||
|
|
|
@ -0,0 +1,136 @@
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:focal-yoga
|
||||||
|
|
||||||
|
series: focal
|
||||||
|
|
||||||
|
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':
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
neutron-api-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
octavia-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
openstack-dashboard-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
|
||||||
|
mysql-innodb-cluster:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '0'
|
||||||
|
- '1'
|
||||||
|
- '2'
|
||||||
|
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
manage-neutron-plugin-legacy-mode: true
|
||||||
|
neutron-plugin: ovs
|
||||||
|
neutron-security-groups: True
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
|
||||||
|
neutron-openvswitch:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||||
|
num_units: 0
|
||||||
|
|
||||||
|
octavia:
|
||||||
|
charm: cs:~openstack-charmers-next/octavia
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
|
||||||
|
openstack-dashboard:
|
||||||
|
charm: cs:~openstack-charmers-next/openstack-dashboard
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '7'
|
||||||
|
|
||||||
|
octavia-dashboard:
|
||||||
|
charm: ../../../octavia-dashboard
|
||||||
|
|
||||||
|
relations:
|
||||||
|
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'neutron-api:shared-db'
|
||||||
|
- 'neutron-api-mysql-router:shared-db'
|
||||||
|
- - 'neutron-api-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'octavia:shared-db'
|
||||||
|
- 'octavia-mysql-router:shared-db'
|
||||||
|
- - 'octavia-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'openstack-dashboard:shared-db'
|
||||||
|
- 'openstack-dashboard-mysql-router:shared-db'
|
||||||
|
- - 'openstack-dashboard-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'keystone:identity-service'
|
||||||
|
- 'neutron-api:identity-service'
|
||||||
|
|
||||||
|
- - 'keystone:identity-service'
|
||||||
|
- 'octavia:identity-service'
|
||||||
|
|
||||||
|
- - 'keystone:identity-service'
|
||||||
|
- 'openstack-dashboard:identity-service'
|
||||||
|
|
||||||
|
- - 'rabbitmq-server:amqp'
|
||||||
|
- 'neutron-api:amqp'
|
||||||
|
|
||||||
|
- - 'rabbitmq-server:amqp'
|
||||||
|
- 'octavia:amqp'
|
||||||
|
|
||||||
|
- - 'rabbitmq-server:amqp'
|
||||||
|
- 'neutron-openvswitch:amqp'
|
||||||
|
|
||||||
|
- - 'neutron-openvswitch:neutron-plugin'
|
||||||
|
- 'octavia:neutron-openvswitch'
|
||||||
|
|
||||||
|
- - 'openstack-dashboard:dashboard-plugin'
|
||||||
|
- 'octavia-dashboard:dashboard'
|
|
@ -1,7 +1,7 @@
|
||||||
variables:
|
variables:
|
||||||
openstack-origin: &openstack-origin distro
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
series: groovy
|
series: jammy
|
||||||
|
|
||||||
comment:
|
comment:
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
- 'machines section to decide order of deployment. database sooner = faster'
|
|
@ -1,22 +1,23 @@
|
||||||
charm_name: octavia-dashboard
|
charm_name: octavia-dashboard
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- hirsute-wallaby
|
|
||||||
- focal-wallaby
|
|
||||||
- focal-victoria
|
|
||||||
- focal-ussuri
|
|
||||||
- bionic-ussuri
|
|
||||||
- bionic-train
|
|
||||||
- bionic-stein
|
- bionic-stein
|
||||||
|
- bionic-ussuri
|
||||||
|
- focal-ussuri
|
||||||
|
- focal-victoria
|
||||||
|
- focal-wallaby
|
||||||
|
- focal-xena
|
||||||
|
- hirsute-wallaby
|
||||||
|
- impish-xena
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bionic-train
|
- focal-ussuri
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- bionic-rocky
|
- bionic-rocky
|
||||||
- focal-xena
|
- bionic-train
|
||||||
- groovy-victoria
|
- focal-yoga
|
||||||
- impish-xena
|
- jammy-yoga
|
||||||
|
|
||||||
comment:
|
comment:
|
||||||
|
|
||||||
|
@ -33,5 +34,6 @@ tests:
|
||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- groovy-victoria
|
- hirsute-wallaby
|
||||||
- impish-xena
|
- impish-xena
|
||||||
|
- jammy-yoga
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
# choices of *requirements.txt files for OpenStack Charms:
|
# choices of *requirements.txt files for OpenStack Charms:
|
||||||
# https://github.com/openstack-charmers/release-tools
|
# https://github.com/openstack-charmers/release-tools
|
||||||
#
|
#
|
||||||
|
pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
|
||||||
|
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
||||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||||
|
|
||||||
stestr>=2.2.0
|
stestr>=2.2.0
|
||||||
|
|
Loading…
Reference in New Issue