summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-03-07 18:09:09 +0000
committerGerrit Code Review <review@openstack.org>2019-03-07 18:09:09 +0000
commit1f0f4ef028cdd629575aed7082eec558054ee89a (patch)
tree4518ca28279bf2145e94564cb182a2c88e41cfe7
parent8bf958eff65b86ddfe9dbc27f666ff6a2a4c30ad (diff)
parenta1c25b3b64e44087b331a6be0e8d48817cc4045f (diff)
Merge "Fix barbican service_available check"
-rw-r--r--octavia_tempest_plugin/config.py13
-rw-r--r--octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py2
-rw-r--r--zuul.d/jobs.yaml3
3 files changed, 4 insertions, 14 deletions
diff --git a/octavia_tempest_plugin/config.py b/octavia_tempest_plugin/config.py
index 91aa2c4..701eb8e 100644
--- a/octavia_tempest_plugin/config.py
+++ b/octavia_tempest_plugin/config.py
@@ -31,19 +31,6 @@ ServiceAvailableGroup = [
31 "to be available."), 31 "to be available."),
32] 32]
33 33
34# Pull in the service_available for barbican if it is not defined.
35# If the barbican tempest plugin isn't loaded, this won't load from
36# tempest.conf.
37try:
38 if cfg.CONF.service_available.barbican is not None:
39 LOG.info('Barbican service_available state: {}'.format(
40 cfg.CONF.service_available.barbican))
41except cfg.NoSuchOptError:
42 ServiceAvailableGroup.append(
43 cfg.BoolOpt('barbican', default=False,
44 help="Whether or not the barbican service is expected to "
45 "be available."))
46
47octavia_group = cfg.OptGroup(name='load_balancer', 34octavia_group = cfg.OptGroup(name='load_balancer',
48 title='load-balancer service options') 35 title='load-balancer service options')
49 36
diff --git a/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py b/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py
index 86dac04..27663b2 100644
--- a/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py
+++ b/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py
@@ -50,7 +50,7 @@ class TLSWithBarbicanTest(test_base.LoadBalancerBaseTestWithCompute):
50 if not CONF.validation.run_validation: 50 if not CONF.validation.run_validation:
51 raise cls.skipException('Traffic tests will not work without ' 51 raise cls.skipException('Traffic tests will not work without '
52 'run_validation enabled.') 52 'run_validation enabled.')
53 if not CONF.service_available.barbican: 53 if not getattr(CONF.service_available, 'barbican', False):
54 raise cls.skipException('TLS with Barbican tests require the ' 54 raise cls.skipException('TLS with Barbican tests require the '
55 'barbican service.') 55 'barbican service.')
56 56
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index f8bcf32..8c8ac73 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -370,12 +370,15 @@
370 - openstack/barbican 370 - openstack/barbican
371 - openstack/diskimage-builder 371 - openstack/diskimage-builder
372 - openstack/python-barbicanclient 372 - openstack/python-barbicanclient
373 - openstack/barbican-tempest-plugin
373 vars: 374 vars:
374 tempest_test_regex: ^octavia_tempest_plugin.tests.barbican_scenario.v2 375 tempest_test_regex: ^octavia_tempest_plugin.tests.barbican_scenario.v2
375 devstack_services: 376 devstack_services:
376 barbican: true 377 barbican: true
377 devstack_plugins: 378 devstack_plugins:
378 barbican: https://git.openstack.org/openstack/barbican.git 379 barbican: https://git.openstack.org/openstack/barbican.git
380 devstack_localrc:
381 TEMPEST_PLUGINS: '"/opt/stack/octavia-tempest-plugin /opt/stack/barbican-tempest-plugin"'
379 382
380# Temporary transitional aliases for gates used in other repos 383# Temporary transitional aliases for gates used in other repos
381# Remove once octavia has transitioned job names 384# Remove once octavia has transitioned job names