Add yoga bundles and release-tool syncs

* charm-helpers sync for classic charms
* sync from release-tools
* switch to release-specific zosci functional tests
* run focal-ussuri as smoke tests
* remove trusty, xenial, and groovy metadata/tests
* drop py35 and add py39

Change-Id: Iaea730e035c4671d83fa65c7d74a2b31f59680cd
This commit is contained in:
Corey Bryant 2021-10-29 17:00:41 -04:00
parent 745fa81330
commit 9fe1f89618
12 changed files with 359 additions and 212 deletions

View File

@ -1,11 +1,10 @@
- project:
templates:
- charm-unit-jobs
- charm-yoga-unit-jobs
check:
jobs:
- bionic-queens_manila
- ganesha-bionic-stein
- ganesha-bionic-train
- ganesha-bionic-ussuri
- ganesha-focal-ussuri
- ganesha-focal-victoria
@ -16,12 +15,14 @@
voting: false
- ganesha-focal-xena:
voting: false
- ganesha-groovy-victoria:
- ganesha-focal-yoga:
voting: false
- ganesha-hirsute-wallaby:
voting: false
- ganesha-impish-xena:
voting: false
- ganesha-jammy-yoga:
voting: false
vars:
needs_charm_build: true
charm_build_name: manila
@ -30,10 +31,9 @@
parent: func-target
dependencies:
- osci-lint
- tox-py35
- tox-py36
- tox-py37
- tox-py38
- tox-py39
vars:
tox_extra_args: ganesha:focal-ussuri
- job:
@ -47,12 +47,6 @@
dependencies: *smoke-jobs
vars:
tox_extra_args: ganesha:bionic-stein
- job:
name: ganesha-bionic-train
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: ganesha:bionic-train
- job:
name: ganesha-bionic-ussuri
parent: func-target
@ -78,11 +72,23 @@
vars:
tox_extra_args: ganesha:focal-xena
- job:
name: ganesha-groovy-victoria
name: ganesha-focal-wallaby
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: ganesha:groovy-victoria
tox_extra_args: ganesha:focal-wallaby
- job:
name: ganesha-focal-xena
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: ganesha:focal-xena
- job:
name: ganesha-focal-yoga
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: ganesha:focal-yoga
- job:
name: ganesha-hirsute-wallaby
parent: func-target
@ -95,3 +101,9 @@
dependencies: *smoke-jobs
vars:
tox_extra_args: ganesha:impish-xena
- job:
name: ganesha-jammy-yoga
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: ganesha:jammy-yoga

View File

@ -9,6 +9,7 @@
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
# Build requirements
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
charm-tools==2.8.3
simplejson

View File

@ -11,7 +11,6 @@ description: |
tags:
- openstack
series:
- xenial
- bionic
- focal
- groovy
@ -36,4 +35,4 @@ requires:
provides:
nrpe-external-master:
interface: nrpe-external-master
scope: container
scope: container

View File

@ -0,0 +1,319 @@
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':
'8':
'9':
'10':
'11':
'12':
'13':
'14':
'15':
# 16 and 17 are nova compute units
'16':
constraints: mem=8G
'17':
constraints: mem=8G
'18':
'19':
'20':
'21':
'22':
'23':
services:
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
manila-ganesha-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
placement-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'
manila-ganesha:
num_units: 1
charm: cs:~openstack-charmers-next/manila-ganesha
options:
openstack-origin: *openstack-origin
to:
- '3'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *openstack-origin
to:
- '4'
- '5'
- '6'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
options:
source: *openstack-origin
storage:
osd-devices: 'cinder,10G'
to:
- '7'
- '8'
- '9'
ceph-fs:
charm: cs:~openstack-charmers-next/ceph-fs
num_units: 2
options:
source: *openstack-origin
to:
- '10'
- '11'
manila:
charm: ../../../manila
num_units: 3
options:
default-share-backend: cephfsnfs1
share-protocols: NFS
openstack-origin: *openstack-origin
to:
- '12'
- '13'
- '14'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *openstack-origin
to:
- '15'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 2
storage:
ephemeral-device: '40G'
options:
config-flags: default_ephemeral_format=ext4
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
openstack-origin: *openstack-origin
to:
- '16'
- '17'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '18'
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
to:
- '19'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *openstack-origin
to:
- '20'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '21'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '22'
placement:
charm: cs:~openstack-charmers-next/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '23'
nrpe:
charm: cs:nrpe
relations:
- - 'ceph-mon'
- 'ceph-osd'
- - 'ceph-mon'
- 'ceph-fs'
- - 'ceph-mon'
- 'manila-ganesha'
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila-ganesha'
- 'rabbitmq-server'
- - 'manila-ganesha'
- 'keystone'
- - 'manila'
- 'manila-ganesha'
- - 'manila-ganesha:shared-db'
- 'manila-ganesha-mysql-router:shared-db'
- - 'manila-ganesha-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila'
- 'rabbitmq-server'
- - 'manila'
- 'keystone'
- - '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:neutron-api'
- 'nova-cloud-controller:neutron-api'
- - 'neutron-api:neutron-plugin-api'
- 'neutron-gateway:neutron-plugin-api'
- - 'neutron-api:identity-service'
- 'keystone:identity-service'
- - 'nova-compute:neutron-plugin'
- 'neutron-openvswitch:neutron-plugin'
- - 'nova-cloud-controller:shared-db'
- 'nova-cloud-controller-mysql-router:shared-db'
- - 'nova-cloud-controller-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'neutron-gateway:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-openvswitch:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'glance-mysql-router:shared-db'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:quantum-network-service'
- 'neutron-gateway:quantum-network-service'
- - 'placement:placement'
- 'nova-cloud-controller:placement'
- - 'placement:amqp'
- 'rabbitmq-server:amqp'
- - 'placement:shared-db'
- 'placement-mysql-router:shared-db'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement:identity-service'
- 'keystone:identity-service'
- - 'nrpe:nrpe-external-master'
- 'manila:nrpe-external-master'

