Always test flavor instance plugin

With 2024.1 no longer being tested, this plugin is now available
in all stable releases.

Change-Id: Id9f6099f4050f0bcc6d0373a6f50484809a51c98
Signed-off-by: Matt Crees <mattc@stackhpc.com>

.zuul.yaml

@@ -85,33 +85,15 @@
     parent: blazar-tempest-plugin-base
     nodeset: openstack-single-node-noble
     override-checkout: stable/2025.2
-    vars:
-      devstack_local_conf:
-        test-config:
-          $TEMPEST_CONFIG:
-            resource_reservation:
-              flavor_instance_plugin: true
 
 - job:
     name: blazar-tempest-plugin-2025-1
     parent: blazar-tempest-plugin-base
     nodeset: openstack-single-node-noble
     override-checkout: stable/2025.1
-    vars:
-      devstack_local_conf:
-        test-config:
-          $TEMPEST_CONFIG:
-            resource_reservation:
-              flavor_instance_plugin: true
 
 - job:
     name: blazar-tempest-plugin-2024-2
     parent: blazar-tempest-plugin-base
     nodeset: openstack-single-node-jammy
     override-checkout: stable/2024.2
-    vars:
-      devstack_local_conf:
-        test-config:
-          $TEMPEST_CONFIG:
-            resource_reservation:
-              flavor_instance_plugin: true

blazar_tempest_plugin/config.py

@@ -36,9 +36,6 @@ ResourceReservationGroup = [
                         'publicURL', 'adminURL', 'internalURL'],
                help="The endpoint type to use for the resource_reservation "
                     "service."),
-    cfg.BoolOpt('flavor_instance_plugin',
-                default=False,
-                help="Whether to test flavor-based instance reservation"),
     cfg.IntOpt('lease_interval',
                default=10,
                help="Time in seconds between lease status checks."),

blazar_tempest_plugin/tests/scenario/test_flavor_reservation.py

@@ -15,8 +15,6 @@
 
 import datetime
 
-import testtools
-
 from oslo_log import log as logging
 from tempest.common import waiters
 from tempest import config
@@ -76,9 +74,6 @@ class TestFlavorReservationScenario(rrs.ResourceReservationScenarioTest):
         return body
 
     @decorators.attr(type='smoke')
-    @testtools.skipUnless(
-        CONF.resource_reservation.flavor_instance_plugin,
-        'Flavor-based instance reservation tests are disabled.')
     def test_flavor_instance_reservation(self):
         body = self.get_lease_body('flavor-instance-scenario')
         lease = self.reservation_client.create_lease(body)['lease']