Add Kinetic and Zed support
* sync charm-helpers to classic charms * change openstack-origin/source default to zed * align testing with zed * add new zed bundles * add zed bundles to tests.yaml * add zed tests to osci.yaml and .zuul.yaml * update build-on and run-on bases * add bindep.txt for py310 * sync tox.ini and requirements.txt for ruamel * use charmcraft_channel 2.0/stable * drop reactive plugin overrides * move interface/layer env vars to charmcraft.yaml Change-Id: Ieb1ef7b7ab76775f5769621a6a7cbcfb18c40b7f
This commit is contained in:
parent
44fee84d4d
commit
51f59879d3
@ -1,3 +1,3 @@
|
||||
- project:
|
||||
templates:
|
||||
- openstack-python3-charm-yoga-jobs
|
||||
- openstack-python3-charm-zed-jobs
|
||||
|
3
bindep.txt
Normal file
3
bindep.txt
Normal file
@ -0,0 +1,3 @@
|
||||
libffi-dev [platform:dpkg]
|
||||
libxml2-dev [platform:dpkg]
|
||||
libxslt1-dev [platform:dpkg]
|
@ -23,13 +23,10 @@ parts:
|
||||
bases:
|
||||
- build-on:
|
||||
- name: ubuntu
|
||||
channel: "20.04"
|
||||
channel: "22.04"
|
||||
architectures:
|
||||
- amd64
|
||||
run-on:
|
||||
- name: ubuntu
|
||||
channel: "20.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
- name: ubuntu
|
||||
channel: "22.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
@ -5,7 +5,7 @@ options:
|
||||
description: RadosGW debug level. Max is 20.
|
||||
source:
|
||||
type: string
|
||||
default: yoga
|
||||
default: zed
|
||||
description: |
|
||||
Optional repository from which to install. May be one of the following:
|
||||
distro (default), ppa:somecustom/ppa, a deb url sources entry,
|
||||
|
@ -467,7 +467,7 @@ def ns_query(address):
|
||||
|
||||
try:
|
||||
answers = dns.resolver.query(address, rtype)
|
||||
except dns.resolver.NXDOMAIN:
|
||||
except (dns.resolver.NXDOMAIN, dns.resolver.NoNameservers):
|
||||
return None
|
||||
|
||||
if answers:
|
||||
|
@ -2560,12 +2560,16 @@ class OVSDPDKDeviceContext(OSContextGenerator):
|
||||
:rtype: List[int]
|
||||
"""
|
||||
cores = []
|
||||
if cpulist and re.match(r"^[0-9,\-^]*$", cpulist):
|
||||
ranges = cpulist.split(',')
|
||||
for cpu_range in ranges:
|
||||
if "-" in cpu_range:
|
||||
cpu_min_max = cpu_range.split('-')
|
||||
cores += range(int(cpu_min_max[0]),
|
||||
int(cpu_min_max[1]) + 1)
|
||||
elif "^" in cpu_range:
|
||||
cpu_rm = cpu_range.split('^')
|
||||
cores.remove(int(cpu_rm[1]))
|
||||
else:
|
||||
cores.append(int(cpu_range))
|
||||
return cores
|
||||
@ -2586,36 +2590,32 @@ class OVSDPDKDeviceContext(OSContextGenerator):
|
||||
|
||||
def cpu_mask(self):
|
||||
"""Get hex formatted CPU mask
|
||||
|
||||
The mask is based on using the first config:dpdk-socket-cores
|
||||
cores of each NUMA node in the unit.
|
||||
:returns: hex formatted CPU mask
|
||||
:rtype: str
|
||||
"""
|
||||
return self.cpu_masks()['dpdk_lcore_mask']
|
||||
|
||||
def cpu_masks(self):
|
||||
"""Get hex formatted CPU masks
|
||||
|
||||
The mask is based on using the first config:dpdk-socket-cores
|
||||
cores of each NUMA node in the unit, followed by the
|
||||
next config:pmd-socket-cores
|
||||
|
||||
:returns: Dict of hex formatted CPU masks
|
||||
:rtype: Dict[str, str]
|
||||
"""
|
||||
num_lcores = config('dpdk-socket-cores')
|
||||
pmd_cores = config('pmd-socket-cores')
|
||||
lcore_mask = 0
|
||||
pmd_mask = 0
|
||||
num_cores = config('dpdk-socket-cores')
|
||||
mask = 0
|
||||
for cores in self._numa_node_cores().values():
|
||||
for core in cores[:num_lcores]:
|
||||
lcore_mask = lcore_mask | 1 << core
|
||||
for core in cores[num_lcores:][:pmd_cores]:
|
||||
pmd_mask = pmd_mask | 1 << core
|
||||
return {
|
||||
'pmd_cpu_mask': format(pmd_mask, '#04x'),
|
||||
'dpdk_lcore_mask': format(lcore_mask, '#04x')}
|
||||
for core in cores[:num_cores]:
|
||||
mask = mask | 1 << core
|
||||
return format(mask, '#04x')
|
||||
|
||||
@classmethod
|
||||
def pmd_cpu_mask(cls):
|
||||
"""Get hex formatted pmd CPU mask
|
||||
|
||||
The mask is based on config:pmd-cpu-set.
|
||||
:returns: hex formatted CPU mask
|
||||
:rtype: str
|
||||
"""
|
||||
mask = 0
|
||||
cpu_list = cls._parse_cpu_list(config('pmd-cpu-set'))
|
||||
if cpu_list:
|
||||
for core in cpu_list:
|
||||
mask = mask | 1 << core
|
||||
return format(mask, '#x')
|
||||
|
||||
def socket_memory(self):
|
||||
"""Formatted list of socket memory configuration per socket.
|
||||
@ -2694,6 +2694,7 @@ class OVSDPDKDeviceContext(OSContextGenerator):
|
||||
ctxt['device_whitelist'] = self.device_whitelist()
|
||||
ctxt['socket_memory'] = self.socket_memory()
|
||||
ctxt['cpu_mask'] = self.cpu_mask()
|
||||
ctxt['pmd_cpu_mask'] = self.pmd_cpu_mask()
|
||||
return ctxt
|
||||
|
||||
|
||||
|
@ -158,6 +158,7 @@ OPENSTACK_CODENAMES = OrderedDict([
|
||||
('2021.1', 'wallaby'),
|
||||
('2021.2', 'xena'),
|
||||
('2022.1', 'yoga'),
|
||||
('2022.2', 'zed'),
|
||||
])
|
||||
|
||||
# The ugly duckling - must list releases oldest to newest
|
||||
@ -400,13 +401,16 @@ def get_os_codename_version(vers):
|
||||
error_out(e)
|
||||
|
||||
|
||||
def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES):
|
||||
def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES,
|
||||
raise_exception=False):
|
||||
'''Determine OpenStack version number from codename.'''
|
||||
for k, v in version_map.items():
|
||||
if v == codename:
|
||||
return k
|
||||
e = 'Could not derive OpenStack version for '\
|
||||
'codename: %s' % codename
|
||||
if raise_exception:
|
||||
raise ValueError(str(e))
|
||||
error_out(e)
|
||||
|
||||
|
||||
|
@ -277,7 +277,7 @@ def service_resume(service_name, init_dir="/etc/init",
|
||||
return started
|
||||
|
||||
|
||||
def service(action, service_name, **kwargs):
|
||||
def service(action, service_name=None, **kwargs):
|
||||
"""Control a system service.
|
||||
|
||||
:param action: the action to take on the service
|
||||
@ -286,7 +286,9 @@ def service(action, service_name, **kwargs):
|
||||
the form of key=value.
|
||||
"""
|
||||
if init_is_systemd(service_name=service_name):
|
||||
cmd = ['systemctl', action, service_name]
|
||||
cmd = ['systemctl', action]
|
||||
if service_name is not None:
|
||||
cmd.append(service_name)
|
||||
else:
|
||||
cmd = ['service', service_name, action]
|
||||
for key, value in kwargs.items():
|
||||
|
@ -30,6 +30,7 @@ UBUNTU_RELEASES = (
|
||||
'hirsute',
|
||||
'impish',
|
||||
'jammy',
|
||||
'kinetic',
|
||||
)
|
||||
|
||||
|
||||
|
@ -15,7 +15,8 @@
|
||||
import os
|
||||
import json
|
||||
import inspect
|
||||
from collections import Iterable, OrderedDict
|
||||
from collections import OrderedDict
|
||||
from collections.abc import Iterable
|
||||
|
||||
from charmhelpers.core import host
|
||||
from charmhelpers.core import hookenv
|
||||
|
@ -12,6 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import contextlib
|
||||
import os
|
||||
import hashlib
|
||||
import re
|
||||
@ -24,11 +25,15 @@ from charmhelpers.payload.archive import (
|
||||
get_archive_handler,
|
||||
extract,
|
||||
)
|
||||
from charmhelpers.core.hookenv import (
|
||||
env_proxy_settings,
|
||||
)
|
||||
from charmhelpers.core.host import mkdir, check_hash
|
||||
|
||||
from urllib.request import (
|
||||
build_opener, install_opener, urlopen, urlretrieve,
|
||||
HTTPPasswordMgrWithDefaultRealm, HTTPBasicAuthHandler,
|
||||
ProxyHandler
|
||||
)
|
||||
from urllib.parse import urlparse, urlunparse, parse_qs
|
||||
from urllib.error import URLError
|
||||
@ -50,6 +55,20 @@ def splitpasswd(user):
|
||||
return user, None
|
||||
|
||||
|
||||
@contextlib.contextmanager
|
||||
def proxy_env():
|
||||
"""
|
||||
Creates a context which temporarily modifies the proxy settings in os.environ.
|
||||
"""
|
||||
restore = {**os.environ} # Copy the current os.environ
|
||||
juju_proxies = env_proxy_settings() or {}
|
||||
os.environ.update(**juju_proxies) # Insert or Update the os.environ
|
||||
yield os.environ
|
||||
for key in juju_proxies:
|
||||
del os.environ[key] # remove any keys which were added or updated
|
||||
os.environ.update(**restore) # restore any original values
|
||||
|
||||
|
||||
class ArchiveUrlFetchHandler(BaseFetchHandler):
|
||||
"""
|
||||
Handler to download archive files from arbitrary URLs.
|
||||
@ -80,6 +99,7 @@ class ArchiveUrlFetchHandler(BaseFetchHandler):
|
||||
# propagate all exceptions
|
||||
# URLError, OSError, etc
|
||||
proto, netloc, path, params, query, fragment = urlparse(source)
|
||||
handlers = []
|
||||
if proto in ('http', 'https'):
|
||||
auth, barehost = splituser(netloc)
|
||||
if auth is not None:
|
||||
@ -89,8 +109,11 @@ class ArchiveUrlFetchHandler(BaseFetchHandler):
|
||||
# Realm is set to None in add_password to force the username and password
|
||||
# to be used whatever the realm
|
||||
passman.add_password(None, source, username, password)
|
||||
authhandler = HTTPBasicAuthHandler(passman)
|
||||
opener = build_opener(authhandler)
|
||||
handlers.append(HTTPBasicAuthHandler(passman))
|
||||
|
||||
with proxy_env():
|
||||
handlers.append(ProxyHandler())
|
||||
opener = build_opener(*handlers)
|
||||
install_opener(opener)
|
||||
response = urlopen(source)
|
||||
try:
|
||||
|
@ -222,6 +222,14 @@ CLOUD_ARCHIVE_POCKETS = {
|
||||
'yoga/proposed': 'focal-proposed/yoga',
|
||||
'focal-yoga/proposed': 'focal-proposed/yoga',
|
||||
'focal-proposed/yoga': 'focal-proposed/yoga',
|
||||
# Zed
|
||||
'zed': 'jammy-updates/zed',
|
||||
'jammy-zed': 'jammy-updates/zed',
|
||||
'jammy-zed/updates': 'jammy-updates/zed',
|
||||
'jammy-updates/zed': 'jammy-updates/zed',
|
||||
'zed/proposed': 'jammy-proposed/zed',
|
||||
'jammy-zed/proposed': 'jammy-proposed/zed',
|
||||
'jammy-proposed/zed': 'jammy-proposed/zed',
|
||||
}
|
||||
|
||||
|
||||
@ -248,6 +256,7 @@ OPENSTACK_RELEASES = (
|
||||
'wallaby',
|
||||
'xena',
|
||||
'yoga',
|
||||
'zed',
|
||||
)
|
||||
|
||||
|
||||
@ -274,6 +283,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
|
||||
('hirsute', 'wallaby'),
|
||||
('impish', 'xena'),
|
||||
('jammy', 'yoga'),
|
||||
('kinetic', 'zed'),
|
||||
])
|
||||
|
||||
|
||||
|
@ -291,7 +291,8 @@ def pool_permission_list_for_service(service):
|
||||
for prefix in prefixes:
|
||||
permissions.append("allow {} object_prefix {}".format(permission,
|
||||
prefix))
|
||||
return ['mon', 'allow r, allow command "osd blacklist"',
|
||||
return ['mon', ('allow r, allow command "osd blacklist"'
|
||||
', allow command "osd blocklist"'),
|
||||
'osd', ', '.join(permissions)]
|
||||
|
||||
|
||||
|
@ -1134,7 +1134,8 @@ def get_mds_bootstrap_key():
|
||||
|
||||
_default_caps = collections.OrderedDict([
|
||||
('mon', ['allow r',
|
||||
'allow command "osd blacklist"']),
|
||||
'allow command "osd blacklist"',
|
||||
'allow command "osd blocklist"']),
|
||||
('osd', ['allow rwx']),
|
||||
])
|
||||
|
||||
@ -1166,7 +1167,10 @@ osd_upgrade_caps = collections.OrderedDict([
|
||||
])
|
||||
|
||||
rbd_mirror_caps = collections.OrderedDict([
|
||||
('mon', ['profile rbd; allow r']),
|
||||
('mon', ['allow profile rbd-mirror-peer',
|
||||
'allow command "service dump"',
|
||||
'allow command "service status"'
|
||||
]),
|
||||
('osd', ['profile rbd']),
|
||||
('mgr', ['allow r']),
|
||||
])
|
||||
@ -3453,6 +3457,9 @@ def enabled_manager_modules():
|
||||
:rtype: List[str]
|
||||
"""
|
||||
cmd = ['ceph', 'mgr', 'module', 'ls']
|
||||
quincy_or_later = cmp_pkgrevno('ceph-common', '17.1.0') >= 0
|
||||
if quincy_or_later:
|
||||
cmd.append('--format=json')
|
||||
try:
|
||||
modules = subprocess.check_output(cmd).decode('UTF-8')
|
||||
except subprocess.CalledProcessError as e:
|
||||
|
@ -13,7 +13,6 @@ tags:
|
||||
- file-servers
|
||||
- misc
|
||||
series:
|
||||
- focal
|
||||
- jammy
|
||||
extra-bindings:
|
||||
public:
|
||||
|
108
osci.yaml
108
osci.yaml
@ -1,101 +1,95 @@
|
||||
- project:
|
||||
templates:
|
||||
- charm-unit-jobs-py38
|
||||
- charm-unit-jobs-py39
|
||||
- charm-unit-jobs-py310
|
||||
check:
|
||||
jobs:
|
||||
- focal-xena-multisite
|
||||
- vault-focal-xena_rgw
|
||||
- vault-focal-xena-namespaced
|
||||
- focal-yoga-multisite:
|
||||
- jammy-yoga-multisite
|
||||
- jammy-zed-multisite:
|
||||
voting: false
|
||||
- vault-focal-yoga_rgw:
|
||||
- kinetic-zed-multisite:
|
||||
voting: false
|
||||
- vault-focal-yoga-namespaced:
|
||||
- vault-jammy-yoga_rgw
|
||||
- vault-jammy-yoga-namespaced
|
||||
- vault-jammy-zed_rgw:
|
||||
voting: false
|
||||
- jammy-yoga-multisite:
|
||||
- vault-jammy-zed-namespaced:
|
||||
voting: false
|
||||
- vault-jammy-yoga_rgw:
|
||||
- vault-kinetic-zed_rgw:
|
||||
voting: false
|
||||
- vault-jammy-yoga-namespaced:
|
||||
- vault-kinetic-zed-namespaced:
|
||||
voting: false
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
charm_build_name: ceph-radosgw
|
||||
build_type: charmcraft
|
||||
- job:
|
||||
name: focal-xena-multisite
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- osci-lint
|
||||
- charm-build
|
||||
- tox-py38
|
||||
- tox-py39
|
||||
vars:
|
||||
tox_extra_args: focal-xena-multisite
|
||||
- job:
|
||||
name: vault-focal-xena_rgw
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- osci-lint
|
||||
- charm-build
|
||||
- tox-py38
|
||||
- tox-py39
|
||||
vars:
|
||||
tox_extra_args: vault:focal-xena
|
||||
- job:
|
||||
name: vault-focal-xena-namespaced
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- osci-lint
|
||||
- tox-py38
|
||||
- tox-py39
|
||||
vars:
|
||||
tox_extra_args: vault:focal-xena-namespaced
|
||||
|
||||
charmcraft_channel: 2.0/stable
|
||||
- job:
|
||||
name: jammy-yoga-multisite
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- focal-xena-multisite
|
||||
- osci-lint
|
||||
- charm-build
|
||||
- name: tox-py310
|
||||
soft: true
|
||||
vars:
|
||||
tox_extra_args: jammy-yoga-multisite
|
||||
- job:
|
||||
name: jammy-zed-multisite
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- jammy-yoga-multisite
|
||||
vars:
|
||||
tox_extra_args: jammy-zed-multisite
|
||||
- job:
|
||||
name: kinetic-zed-multisite
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- jammy-yoga-multisite
|
||||
vars:
|
||||
tox_extra_args: kinetic-zed-multisite
|
||||
- job:
|
||||
name: vault-jammy-yoga_rgw
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- vault-focal-xena_rgw
|
||||
- vault-focal-xena-namespaced
|
||||
- jammy-yoga-multisite
|
||||
vars:
|
||||
tox_extra_args: vault:jammy-yoga
|
||||
- job:
|
||||
name: vault-jammy-yoga-namespaced
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- vault-focal-xena_rgw
|
||||
- vault-focal-xena-namespaced
|
||||
- jammy-yoga-multisite
|
||||
vars:
|
||||
tox_extra_args: vault:jammy-yoga-namespaced
|
||||
- job:
|
||||
name: focal-yoga-multisite
|
||||
name: vault-jammy-zed_rgw
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- focal-xena-multisite
|
||||
- vault-jammy-yoga_rgw
|
||||
- vault-jammy-yoga-namespaced
|
||||
vars:
|
||||
tox_extra_args: focal-yoga-multisite
|
||||
tox_extra_args: vault:jammy-zed
|
||||
- job:
|
||||
name: vault-focal-yoga_rgw
|
||||
name: vault-jammy-zed-namespaced
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- vault-focal-xena_rgw
|
||||
- vault-focal-xena-namespaced
|
||||
- vault-jammy-yoga_rgw
|
||||
- vault-jammy-yoga-namespaced
|
||||
vars:
|
||||
tox_extra_args: vault:focal-yoga
|
||||
tox_extra_args: vault:jammy-zed-namespaced
|
||||
- job:
|
||||
name: vault-focal-yoga-namespaced
|
||||
name: vault-kinetic-zed_rgw
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- vault-focal-xena_rgw
|
||||
- vault-focal-xena-namespaced
|
||||
- vault-jammy-yoga_rgw
|
||||
- vault-jammy-yoga-namespaced
|
||||
vars:
|
||||
tox_extra_args: vault:focal-yoga-namespaced
|
||||
tox_extra_args: vault:kinetic-zed
|
||||
- job:
|
||||
name: vault-kinetic-zed-namespaced
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- vault-jammy-yoga_rgw
|
||||
- vault-jammy-yoga-namespaced
|
||||
vars:
|
||||
tox_extra_args: vault:kinetic-zed-namespaced
|
||||
|
@ -11,14 +11,19 @@ pbr==5.6.0
|
||||
simplejson>=2.2.0
|
||||
netifaces>=0.10.4
|
||||
|
||||
# NOTE: newer versions of cryptography require a Rust compiler to build,
|
||||
# see
|
||||
# * https://github.com/openstack-charmers/zaza/issues/421
|
||||
# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
|
||||
#
|
||||
cryptography<3.4
|
||||
|
||||
# Strange import error with newer netaddr:
|
||||
netaddr>0.7.16,<0.8.0
|
||||
|
||||
Jinja2>=2.6 # BSD License (3 clause)
|
||||
six>=1.9.0
|
||||
|
||||
# dnspython 2.0.0 dropped py3.5 support
|
||||
dnspython<2.0.0; python_version < '3.6'
|
||||
dnspython; python_version >= '3.6'
|
||||
dnspython
|
||||
|
||||
psutil>=1.1.1,<2.0.0
|
||||
|
@ -8,7 +8,6 @@
|
||||
# all of its own requirements and if it doesn't, fix it there.
|
||||
#
|
||||
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
|
||||
|
||||
requests>=2.18.4
|
||||
@ -19,26 +18,12 @@ stestr>=2.2.0
|
||||
# https://github.com/mtreinish/stestr/issues/145
|
||||
cliff<3.0.0
|
||||
|
||||
# Dependencies of stestr. Newer versions use keywords that didn't exist in
|
||||
# python 3.5 yet (e.g. "ModuleNotFoundError")
|
||||
importlib-metadata<3.0.0; python_version < '3.6'
|
||||
importlib-resources<3.0.0; python_version < '3.6'
|
||||
|
||||
# Some Zuul nodes sometimes pull newer versions of these dependencies which
|
||||
# dropped support for python 3.5:
|
||||
osprofiler<2.7.0;python_version<'3.6'
|
||||
stevedore<1.31.0;python_version<'3.6'
|
||||
debtcollector<1.22.0;python_version<'3.6'
|
||||
oslo.utils<=3.41.0;python_version<'3.6'
|
||||
|
||||
coverage>=4.5.2
|
||||
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
|
||||
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
||||
|
||||
# Needed for charm-glance:
|
||||
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8'
|
||||
tempest<30.0.0;python_version<'3.8' and python_version>='3.6'
|
||||
tempest<24.0.0;python_version<'3.6'
|
||||
git+https://opendev.org/openstack/tempest.git#egg=tempest
|
||||
|
||||
croniter # needed for charm-rabbitmq-server unit tests
|
||||
|
@ -1,7 +1,7 @@
|
||||
options:
|
||||
source: &source cloud:focal-yoga
|
||||
source: &source cloud:jammy-zed
|
||||
|
||||
series: focal
|
||||
series: jammy
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
@ -1,7 +1,7 @@
|
||||
options:
|
||||
source: &source cloud:focal-yoga
|
||||
source: &source cloud:jammy-zed
|
||||
|
||||
series: focal
|
||||
series: jammy
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
@ -1,7 +1,7 @@
|
||||
options:
|
||||
source: &source cloud:focal-xena
|
||||
source: &source cloud:jammy-zed
|
||||
|
||||
series: focal
|
||||
series: jammy
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
@ -1,7 +1,7 @@
|
||||
options:
|
||||
source: &source cloud:focal-xena
|
||||
source: &source distro
|
||||
|
||||
series: focal
|
||||
series: kinetic
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
@ -96,3 +96,4 @@ relations:
|
||||
|
||||
- - 'secondary-ceph-radosgw:mon'
|
||||
- 'secondary-ceph-mon:radosgw'
|
||||
|
@ -1,7 +1,7 @@
|
||||
options:
|
||||
source: &source cloud:focal-xena
|
||||
source: &source distro
|
||||
|
||||
series: focal
|
||||
series: kinetic
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
@ -1,7 +1,7 @@
|
||||
options:
|
||||
source: &source cloud:focal-yoga
|
||||
source: &source distro
|
||||
|
||||
series: focal
|
||||
series: kinetic
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
@ -1,22 +1,25 @@
|
||||
charm_name: ceph-radosgw
|
||||
|
||||
gate_bundles:
|
||||
- focal-xena-multisite
|
||||
- vault: focal-xena
|
||||
- vault: focal-xena-namespaced
|
||||
|
||||
smoke_bundles:
|
||||
- focal-xena-multisite
|
||||
- vault: focal-xena
|
||||
|
||||
dev_bundles:
|
||||
- focal-yoga-multisite
|
||||
- jammy-yoga-multisite
|
||||
- vault: focal-yoga
|
||||
- vault: focal-yoga-namespaced
|
||||
- vault: jammy-yoga
|
||||
- vault: jammy-yoga-namespaced
|
||||
|
||||
smoke_bundles:
|
||||
- jammy-yoga-multisite
|
||||
- vault: jammy-yoga
|
||||
|
||||
dev_bundles:
|
||||
- jammy-yoga-multisite
|
||||
- jammy-zed-multisite
|
||||
- kinetic-zed-multisite
|
||||
- vault: jammy-yoga
|
||||
- vault: jammy-yoga-namespaced
|
||||
- vault: jammy-zed
|
||||
- vault: jammy-zed-namespaced
|
||||
- vault: kinetic-zed
|
||||
- vault: kinetic-zed-namespaced
|
||||
|
||||
target_deploy_status:
|
||||
vault:
|
||||
workload-status: blocked
|
||||
@ -36,5 +39,5 @@ tests:
|
||||
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- jammy-yoga
|
||||
- jammy-yoga-namespaced
|
||||
- kinetic-zed
|
||||
- kinetic-zed-namespaced
|
||||
|
29
tox.ini
29
tox.ini
@ -48,34 +48,9 @@ basepython = python3
|
||||
deps = -r{toxinidir}/build-requirements.txt
|
||||
commands =
|
||||
charmcraft clean
|
||||
charmcraft -v build
|
||||
charmcraft -v pack
|
||||
{toxinidir}/rename.sh
|
||||
|
||||
[testenv:py35]
|
||||
basepython = python3.5
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py36]
|
||||
basepython = python3.6
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py37]
|
||||
basepython = python3.7
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py38]
|
||||
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:py310]
|
||||
basepython = python3.10
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
@ -89,7 +64,7 @@ deps = -r{toxinidir}/requirements.txt
|
||||
[testenv:pep8]
|
||||
basepython = python3
|
||||
deps = flake8==3.9.2
|
||||
charm-tools==2.8.3
|
||||
git+https://github.com/juju/charm-tools.git
|
||||
commands = flake8 {posargs} hooks unit_tests tests actions lib files
|
||||
charm-proof
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user