openstack
/
charm-hacluster
Code Issues Proposed changes

Merge "Additional test updates"

This commit is contained in:
Zuul 2021-11-22 14:04:29 +00:00 committed by Gerrit Code Review
parent 67b120ee36 357f995438
commit 6b03399205
9 changed files with 13 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
metadata.yaml
View File

@ -7,7 +7,6 @@ description: |
tags:
- misc
series:
- xenial
- bionic
- focal
- groovy

19
osci.yaml
View File

@ -1,13 +1,10 @@
- project:
templates:
- charm-unit-jobs
- charm-functional-jobs
check:
jobs:
- focal-xena
- focal-yoga:
voting: false
- impish-xena:
voting: false
- jammy-yoga:
voting: false
- charm-yoga-unit-jobs
- charm-yoga-functional-jobs
- charm-xena-functional-jobs
- charm-wallaby-functional-jobs
- charm-victoria-functional-jobs
- charm-ussuri-functional-jobs
- charm-stein-functional-jobs
- charm-queens-functional-jobs

32
tests/bundles/trusty-mitaka.yaml
View File

@ -1,32 +0,0 @@
series: trusty
machines:
'0':
'1':
'2':
'3':
relations:
- ['keystone:shared-db', 'percona-cluster:shared-db']
- ['hacluster:ha', 'keystone:ha']
applications:
percona-cluster:
charm: cs:trusty/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
openstack-origin: cloud:trusty-mitaka
token-expiration: 60
to:
- '1'
- '2'
- '3'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone

31
tests/bundles/xenial-mitaka.yaml
View File

@ -1,31 +0,0 @@
series: xenial
machines:
'0':
'1':
'2':
'3':
relations:
- ['keystone:shared-db', 'percona-cluster:shared-db']
- ['hacluster:ha', 'keystone:ha']
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
token-expiration: 60
to:
- '1'
- '2'
- '3'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone

32
tests/bundles/xenial-ocata.yaml
View File

@ -1,32 +0,0 @@
series: xenial
machines:
'0':
'1':
'2':
'3':
relations:
- ['keystone:shared-db', 'percona-cluster:shared-db']
- ['hacluster:ha', 'keystone:ha']
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
openstack-origin: cloud:xenial-ocata
token-expiration: 60
to:
- '1'
- '2'
- '3'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone

32
tests/bundles/xenial-pike.yaml
View File

@ -1,32 +0,0 @@
series: xenial
machines:
'0':
'1':
'2':
'3':
relations:
- ['keystone:shared-db', 'percona-cluster:shared-db']
- ['hacluster:ha', 'keystone:ha']
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
openstack-origin: cloud:xenial-pike
token-expiration: 60
to:
- '1'
- '2'
- '3'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone

32
tests/bundles/xenial-queens.yaml
View File

@ -1,32 +0,0 @@
series: xenial
machines:
'0':
'1':
'2':
'3':
relations:
- ['keystone:shared-db', 'percona-cluster:shared-db']
- ['hacluster:ha', 'keystone:ha']
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 3
options:
openstack-origin: cloud:xenial-queens
token-expiration: 60
to:
- '1'
- '2'
- '3'
hacluster:
charm: ../../../hacluster
subordinate-to:
- keystone

5
tests/tests.yaml
View File

@ -15,11 +15,6 @@ gate_bundles:
- impish-xena
dev_bundles:
- trusty-mitaka
- xenial-mitaka
- xenial-ocata
- xenial-pike
- xenial-queens
- bionic-rocky
- bionic-train
- focal-yoga

5
tox.ini
View File

@ -61,6 +61,11 @@ basepython = python3.8
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py39]
basepython = python3.9
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py3]
basepython = python3
deps = -r{toxinidir}/requirements.txt