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: I11f3688718d11db7043a47d661b75e8ee629f180
This commit is contained in:
parent
7f8c159249
commit
594689b699
34
osci.yaml
34
osci.yaml
|
@ -3,29 +3,37 @@
|
||||||
- charm-unit-jobs
|
- charm-unit-jobs
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- impish-xena-functional:
|
- bionic-queens-functional
|
||||||
|
- bionic-stein-functional
|
||||||
|
- bionic-train-functional
|
||||||
|
- bionic-ussuri-functional
|
||||||
|
- focal-ussuri-functional
|
||||||
|
- focal-victoria-functional
|
||||||
|
- focal-wallaby-functional
|
||||||
|
- focal-xena-functional
|
||||||
|
- focal-yoga-functional:
|
||||||
voting: false
|
voting: false
|
||||||
- hirsute-wallaby-functional
|
- hirsute-wallaby-functional
|
||||||
- groovy-victoria-functional
|
- impish-xena-functional:
|
||||||
- focal-xena-functional:
|
voting: false
|
||||||
|
- jammy-yoga-functional:
|
||||||
voting: false
|
voting: false
|
||||||
- focal-wallaby-functional
|
|
||||||
- focal-victoria-functional
|
|
||||||
- focal-ussuri-functional
|
|
||||||
- bionic-ussuri-functional
|
|
||||||
- bionic-train-functional
|
|
||||||
- bionic-stein-functional
|
|
||||||
- bionic-queens-functional
|
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: neutron-dynamic-routing
|
charm_build_name: neutron-dynamic-routing
|
||||||
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: impish-xena-functional
|
name: jammy-yoga-functional
|
||||||
parent: func-target
|
parent: func-target
|
||||||
dependencies: &smoke-jobs
|
dependencies: &smoke-jobs
|
||||||
- bionic-ussuri-functional
|
- bionic-ussuri-functional
|
||||||
|
vars:
|
||||||
|
tox_extra_args: jammy-yoga-functional
|
||||||
|
- job:
|
||||||
|
name: impish-xena-functional
|
||||||
|
parent: func-target
|
||||||
|
dependencies: *smoke-jobs
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: impish-xena-functional
|
tox_extra_args: impish-xena-functional
|
||||||
- job:
|
- job:
|
||||||
|
@ -35,11 +43,11 @@
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: hirsute-wallaby-functional
|
tox_extra_args: hirsute-wallaby-functional
|
||||||
- job:
|
- job:
|
||||||
name: groovy-victoria-functional
|
name: focal-yoga-functional
|
||||||
parent: func-target
|
parent: func-target
|
||||||
dependencies: *smoke-jobs
|
dependencies: *smoke-jobs
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: groovy-victoria-functional
|
tox_extra_args: focal-yoga-functional
|
||||||
- job:
|
- job:
|
||||||
name: focal-xena-functional
|
name: focal-xena-functional
|
||||||
parent: func-target
|
parent: func-target
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -7,7 +7,6 @@ description: |
|
||||||
tags:
|
tags:
|
||||||
- openstack
|
- openstack
|
||||||
series:
|
series:
|
||||||
- xenial
|
|
||||||
- bionic
|
- bionic
|
||||||
- focal
|
- focal
|
||||||
- groovy
|
- groovy
|
||||||
|
|
|
@ -0,0 +1,113 @@
|
||||||
|
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':
|
||||||
|
# for quagga which has no focal support yet
|
||||||
|
series: bionic
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
neutron-api-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
|
||||||
|
haproxy-server-timeout: 90000
|
||||||
|
haproxy-client-timeout: 90000
|
||||||
|
haproxy-queue-timeout: 9000
|
||||||
|
haproxy-connect-timeout: 9000
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
manage-neutron-plugin-legacy-mode: true
|
||||||
|
neutron-plugin: ovs
|
||||||
|
flat-network-providers: physnet1,
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
haproxy-server-timeout: 90000
|
||||||
|
haproxy-client-timeout: 90000
|
||||||
|
haproxy-queue-timeout: 9000
|
||||||
|
haproxy-connect-timeout: 9000
|
||||||
|
to:
|
||||||
|
- '4'
|
||||||
|
|
||||||
|
neutron-dynamic-routing:
|
||||||
|
charm: ../../../neutron-dynamic-routing
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '5'
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '6'
|
||||||
|
|
||||||
|
quagga:
|
||||||
|
charm: cs:~openstack-charmers-next/bionic/quagga
|
||||||
|
series: bionic
|
||||||
|
num_units: 1
|
||||||
|
to:
|
||||||
|
- '7'
|
||||||
|
|
||||||
|
relations:
|
||||||
|
|
||||||
|
- - 'neutron-dynamic-routing:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'neutron-dynamic-routing:bgp-speaker'
|
||||||
|
- 'quagga:bgpclient'
|
||||||
|
|
||||||
|
- - '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'
|
||||||
|
|
||||||
|
- - 'neutron-api:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'neutron-api:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
|
@ -17,7 +17,7 @@ machines:
|
||||||
'5':
|
'5':
|
||||||
'6':
|
'6':
|
||||||
'7':
|
'7':
|
||||||
# for quagga which has no focal/groovy/hirsute support yet
|
# for quagga which has no hirsute support yet
|
||||||
series: bionic
|
series: bionic
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
|
|
|
@ -17,7 +17,7 @@ machines:
|
||||||
'5':
|
'5':
|
||||||
'6':
|
'6':
|
||||||
'7':
|
'7':
|
||||||
# for quagga which has no focal/groovy/hirsute support yet
|
# for quagga which has no impish support yet
|
||||||
series: bionic
|
series: bionic
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
|
|
|
@ -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'
|
||||||
|
@ -17,7 +17,7 @@ machines:
|
||||||
'5':
|
'5':
|
||||||
'6':
|
'6':
|
||||||
'7':
|
'7':
|
||||||
# for quagga which has no focal/groovy support yet
|
# for quagga which has no jammy support yet
|
||||||
series: bionic
|
series: bionic
|
||||||
|
|
||||||
applications:
|
applications:
|
|
@ -1,56 +0,0 @@
|
||||||
series: xenial
|
|
||||||
relations:
|
|
||||||
- [neutron-dynamic-routing, rabbitmq-server]
|
|
||||||
- [neutron-dynamic-routing, quagga]
|
|
||||||
- [keystone, mysql]
|
|
||||||
- [neutron-api, mysql]
|
|
||||||
- [neutron-api, rabbitmq-server]
|
|
||||||
- [neutron-api, keystone]
|
|
||||||
applications:
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/keystone
|
|
||||||
constraints: mem=1G
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: 'cloud:xenial-ocata'
|
|
||||||
haproxy-server-timeout: 90000
|
|
||||||
haproxy-client-timeout: 90000
|
|
||||||
haproxy-queue-timeout: 9000
|
|
||||||
haproxy-connect-timeout: 9000
|
|
||||||
series: xenial
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/percona-cluster
|
|
||||||
constraints: mem=4G
|
|
||||||
num_units: 1
|
|
||||||
options: {source: 'cloud:xenial-ocata'}
|
|
||||||
series: xenial
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/neutron-api
|
|
||||||
constraints: mem=1G
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: 'cloud:xenial-ocata'
|
|
||||||
haproxy-server-timeout: 90000
|
|
||||||
haproxy-client-timeout: 90000
|
|
||||||
haproxy-queue-timeout: 9000
|
|
||||||
haproxy-connect-timeout: 9000
|
|
||||||
series: xenial
|
|
||||||
neutron-dynamic-routing:
|
|
||||||
charm: ../../../neutron-dynamic-routing
|
|
||||||
num_units: 1
|
|
||||||
options: {openstack-origin: 'cloud:xenial-ocata'}
|
|
||||||
series: xenial
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
|
|
||||||
constraints: mem=1G
|
|
||||||
num_units: 1
|
|
||||||
options: {source: 'cloud:xenial-ocata'}
|
|
||||||
series: xenial
|
|
||||||
quagga:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/quagga
|
|
||||||
num_units: 1
|
|
||||||
options: {use-16bit-asn: True}
|
|
||||||
series: xenial
|
|
||||||
|
|
|
@ -1,55 +0,0 @@
|
||||||
series: xenial
|
|
||||||
relations:
|
|
||||||
- [neutron-dynamic-routing, rabbitmq-server]
|
|
||||||
- [neutron-dynamic-routing, quagga]
|
|
||||||
- [keystone, mysql]
|
|
||||||
- [neutron-api, mysql]
|
|
||||||
- [neutron-api, rabbitmq-server]
|
|
||||||
- [neutron-api, keystone]
|
|
||||||
applications:
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/keystone
|
|
||||||
constraints: mem=1G
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: 'cloud:xenial-pike'
|
|
||||||
haproxy-server-timeout: 90000
|
|
||||||
haproxy-client-timeout: 90000
|
|
||||||
haproxy-queue-timeout: 9000
|
|
||||||
haproxy-connect-timeout: 9000
|
|
||||||
series: xenial
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/percona-cluster
|
|
||||||
constraints: mem=4G
|
|
||||||
num_units: 1
|
|
||||||
options: {source: 'cloud:xenial-pike'}
|
|
||||||
series: xenial
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/neutron-api
|
|
||||||
constraints: mem=1G
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
flat-network-providers: physnet1
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: 'cloud:xenial-pike'
|
|
||||||
haproxy-server-timeout: 90000
|
|
||||||
haproxy-client-timeout: 90000
|
|
||||||
haproxy-queue-timeout: 9000
|
|
||||||
haproxy-connect-timeout: 9000
|
|
||||||
series: xenial
|
|
||||||
neutron-dynamic-routing:
|
|
||||||
charm: ../../../neutron-dynamic-routing
|
|
||||||
num_units: 1
|
|
||||||
options: {openstack-origin: 'cloud:xenial-pike'}
|
|
||||||
series: xenial
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
|
|
||||||
constraints: mem=1G
|
|
||||||
num_units: 1
|
|
||||||
options: {source: 'cloud:xenial-pike'}
|
|
||||||
series: xenial
|
|
||||||
quagga:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/quagga
|
|
||||||
num_units: 1
|
|
||||||
options: {use-16bit-asn: True}
|
|
||||||
series: xenial
|
|
|
@ -1,53 +0,0 @@
|
||||||
relations:
|
|
||||||
- [neutron-dynamic-routing, rabbitmq-server]
|
|
||||||
- [neutron-dynamic-routing, quagga]
|
|
||||||
- [keystone, mysql]
|
|
||||||
- [neutron-api, mysql]
|
|
||||||
- [neutron-api, rabbitmq-server]
|
|
||||||
- [neutron-api, keystone]
|
|
||||||
applications:
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/keystone
|
|
||||||
constraints: mem=1G
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: 'cloud:xenial-queens'
|
|
||||||
haproxy-server-timeout: 90000
|
|
||||||
haproxy-client-timeout: 90000
|
|
||||||
haproxy-queue-timeout: 9000
|
|
||||||
haproxy-connect-timeout: 9000
|
|
||||||
series: xenial
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/percona-cluster
|
|
||||||
constraints: mem=4G
|
|
||||||
num_units: 1
|
|
||||||
options: {source: 'cloud:xenial-queens'}
|
|
||||||
series: xenial
|
|
||||||
neutron-api:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/neutron-api
|
|
||||||
constraints: mem=1G
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
flat-network-providers: physnet1,
|
|
||||||
neutron-security-groups: true
|
|
||||||
openstack-origin: 'cloud:xenial-queens'
|
|
||||||
haproxy-server-timeout: 90000
|
|
||||||
haproxy-client-timeout: 90000
|
|
||||||
haproxy-queue-timeout: 9000
|
|
||||||
haproxy-connect-timeout: 9000
|
|
||||||
series: xenial
|
|
||||||
neutron-dynamic-routing:
|
|
||||||
charm: ../../../neutron-dynamic-routing
|
|
||||||
num_units: 1
|
|
||||||
options: {openstack-origin: 'cloud:xenial-queens'}
|
|
||||||
series: xenial
|
|
||||||
rabbitmq-server:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
|
|
||||||
constraints: mem=1G
|
|
||||||
num_units: 1
|
|
||||||
options: {source: 'cloud:xenial-queens'}
|
|
||||||
series: xenial
|
|
||||||
quagga:
|
|
||||||
charm: cs:~openstack-charmers-next/xenial/quagga
|
|
||||||
num_units: 1
|
|
||||||
series: xenial
|
|
|
@ -4,30 +4,30 @@ configure:
|
||||||
- zaza.openstack.charm_tests.dragent.configure.setup
|
- zaza.openstack.charm_tests.dragent.configure.setup
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- groovy-victoria-functional
|
|
||||||
- focal-wallaby-functional
|
|
||||||
- focal-victoria-functional
|
|
||||||
- focal-ussuri-functional
|
|
||||||
- bionic-ussuri-functional
|
|
||||||
- bionic-train-functional
|
|
||||||
- bionic-stein-functional
|
|
||||||
- bionic-queens-functional
|
- bionic-queens-functional
|
||||||
|
- bionic-stein-functional
|
||||||
smoke_bundles:
|
- bionic-ussuri-functional
|
||||||
- bionic-train-functional
|
- focal-ussuri-functional
|
||||||
|
- focal-victoria-functional
|
||||||
dev_bundles:
|
- focal-wallaby-functional
|
||||||
- xenial-pike-functional
|
|
||||||
- xenial-queens-functional
|
|
||||||
- bionic-rocky-functional
|
|
||||||
- focal-xena-functional
|
- focal-xena-functional
|
||||||
- hirsute-wallaby-functional
|
- hirsute-wallaby-functional
|
||||||
- impish-xena-functional
|
- impish-xena-functional
|
||||||
|
|
||||||
|
smoke_bundles:
|
||||||
|
- focal-ussuri-functional
|
||||||
|
|
||||||
|
dev_bundles:
|
||||||
|
- bionic-rocky-functional
|
||||||
|
- bionic-train-functional
|
||||||
|
- focal-yoga-functional
|
||||||
|
- jammy-yoga-functional
|
||||||
|
|
||||||
tests:
|
tests:
|
||||||
- zaza.openstack.charm_tests.dragent.tests.DRAgentTest
|
- zaza.openstack.charm_tests.dragent.tests.DRAgentTest
|
||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- groovy-victoria-functional
|
- hirsute-wallaby-functional
|
||||||
- impish-xena-functional
|
- impish-xena-functional
|
||||||
|
- jammy-yoga-functional
|
||||||
|
|
|
@ -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