openstack/charm-cinder-backup-swift-proxy
Code Issues Proposed changes

Merge "Test bundles for focal-wallaby and hirsute-wallaby"

Browse Source
This commit is contained in:
Zuul
2021-05-06 10:01:39 +00:00
committed by Gerrit Code Review
parent d107093c09 4d0a3106c1
commit a08c604440
4 changed files with 637 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osci.yaml
View File

@@ -3,7 +3,9 @@
- charm-unit-jobs
check:
jobs:
- hirsute-wallaby-swift-v3
- groovy-victoria-swift-v3
- focal-wallaby-swift-v3
# Disabled due to Bug: #1890821
# - focal-victoria-swift-v3
# - focal-ussuri-swift-v3
@@ -14,13 +16,25 @@
charm_build_name: cinder-backup-swift-proxy
- job:
name: groovy-victoria-swift-v3
name: hirsute-wallaby-swift-v3
parent: func-target
dependencies: &smoke-jobs
- bionic-queens-swift-v3
- bionic-queens-swift-v2
vars:
tox_extra_args: hirsute-wallaby-swift-v3
- job:
name: groovy-victoria-swift-v3
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: groovy-victoria-swift-v3
- job:
name: focal-wallaby-swift-v3
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: focal-wallaby-swift-v3
# - job:
# name: focal-victoria-swift-v3
# parent: func-target
@@ -54,4 +68,4 @@
- tox-py37
- tox-py38
vars:
tox_extra_args: bionic-queens-swift-v2
tox_extra_args: bionic-queens-swift-v2

307
src/tests/bundles/focal-wallaby-swift-v3.yaml Normal file
View File

@@ -0,0 +1,307 @@
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
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
constraints: mem=3072M
'4':
constraints: mem=3072M
'5':
constraints: mem=3072M
'6':
'7':
'8':
'9':
'10':
'11':
'12':
'13':
'14':
'15':
'16':
'17':
'18':
'19':
'20':
'21':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
cinder-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'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *openstack-origin
monitor-count: '3'
to:
- '6'
- '7'
- '8'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
osd-devices: '/dev/test-non-existent'
to:
- '9'
- '10'
- '11'
cinder:
charm: cs:~openstack-charmers-next/cinder
num_units: 1
options:
block-device: None
openstack-origin: *openstack-origin
glance-api-version: 2
to:
- '12'
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
num_units: 0
cinder-backup-swift-proxy:
charm: cinder-backup-swift-proxy
num_units: 0
options:
auth-version: 3
swift-user: admin
swift-key: openstack
user-domain: admin_domain
project-domain: admin_domain
project-name: admin
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '13'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '14'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '16'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
placement:
charm: cs:~openstack-charmers-next/placement
num_units: 1
constraints: mem=1G
options:
openstack-origin: *openstack-origin
to:
- '18'
# external swift
swift-keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
swift-mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '3'
- '4'
- '5'
swift-keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
preferred-api-version: 3
to:
- '19'
swift-proxy:
charm: cs:~openstack-charmers-next/swift-proxy
num_units: 1
options:
openstack-origin: *openstack-origin
zone-assignment: manual
replicas: 1
to:
- '20'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
num_units: 1
options:
openstack-origin: *openstack-origin
zone: 1
storage:
block-devices: 'cinder,10G'
to:
- '21'
relations:
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - '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-cloud-controller:image-service'
- 'glance:image-service'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:shared-db'
- 'nova-cloud-controller-mysql-router:shared-db'
- - 'nova-cloud-controller-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement:shared-db'
- 'placement-mysql-router:shared-db'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement:identity-service'
- 'keystone:identity-service'
- - 'placement:placement'
- 'nova-cloud-controller:placement'
- - 'cinder:image-service'
- 'glance:image-service'
- - 'cinder:amqp'
- 'rabbitmq-server:amqp'
- - 'cinder:identity-service'
- 'keystone:identity-service'
- - 'cinder:cinder-volume-service'
- 'nova-cloud-controller:cinder-volume-service'
- - 'cinder-ceph:storage-backend'
- 'cinder:storage-backend'
- - 'cinder'
- 'cinder-backup-swift-proxy'
- - 'ceph-mon:client'
- 'nova-compute:ceph'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'cinder:shared-db'
- 'cinder-mysql-router:shared-db'
- - 'cinder-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-mon:client'
- 'cinder-ceph:ceph'
- - 'ceph-mon:client'
- 'glance:ceph'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
# external swift service
- - 'swift-keystone:shared-db'
- 'swift-keystone-mysql-router:shared-db'
- - 'swift-keystone-mysql-router:db-router'
- 'swift-mysql-innodb-cluster:db-router'
- - 'swift-proxy:identity-service'
- 'swift-keystone:identity-service'
- - 'swift-proxy:swift-storage'
- 'swift-storage:swift-storage'