View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin distro
series: groovy
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'

View File

@ -1,47 +0,0 @@
series: &series xenial
variables:
source: &source distro
services:
manila:
charm: ../../../manila
num_units: 3
series: *series
options:
default-share-backend: generic
openstack-origin: *source
manila-generic:
charm: cs:~openstack-charmers-next/manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
nrpe:
charm: cs:nrpe
relations:
- - manila:manila-plugin
- manila-generic
- - manila
- rabbitmq-server
- - manila
- keystone
- - keystone
- percona-cluster
- - manila
- percona-cluster
- - nrpe:nrpe-external-master
- manila:nrpe-external-master

View File

@ -1,46 +0,0 @@
series: &series xenial
variables:
source: &source cloud:xenial-ocata
services:
manila:
charm: ../../../manila
num_units: 3
series: *series
options:
default-share-backend: generic
openstack-origin: *source
manila-generic:
charm: cs:~openstack-charmers-next/manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
nrpe:
charm: cs:nrpe
relations:
- - manila:manila-plugin
- manila-generic
- - manila
- rabbitmq-server
- - manila
- keystone
- - keystone
- percona-cluster
- - manila
- percona-cluster
- - nrpe:nrpe-external-master
- manila:nrpe-external-master

View File

@ -1,46 +0,0 @@
series: &series xenial
variables:
source: &source cloud:xenial-pike
services:
manila:
charm: ../../../manila
num_units: 3
series: *series
options:
default-share-backend: generic
openstack-origin: *source
manila-generic:
charm: cs:~openstack-charmers-next/manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
nrpe:
charm: cs:nrpe
relations:
- - manila:manila-plugin
- manila-generic
- - manila
- rabbitmq-server
- - manila
- keystone
- - keystone
- percona-cluster
- - manila
- percona-cluster
- - nrpe:nrpe-external-master
- manila:nrpe-external-master

View File

@ -1,46 +0,0 @@
series: &series xenial
variables:
source: &source cloud:xenial-queens
services:
manila:
charm: ../../../manila
num_units: 3
series: *series
options:
default-share-backend: generic
openstack-origin: *source
manila-generic:
charm: cs:~openstack-charmers-next/manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
nrpe:
charm: cs:nrpe
relations:
- - manila:manila-plugin
- manila-generic
- - manila
- rabbitmq-server
- - manila
- keystone
- - keystone
- percona-cluster
- - manila
- percona-cluster
- - nrpe:nrpe-external-master
- manila:nrpe-external-master

View File

@ -1,28 +1,22 @@
charm_name: manila
dev_bundles:
- bionic
gate_bundles:
- bionic-queens
- ganesha: bionic-rocky
- ganesha: bionic-stein
- ganesha: bionic-train
- ganesha: bionic-ussuri
- ganesha: focal-ussuri
- ganesha: focal-victoria
dev_bundles:
# Manila doesn't support mod-wsgi before Pike
# - xenial-mitaka
# - xenial-ocata
- xenial-pike
- xenial-queens
- ganesha: bionic-rocky
- ganesha: bionic-train
# Wallaby is currently broken because of a change in the default token-type
# requirements in manila's policy.json that the charm / tests need to learn to
# handle
- ganesha: focal-wallaby
- ganesha: focal-xena
- ganesha: groovy-victoria
- ganesha: focal-yoga
- ganesha: hirsute-wallaby
- ganesha: impish-xena
- ganesha: jammy-yoga
smoke_bundles:
- ganesha: focal-ussuri
@ -55,6 +49,6 @@ tests_options:
force_deploy:
# NOTE(lourot): this is needed because the NRPE charm isn't available on
# non-LTS Ubuntu series. See lp:1933643
- groovy-victoria
- hirsute-wallaby
- impish-xena
- jammy-yoga

View File

@ -3,6 +3,8 @@
# choices of *requirements.txt files for OpenStack Charms:
# 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
stestr>=2.2.0

View File

@ -75,6 +75,11 @@ basepython = python3.8
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py39]
basepython = python3.9
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:pep8]
basepython = python3
deps = flake8==3.9.2