Browse Source

Merge "Fix barbican service_available check"

tags/1.0.0
Zuul 3 months ago
parent
commit
1f0f4ef028

+ 0
- 13
octavia_tempest_plugin/config.py View File

@@ -31,19 +31,6 @@ ServiceAvailableGroup = [
31 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.
37
-try:
38
-    if cfg.CONF.service_available.barbican is not None:
39
-        LOG.info('Barbican service_available state: {}'.format(
40
-            cfg.CONF.service_available.barbican))
41
-except 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
-
47 34
 octavia_group = cfg.OptGroup(name='load_balancer',
48 35
                              title='load-balancer service options')
49 36
 

+ 1
- 1
octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py View File

@@ -50,7 +50,7 @@ class TLSWithBarbicanTest(test_base.LoadBalancerBaseTestWithCompute):
50 50
         if not CONF.validation.run_validation:
51 51
             raise cls.skipException('Traffic tests will not work without '
52 52
                                     'run_validation enabled.')
53
-        if not CONF.service_available.barbican:
53
+        if not getattr(CONF.service_available, 'barbican', False):
54 54
             raise cls.skipException('TLS with Barbican tests require the '
55 55
                                     'barbican service.')
56 56
 

+ 3
- 0
zuul.d/jobs.yaml View File

@@ -370,12 +370,15 @@
370 370
       - openstack/barbican
371 371
       - openstack/diskimage-builder
372 372
       - openstack/python-barbicanclient
373
+      - openstack/barbican-tempest-plugin
373 374
     vars:
374 375
       tempest_test_regex: ^octavia_tempest_plugin.tests.barbican_scenario.v2
375 376
       devstack_services:
376 377
         barbican: true
377 378
       devstack_plugins:
378 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 383
 # Temporary transitional aliases for gates used in other repos
381 384
 # Remove once octavia has transitioned job names

Loading…
Cancel
Save