Add Groovy to the test gate
Change-Id: I70bfbb6782a546ee5c2410a6fb202d1d573d4826
This commit is contained in:
parent
4246c2fcef
commit
9e33790a76
|
@ -230,7 +230,7 @@ SWIFT_CODENAMES = OrderedDict([
|
||||||
('ussuri',
|
('ussuri',
|
||||||
['2.24.0', '2.25.0']),
|
['2.24.0', '2.25.0']),
|
||||||
('victoria',
|
('victoria',
|
||||||
['2.25.0']),
|
['2.25.0', '2.26.0']),
|
||||||
])
|
])
|
||||||
|
|
||||||
# >= Liberty version->codename mapping
|
# >= Liberty version->codename mapping
|
||||||
|
|
|
@ -41,6 +41,7 @@ from subprocess import (
|
||||||
)
|
)
|
||||||
from charmhelpers import deprecate
|
from charmhelpers import deprecate
|
||||||
from charmhelpers.core.hookenv import (
|
from charmhelpers.core.hookenv import (
|
||||||
|
application_name,
|
||||||
config,
|
config,
|
||||||
service_name,
|
service_name,
|
||||||
local_unit,
|
local_unit,
|
||||||
|
@ -162,6 +163,17 @@ def get_osd_settings(relation_name):
|
||||||
return _order_dict_by_key(osd_settings)
|
return _order_dict_by_key(osd_settings)
|
||||||
|
|
||||||
|
|
||||||
|
def send_application_name(relid=None):
|
||||||
|
"""Send the application name down the relation.
|
||||||
|
|
||||||
|
:param relid: Relation id to set application name in.
|
||||||
|
:type relid: str
|
||||||
|
"""
|
||||||
|
relation_set(
|
||||||
|
relation_id=relid,
|
||||||
|
relation_settings={'application-name': application_name()})
|
||||||
|
|
||||||
|
|
||||||
def send_osd_settings():
|
def send_osd_settings():
|
||||||
"""Pass on requested OSD settings to osd units."""
|
"""Pass on requested OSD settings to osd units."""
|
||||||
try:
|
try:
|
||||||
|
@ -1074,7 +1086,10 @@ def create_erasure_profile(service, profile_name,
|
||||||
erasure_plugin_technique=None):
|
erasure_plugin_technique=None):
|
||||||
"""Create a new erasure code profile if one does not already exist for it.
|
"""Create a new erasure code profile if one does not already exist for it.
|
||||||
|
|
||||||
Updates the profile if it exists. Please refer to [0] for more details.
|
Profiles are considered immutable so will not be updated if the named
|
||||||
|
profile already exists.
|
||||||
|
|
||||||
|
Please refer to [0] for more details.
|
||||||
|
|
||||||
0: http://docs.ceph.com/docs/master/rados/operations/erasure-code-profile/
|
0: http://docs.ceph.com/docs/master/rados/operations/erasure-code-profile/
|
||||||
|
|
||||||
|
@ -1110,6 +1125,11 @@ def create_erasure_profile(service, profile_name,
|
||||||
:type erasure_plugin_technique: str
|
:type erasure_plugin_technique: str
|
||||||
:return: None. Can raise CalledProcessError, ValueError or AssertionError
|
:return: None. Can raise CalledProcessError, ValueError or AssertionError
|
||||||
"""
|
"""
|
||||||
|
if erasure_profile_exists(service, profile_name):
|
||||||
|
log('EC profile {} exists, skipping update'.format(profile_name),
|
||||||
|
level=WARNING)
|
||||||
|
return
|
||||||
|
|
||||||
plugin_techniques = {
|
plugin_techniques = {
|
||||||
'jerasure': [
|
'jerasure': [
|
||||||
'reed_sol_van',
|
'reed_sol_van',
|
||||||
|
@ -1209,9 +1229,6 @@ def create_erasure_profile(service, profile_name,
|
||||||
if scalar_mds:
|
if scalar_mds:
|
||||||
cmd.append('scalar-mds={}'.format(scalar_mds))
|
cmd.append('scalar-mds={}'.format(scalar_mds))
|
||||||
|
|
||||||
if erasure_profile_exists(service, profile_name):
|
|
||||||
cmd.append('--force')
|
|
||||||
|
|
||||||
check_call(cmd)
|
check_call(cmd)
|
||||||
|
|
||||||
|
|
||||||
|
@ -2198,6 +2215,7 @@ def send_request_if_needed(request, relation='ceph'):
|
||||||
for rid in relation_ids(relation):
|
for rid in relation_ids(relation):
|
||||||
log('Sending request {}'.format(request.request_id), level=DEBUG)
|
log('Sending request {}'.format(request.request_id), level=DEBUG)
|
||||||
relation_set(relation_id=rid, broker_req=request.request)
|
relation_set(relation_id=rid, broker_req=request.request)
|
||||||
|
relation_set(relation_id=rid, relation_settings={'unit-name': local_unit()})
|
||||||
|
|
||||||
|
|
||||||
def has_broker_rsp(rid=None, unit=None):
|
def has_broker_rsp(rid=None, unit=None):
|
||||||
|
|
|
@ -14,10 +14,9 @@ gate_bundles:
|
||||||
- bionic-ussuri
|
- bionic-ussuri
|
||||||
- focal-ussuri
|
- focal-ussuri
|
||||||
- focal-victoria
|
- focal-victoria
|
||||||
|
- groovy-victoria
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bionic-stein
|
- bionic-stein
|
||||||
dev_bundles:
|
|
||||||
- groovy-victoria
|
|
||||||
tests:
|
tests:
|
||||||
- zaza.openstack.charm_tests.ceilometer.tests.CeilometerTest
|
- zaza.openstack.charm_tests.ceilometer.tests.CeilometerTest
|
||||||
target_deploy_status:
|
target_deploy_status:
|
||||||
|
|
Loading…
Reference in New Issue