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: I1ee262ed68fdc64cdc5ef005c72087c0d83312cc
This commit is contained in:
Corey Bryant
parent
7b0e00b2b6
commit
8fe533c518
13
osci.yaml
13
osci.yaml
|
|
@ -1,12 +1,11 @@
|
|||
- project:
|
||||
templates:
|
||||
- charm-unit-jobs
|
||||
check:
|
||||
jobs:
|
||||
- bionic-ussuri
|
||||
- focal-ussuri
|
||||
- focal-victoria
|
||||
- groovy-victoria
|
||||
- charm-yoga-unit-jobs
|
||||
- charm-yoga-functional-jobs
|
||||
- charm-xena-functional-jobs
|
||||
- charm-wallaby-functional-jobs
|
||||
- charm-victoria-functional-jobs
|
||||
- charm-ussuri-functional-jobs
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
charm_build_name: magnum-dashboard
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
#!/usr/bin/env bash
|
||||
#
|
||||
# This file is managed centrally by release-tools and should not be modified
|
||||
# within individual charm repos. See the 'global' dir contents for available
|
||||
# choices of tox.ini for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
# setuptools 58.0 dropped the support for use_2to3=true which is needed to
|
||||
# install blessings (an indirect dependency of charm-tools).
|
||||
#
|
||||
# More details on the beahvior of tox and virtualenv creation can be found at
|
||||
# https://github.com/tox-dev/tox/issues/448
|
||||
#
|
||||
# This script is wrapper to force the use of the pinned versions early in the
|
||||
# process when the virtualenv was created and upgraded before installing the
|
||||
# depedencies declared in the target.
|
||||
pip install 'pip<20.3' 'setuptools<50.0.0'
|
||||
pip "$@"
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,86 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-wallaby
|
||||
|
||||
series: focal
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
series: bionic
|
||||
'1':
|
||||
'2':
|
||||
'3':
|
||||
'4':
|
||||
|
||||
applications:
|
||||
|
||||
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
|
||||
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
series: bionic
|
||||
options:
|
||||
max-connections: 1000
|
||||
innodb-buffer-pool-size: 256M
|
||||
to:
|
||||
- '0'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '1'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
|
||||
magnum:
|
||||
charm: cs:~openstack-charmers-next/magnum
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
cert-manager-type: x509keypair
|
||||
to:
|
||||
- '3'
|
||||
|
||||
openstack-dashboard:
|
||||
charm: cs:~openstack-charmers-next/openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
magnum-dashboard:
|
||||
charm: ../../../magnum-dashboard
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'magnum:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'magnum:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'magnum:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'openstack-dashboard:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'openstack-dashboard:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'openstack-dashboard:dashboard-plugin'
|
||||
- 'magnum-dashboard:dashboard'
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-xena
|
||||
|
||||
series: focal
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
series: bionic
|
||||
'1':
|
||||
'2':
|
||||
'3':
|
||||
'4':
|
||||
|
||||
applications:
|
||||
|
||||
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
|
||||
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
series: bionic
|
||||
options:
|
||||
max-connections: 1000
|
||||
innodb-buffer-pool-size: 256M
|
||||
to:
|
||||
- '0'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '1'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
|
||||
magnum:
|
||||
charm: cs:~openstack-charmers-next/magnum
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
cert-manager-type: x509keypair
|
||||
to:
|
||||
- '3'
|
||||
|
||||
openstack-dashboard:
|
||||
charm: cs:~openstack-charmers-next/openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
magnum-dashboard:
|
||||
charm: ../../../magnum-dashboard
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'magnum:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'magnum:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'magnum:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'openstack-dashboard:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'openstack-dashboard:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'openstack-dashboard:dashboard-plugin'
|
||||
- 'magnum-dashboard:dashboard'
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
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
|
||||
series: bionic
|
||||
'1':
|
||||
'2':
|
||||
'3':
|
||||
'4':
|
||||
|
||||
applications:
|
||||
|
||||
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
|
||||
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
series: bionic
|
||||
options:
|
||||
max-connections: 1000
|
||||
innodb-buffer-pool-size: 256M
|
||||
to:
|
||||
- '0'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '1'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
|
||||
magnum:
|
||||
charm: cs:~openstack-charmers-next/magnum
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
cert-manager-type: x509keypair
|
||||
to:
|
||||
- '3'
|
||||
|
||||
openstack-dashboard:
|
||||
charm: cs:~openstack-charmers-next/openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
magnum-dashboard:
|
||||
charm: ../../../magnum-dashboard
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'magnum:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'magnum:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'magnum:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'openstack-dashboard:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'openstack-dashboard:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'openstack-dashboard:dashboard-plugin'
|
||||
- 'magnum-dashboard:dashboard'
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: hirsute
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
series: bionic
|
||||
'1':
|
||||
'2':
|
||||
'3':
|
||||
'4':
|
||||
|
||||
applications:
|
||||
|
||||
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
|
||||
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
series: bionic
|
||||
options:
|
||||
max-connections: 1000
|
||||
innodb-buffer-pool-size: 256M
|
||||
to:
|
||||
- '0'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '1'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
|
||||
magnum:
|
||||
charm: cs:~openstack-charmers-next/magnum
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
cert-manager-type: x509keypair
|
||||
to:
|
||||
- '3'
|
||||
|
||||
openstack-dashboard:
|
||||
charm: cs:~openstack-charmers-next/openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
magnum-dashboard:
|
||||
charm: ../../../magnum-dashboard
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'magnum:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'magnum:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'magnum:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'openstack-dashboard:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'openstack-dashboard:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'openstack-dashboard:dashboard-plugin'
|
||||
- 'magnum-dashboard:dashboard'
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: groovy
|
||||
series: impish
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: jammy
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
machines:
|
||||
'0':
|
||||
constraints: mem=3072M
|
||||
series: bionic
|
||||
'1':
|
||||
'2':
|
||||
'3':
|
||||
'4':
|
||||
|
||||
applications:
|
||||
|
||||
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
|
||||
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
series: bionic
|
||||
options:
|
||||
max-connections: 1000
|
||||
innodb-buffer-pool-size: 256M
|
||||
to:
|
||||
- '0'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
to:
|
||||
- '1'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '2'
|
||||
|
||||
magnum:
|
||||
charm: cs:~openstack-charmers-next/magnum
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
cert-manager-type: x509keypair
|
||||
to:
|
||||
- '3'
|
||||
|
||||
openstack-dashboard:
|
||||
charm: cs:~openstack-charmers-next/openstack-dashboard
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
magnum-dashboard:
|
||||
charm: ../../../magnum-dashboard
|
||||
|
||||
relations:
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'magnum:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'magnum:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'magnum:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'openstack-dashboard:shared-db'
|
||||
- 'percona-cluster:shared-db'
|
||||
|
||||
- - 'openstack-dashboard:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'openstack-dashboard:dashboard-plugin'
|
||||
- 'magnum-dashboard:dashboard'
|
||||
|
|
@ -6,7 +6,14 @@ gate_bundles:
|
|||
- bionic-ussuri
|
||||
- focal-ussuri
|
||||
- focal-victoria
|
||||
- groovy-victoria
|
||||
- focal-wallaby
|
||||
- focal-xena
|
||||
- hirsute-wallaby
|
||||
- impish-xena
|
||||
|
||||
dev_bundles:
|
||||
- focal-yoga
|
||||
- jammy-yoga
|
||||
|
||||
target_deploy_status: {}
|
||||
|
||||
|
|
@ -18,4 +25,6 @@ tests:
|
|||
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- groovy-victoria
|
||||
- hirsute-wallaby
|
||||
- impish-xena
|
||||
- jammy-yoga
|
||||
|
|
|
|||
|
|
@ -22,12 +22,12 @@ skip_missing_interpreters = False
|
|||
requires = pip < 20.3
|
||||
virtualenv < 20.0
|
||||
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
|
||||
minversion = 3.2.0
|
||||
minversion = 3.18.0
|
||||
|
||||
[testenv]
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
PYTHONHASHSEED=0
|
||||
whitelist_externals = juju
|
||||
allowlist_externals = juju
|
||||
passenv = HOME TERM CS_* OS_* TEST_*
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
install_command =
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
22
tox.ini
22
tox.ini
|
|
@ -11,6 +11,21 @@ envlist = pep8,py3
|
|||
sitepackages = False
|
||||
# NOTE: Avoid false positives by not skipping missing interpreters.
|
||||
skip_missing_interpreters = False
|
||||
# NOTES:
|
||||
# * We avoid the new dependency resolver by pinning pip < 20.3, see
|
||||
# https://github.com/pypa/pip/issues/9187
|
||||
# * Pinning dependencies requires tox >= 3.2.0, see
|
||||
# https://tox.readthedocs.io/en/latest/config.html#conf-requires
|
||||
# * It is also necessary to pin virtualenv as a newer virtualenv would still
|
||||
# lead to fetching the latest pip in the func* tox targets, see
|
||||
# https://stackoverflow.com/a/38133283
|
||||
requires =
|
||||
pip < 20.3
|
||||
virtualenv < 20.0
|
||||
setuptools<50.0.0
|
||||
|
||||
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
|
||||
minversion = 3.18.0
|
||||
|
||||
[testenv]
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
|
|
@ -21,7 +36,7 @@ setenv = VIRTUAL_ENV={envdir}
|
|||
JUJU_REPOSITORY={toxinidir}/build
|
||||
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
|
||||
install_command =
|
||||
pip install {opts} {packages}
|
||||
{toxinidir}/pip.sh install {opts} {packages}
|
||||
deps =
|
||||
-r{toxinidir}/requirements.txt
|
||||
|
||||
|
|
@ -60,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
|
||||
|
|
|
|||
Loading…
Reference in New Issue