Add xena bundles
- add non-voting impish-xena bundle - add non-voting focal-xena bundle - add non-voting focal-wallaby bundle - update bionic bundles to replace eoan image with focal - rebuild to pick up charm-helpers changes - update tox/pip.sh to ensure setuptools<50.0.0 - drop minimal mirror from tests until https://pad.lv/1933966 is fixed Change-Id: I9b38c0da71229fbc1a70849d8fcae450e8983b21 Related-Bug: #1933966
This commit is contained in:
parent
ada8a7cc0f
commit
068e5ff087
11
osci.yaml
11
osci.yaml
|
@ -4,7 +4,14 @@
|
|||
check:
|
||||
jobs:
|
||||
- charm-build
|
||||
- groovy-victoria
|
||||
- impish-xena:
|
||||
voting: false
|
||||
- hirsute-wallaby:
|
||||
voting: false
|
||||
- focal-xena:
|
||||
voting: false
|
||||
- focal-wallaby:
|
||||
voting: false
|
||||
- focal-victoria
|
||||
- focal-ussuri
|
||||
- bionic-ussuri
|
||||
|
@ -12,4 +19,4 @@
|
|||
- bionic-stein
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
charm_build_name: octavia-diskimage-retrofit
|
||||
charm_build_name: octavia-diskimage-retrofit
|
||||
|
|
|
@ -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 "$@"
|
2
rebuild
2
rebuild
|
@ -2,4 +2,4 @@
|
|||
# when dependencies of the charm change,
|
||||
# but nothing in the charm needs to.
|
||||
# simply change the uuid to something new
|
||||
fa42d074-b3eb-11eb-b97b-4f8eacaf2bb4
|
||||
53ea6076-1178-11ec-90df-879d6deea2a2
|
||||
|
|
|
@ -38,21 +38,34 @@ applications:
|
|||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|eoan)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
},
|
||||
{url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|eoan)',
|
||||
'release~(xenial|bionic|focal)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
}]"
|
||||
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
|
||||
# is fixed.
|
||||
#
|
||||
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# },
|
||||
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# }]"
|
||||
octavia-diskimage-retrofit:
|
||||
series: bionic
|
||||
charm: ../../../octavia-diskimage-retrofit
|
||||
|
|
|
@ -38,21 +38,34 @@ applications:
|
|||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|eoan)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
},
|
||||
{url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|eoan)',
|
||||
'release~(xenial|bionic|focal)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
}]"
|
||||
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
|
||||
# is fixed.
|
||||
#
|
||||
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# },
|
||||
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# }]"
|
||||
octavia-diskimage-retrofit:
|
||||
series: bionic
|
||||
charm: ../../../octavia-diskimage-retrofit
|
||||
|
|
|
@ -38,21 +38,34 @@ applications:
|
|||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|eoan)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
},
|
||||
{url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|eoan)',
|
||||
'release~(xenial|bionic|focal)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
}]"
|
||||
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
|
||||
# is fixed.
|
||||
#
|
||||
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# },
|
||||
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# }]"
|
||||
octavia-diskimage-retrofit:
|
||||
series: bionic
|
||||
charm: ../../../octavia-diskimage-retrofit
|
||||
|
|
|
@ -40,21 +40,34 @@ applications:
|
|||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|eoan)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
},
|
||||
{url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|eoan)',
|
||||
'release~(xenial|bionic|focal)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
}]"
|
||||
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
|
||||
# is fixed.
|
||||
#
|
||||
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# },
|
||||
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# }]"
|
||||
# NOTE(fnordahl): We deliberately do not include retrofit-series and uca
|
||||
# pocket configuration options here to confirm that the charm defaults work.
|
||||
octavia-diskimage-retrofit:
|
||||
|
|
|
@ -65,17 +65,30 @@ applications:
|
|||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
},
|
||||
{url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|focal)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
}]"
|
||||
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
|
||||
# is fixed.
|
||||
#
|
||||
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# },
|
||||
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# }]"
|
||||
to:
|
||||
- '5'
|
||||
|
||||
|
|
|
@ -65,17 +65,30 @@ applications:
|
|||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
},
|
||||
{url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|focal)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
}]"
|
||||
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
|
||||
# is fixed.
|
||||
#
|
||||
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# },
|
||||
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# }]"
|
||||
to:
|
||||
- '5'
|
||||
|
||||
|
|
|
@ -0,0 +1,122 @@
|
|||
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':
|
||||
'4':
|
||||
'5':
|
||||
|
||||
applications:
|
||||
|
||||
mysql-innodb-cluster:
|
||||
constraints: mem=3072M
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
glance-simplestreams-sync:
|
||||
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
|
||||
num_units: 1
|
||||
options:
|
||||
source: ppa:simplestreams-dev/trunk
|
||||
use_swift: False
|
||||
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|focal)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
}]"
|
||||
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
|
||||
# is fixed.
|
||||
#
|
||||
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# },
|
||||
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# }]"
|
||||
to:
|
||||
- '5'
|
||||
|
||||
octavia-diskimage-retrofit:
|
||||
charm: ../../../octavia-diskimage-retrofit
|
||||
options:
|
||||
retrofit-series: focal
|
||||
|
||||
relations:
|
||||
|
||||
- - 'glance-simplestreams-sync:juju-info'
|
||||
- 'octavia-diskimage-retrofit:juju-info'
|
||||
|
||||
- - 'keystone-mysql-router:shared-db'
|
||||
- 'keystone:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'glance-mysql-router:shared-db'
|
||||
- 'glance:shared-db'
|
||||
- - 'glance-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'keystone:identity-service'
|
||||
- 'glance:identity-service'
|
||||
|
||||
- - 'keystone:identity-service'
|
||||
- 'glance-simplestreams-sync:identity-service'
|
||||
|
||||
- - 'keystone:identity-credentials'
|
||||
- 'octavia-diskimage-retrofit:identity-credentials'
|
|
@ -0,0 +1,122 @@
|
|||
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
|
||||
'1':
|
||||
constraints: mem=3072M
|
||||
'2':
|
||||
constraints: mem=3072M
|
||||
'3':
|
||||
'4':
|
||||
'5':
|
||||
|
||||
applications:
|
||||
|
||||
mysql-innodb-cluster:
|
||||
constraints: mem=3072M
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
glance-simplestreams-sync:
|
||||
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
|
||||
num_units: 1
|
||||
options:
|
||||
source: ppa:simplestreams-dev/trunk
|
||||
use_swift: False
|
||||
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|focal)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
}]"
|
||||
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
|
||||
# is fixed.
|
||||
#
|
||||
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# },
|
||||
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# }]"
|
||||
to:
|
||||
- '5'
|
||||
|
||||
octavia-diskimage-retrofit:
|
||||
charm: ../../../octavia-diskimage-retrofit
|
||||
options:
|
||||
retrofit-series: focal
|
||||
|
||||
relations:
|
||||
|
||||
- - 'glance-simplestreams-sync:juju-info'
|
||||
- 'octavia-diskimage-retrofit:juju-info'
|
||||
|
||||
- - 'keystone-mysql-router:shared-db'
|
||||
- 'keystone:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'glance-mysql-router:shared-db'
|
||||
- 'glance:shared-db'
|
||||
- - 'glance-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'keystone:identity-service'
|
||||
- 'glance:identity-service'
|
||||
|
||||
- - 'keystone:identity-service'
|
||||
- 'glance-simplestreams-sync:identity-service'
|
||||
|
||||
- - 'keystone:identity-credentials'
|
||||
- 'octavia-diskimage-retrofit:identity-credentials'
|
|
@ -0,0 +1,122 @@
|
|||
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':
|
||||
'4':
|
||||
'5':
|
||||
|
||||
applications:
|
||||
|
||||
mysql-innodb-cluster:
|
||||
constraints: mem=3072M
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '4'
|
||||
|
||||
glance-simplestreams-sync:
|
||||
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
|
||||
num_units: 1
|
||||
options:
|
||||
source: ppa:simplestreams-dev/trunk
|
||||
use_swift: False
|
||||
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|focal)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
}]"
|
||||
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
|
||||
# is fixed.
|
||||
#
|
||||
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# },
|
||||
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# }]"
|
||||
to:
|
||||
- '5'
|
||||
|
||||
octavia-diskimage-retrofit:
|
||||
charm: ../../../octavia-diskimage-retrofit
|
||||
options:
|
||||
retrofit-series: focal
|
||||
|
||||
relations:
|
||||
|
||||
- - 'glance-simplestreams-sync:juju-info'
|
||||
- 'octavia-diskimage-retrofit:juju-info'
|
||||
|
||||
- - 'keystone-mysql-router:shared-db'
|
||||
- 'keystone:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'glance-mysql-router:shared-db'
|
||||
- 'glance:shared-db'
|
||||
- - 'glance-mysql-router:db-router'
|
||||
- 'mysql-innodb-cluster:db-router'
|
||||
|
||||
- - 'keystone:identity-service'
|
||||
- 'glance:identity-service'
|
||||
|
||||
- - 'keystone:identity-service'
|
||||
- 'glance-simplestreams-sync:identity-service'
|
||||
|
||||
- - 'keystone:identity-credentials'
|
||||
- 'octavia-diskimage-retrofit:identity-credentials'
|
|
@ -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'
|
||||
|
@ -65,17 +65,30 @@ applications:
|
|||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
},
|
||||
{url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson',
|
||||
max: 1,
|
||||
item_filters: [
|
||||
'release~(xenial|bionic|focal)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)'
|
||||
]
|
||||
}]"
|
||||
# NOTE(coreycb): Drop minimal mirror until https://pad.lv/1933966
|
||||
# is fixed.
|
||||
#
|
||||
# mirror_list: "[{url: 'http://cloud-images.ubuntu.com/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# },
|
||||
# {url: 'http://cloud-images.ubuntu.com/minimal/daily/',
|
||||
# name_prefix: 'ubuntu:released',
|
||||
# path: 'streams/v1/index.sjson',
|
||||
# max: 1,
|
||||
# item_filters: [
|
||||
# 'release~(xenial|bionic|focal)',
|
||||
# 'arch~(x86_64|amd64)',
|
||||
# 'ftype~(disk1.img|disk.img)'
|
||||
# ]
|
||||
# }]"
|
||||
to:
|
||||
- '5'
|
||||
|
|
@ -1,23 +1,33 @@
|
|||
charm_name: octavia-diskimage-retrofit
|
||||
|
||||
smoke_bundles:
|
||||
- bionic-ussuri
|
||||
|
||||
gate_bundles:
|
||||
- groovy-victoria
|
||||
- focal-victoria
|
||||
- focal-ussuri
|
||||
- bionic-ussuri
|
||||
- bionic-train
|
||||
- bionic-stein
|
||||
|
||||
dev_bundles:
|
||||
- bionic-rocky
|
||||
- focal-wallaby
|
||||
- focal-xena
|
||||
- hirsute-wallaby
|
||||
- impish-xena
|
||||
|
||||
target_deploy_status:
|
||||
glance-simplestreams-sync:
|
||||
workload-status: unknown
|
||||
workload-status-message: ""
|
||||
|
||||
configure:
|
||||
- zaza.openstack.charm_tests.glance_simplestreams_sync.setup.sync_images
|
||||
|
||||
tests:
|
||||
- zaza.openstack.charm_tests.octavia.diskimage_retrofit.tests.OctaviaDiskimageRetrofitTest
|
||||
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- groovy-victoria
|
||||
- impish-xena
|
||||
|
|
|
@ -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 =
|
||||
|
|
17
tox.ini
17
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
|
||||
|
||||
|
|
Loading…
Reference in New Issue