307
src/tests/bundles/hirsute-wallaby-swift-v3.yaml Normal file
View File

@@ -0,0 +1,307 @@
variables:
openstack-origin: &openstack-origin distro
series: hirsute
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':
constraints: mem=3072M
'4':
constraints: mem=3072M
'5':
constraints: mem=3072M
'6':
'7':
'8':
'9':
'10':
'11':
'12':
'13':
'14':
'15':
'16':
'17':
'18':
'19':
'20':
'21':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
cinder-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'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *openstack-origin
monitor-count: '3'
to:
- '6'
- '7'
- '8'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
options:
source: *openstack-origin
osd-devices: '/dev/test-non-existent'
to:
- '9'
- '10'
- '11'
cinder:
charm: cs:~openstack-charmers-next/cinder
num_units: 1
options:
block-device: None
openstack-origin: *openstack-origin
glance-api-version: 2
to:
- '12'
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
num_units: 0
cinder-backup-swift-proxy:
charm: cinder-backup-swift-proxy
num_units: 0
options:
auth-version: 3
swift-user: admin
swift-key: openstack
user-domain: admin_domain
project-domain: admin_domain
project-name: admin
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '13'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '14'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '15'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '16'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '17'
placement:
charm: cs:~openstack-charmers-next/placement
num_units: 1
constraints: mem=1G
options:
openstack-origin: *openstack-origin
to:
- '18'
# external swift
swift-keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
swift-mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '3'
- '4'
- '5'
swift-keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
preferred-api-version: 3
to:
- '19'
swift-proxy:
charm: cs:~openstack-charmers-next/swift-proxy
num_units: 1
options:
openstack-origin: *openstack-origin
zone-assignment: manual
replicas: 1
to:
- '20'
swift-storage:
charm: cs:~openstack-charmers-next/swift-storage
num_units: 1
options:
openstack-origin: *openstack-origin
zone: 1
storage:
block-devices: 'cinder,10G'
to:
- '21'
relations:
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - '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-cloud-controller:image-service'
- 'glance:image-service'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:shared-db'
- 'nova-cloud-controller-mysql-router:shared-db'
- - 'nova-cloud-controller-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement:shared-db'
- 'placement-mysql-router:shared-db'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement:identity-service'
- 'keystone:identity-service'
- - 'placement:placement'
- 'nova-cloud-controller:placement'
- - 'cinder:image-service'
- 'glance:image-service'
- - 'cinder:amqp'
- 'rabbitmq-server:amqp'
- - 'cinder:identity-service'
- 'keystone:identity-service'
- - 'cinder:cinder-volume-service'
- 'nova-cloud-controller:cinder-volume-service'
- - 'cinder-ceph:storage-backend'
- 'cinder:storage-backend'
- - 'cinder'
- 'cinder-backup-swift-proxy'
- - 'ceph-mon:client'
- 'nova-compute:ceph'
- - 'nova-compute:ceph-access'
- 'cinder-ceph:ceph-access'
- - 'cinder:shared-db'
- 'cinder-mysql-router:shared-db'
- - 'cinder-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'ceph-mon:client'
- 'cinder-ceph:ceph'
- - 'ceph-mon:client'
- 'glance:ceph'
- - 'ceph-osd:mon'
- 'ceph-mon:osd'
# external swift service
- - 'swift-keystone:shared-db'
- 'swift-keystone-mysql-router:shared-db'
- - 'swift-keystone-mysql-router:db-router'
- 'swift-mysql-innodb-cluster:db-router'
- - 'swift-proxy:identity-service'
- 'swift-keystone:identity-service'
- - 'swift-proxy:swift-storage'
- 'swift-storage:swift-storage'

11
src/tests/tests.yaml
View File

@@ -1,11 +1,14 @@
charm_name: cinder-backup-swift-proxy
gate_bundles:
- groovy-victoria-swift-v3
# Disabled due to Bug: #1890821
# - focal-victoria-swift-v3
# - focal-ussuri-swift-v3
- bionic-queens-swift-v3
- bionic-queens-swift-v2
dev_bundles:
- hirsute-wallaby-swift-v3
# Disabled due to Bug: #1890821
- focal-wallaby-swift-v3
- focal-victoria-swift-v3
- focal-ussuri-swift-v3
smoke_bundles:
- bionic-queens-swift-v3
- bionic-queens-swift-v2
@@ -15,4 +18,4 @@ tests:
- zaza.openstack.charm_tests.cinder_backup_swift_proxy.tests.CinderBackupSwiftTest
tests_options:
force_deploy:
- groovy-victoria-swift-v3
- hirsute-wallaby-swift-v3