Merge "Optimize bundles for faster test execution"

This commit is contained in:
Zuul 2018-08-27 12:49:22 +00:00 committed by Gerrit Code Review
commit 3557feb9af
9 changed files with 163 additions and 22 deletions

View File

@ -1,4 +1,13 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
'4':
relations:
- - keystone:shared-db
- mysql:shared-db
@ -10,6 +19,8 @@ applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
series: bionic
charm: ../../../keystone
@ -17,6 +28,12 @@ applications:
options:
token-provider: 'fernet'
token-expiration: 60
to:
- '1'
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
to:
- '4'

View File

@ -1,4 +1,13 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
'4':
relations:
- - keystone:shared-db
- mysql:shared-db
@ -10,6 +19,8 @@ applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
series: bionic
charm: ../../../keystone
@ -17,8 +28,14 @@ applications:
options:
openstack-origin: cloud:bionic-rocky/proposed
token-expiration: 60
to:
- '1'
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:bionic-rocky/proposed
to:
- '4'

View File

@ -1,4 +1,13 @@
series: cosmic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
'4':
relations:
- - keystone:shared-db
- mysql:shared-db
@ -10,12 +19,20 @@ applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
series: cosmic
charm: ../../../keystone
num_units: 3
options:
token-expiration: 60
to:
- '1'
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
to:
- '4'

View File

@ -1,4 +1,18 @@
series: trusty
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm
'2':
constraints: virt-type=kvm
'3':
constraints: virt-type=kvm
'4':
constraints: virt-type=kvm
relations:
- - keystone:shared-db
- mysql:shared-db
@ -10,22 +24,20 @@ applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
# workaround while awaiting release of next version of python-libjuju with
# model-constraints support
constraints:
virt-type=kvm
to:
- '0'
keystone:
series: trusty
charm: ../../../keystone
num_units: 3
# workaround while awaiting release of next version of python-libjuju with
# model-constraints support
constraints:
virt-type=kvm
to:
- '1'
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
# workaround while awaiting release of next version of python-libjuju with
# model-constraints support
constraints:
virt-type=kvm
to:
- '4'

View File

@ -1,4 +1,18 @@
series: trusty
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm
'2':
constraints: virt-type=kvm
'3':
constraints: virt-type=kvm
'4':
constraints: virt-type=kvm
relations:
- - keystone:shared-db
- mysql:shared-db
@ -10,26 +24,22 @@ applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
# workaround while awaiting release of next version of python-libjuju with
# model-constraints support
constraints:
virt-type=kvm
to:
- '0'
keystone:
series: trusty
charm: ../../../keystone
num_units: 3
# workaround while awaiting release of next version of python-libjuju with
# model-constraints support
constraints:
virt-type=kvm
options:
openstack-origin: cloud:trusty-mitaka
to:
- '1'
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
# workaround while awaiting release of next version of python-libjuju with
# model-constraints support
constraints:
virt-type=kvm
options:
openstack-origin: cloud:trusty-mitaka
to:
- '4'

View File

@ -1,4 +1,13 @@
series: xenial
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
'4':
relations:
- - keystone:shared-db
- mysql:shared-db
@ -10,10 +19,18 @@ applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
series: xenial
charm: ../../../keystone
num_units: 3
to:
- '1'
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
to:
- '4'

View File

@ -1,4 +1,13 @@
series: xenial
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
'4':
relations:
- - keystone:shared-db
- mysql:shared-db
@ -10,6 +19,8 @@ applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
series: xenial
charm: ../../../keystone
@ -18,8 +29,14 @@ applications:
openstack-origin: cloud:xenial-ocata
token-provider: 'fernet'
token-expiration: 60
to:
- '1'
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
to:
- '4'

View File

@ -1,4 +1,13 @@
series: xenial
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
'4':
relations:
- - keystone:shared-db
- mysql:shared-db
@ -10,6 +19,8 @@ applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
series: xenial
charm: ../../../keystone
@ -18,8 +29,14 @@ applications:
openstack-origin: cloud:xenial-pike
token-provider: 'fernet'
token-expiration: 60
to:
- '1'
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:xenial-pike
to:
- '4'

View File

@ -1,4 +1,13 @@
series: xenial
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
'4':
relations:
- - keystone:shared-db
- mysql:shared-db
@ -10,6 +19,8 @@ applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
series: xenial
charm: ../../../keystone
@ -18,8 +29,14 @@ applications:
openstack-origin: cloud:xenial-queens
token-provider: 'fernet'
token-expiration: 60
to:
- '1'
- '2'
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: cloud:xenial-queens
to:
- '4'