watcher-tempest-plugin 2.5.0__tar.gz → 3.0.0__tar.gz

{watcher-tempest-plugin-2.5.0 → watcher-tempest-plugin-3.0.0}/.zuul.yaml

@@ -1,4 +1,5 @@
 - project:
+    queue: watcher
     templates:
       - check-requirements
       - tempest-plugin-jobs
@@ -8,14 +9,27 @@
         - watcher-tempest-functional
         - watcher-tempest-actuator
         - watcher-tempest-strategies
+        - watcher-tempest-functional-2023-1
+        - watcher-tempest-functional-zed
         - watcher-tempest-functional-yoga
         - watcher-tempest-functional-xena
         - watcher-tempest-functional-wallaby
     gate:
-      queue: watcher
       jobs:
         - watcher-tempest-functional
 
+- job:
+    name: watcher-tempest-functional-2023-1
+    parent: watcher-tempest-functional
+    nodeset: openstack-single-node-jammy
+    override-checkout: stable/2023.1
+
+- job:
+    name: watcher-tempest-functional-zed
+    parent: watcher-tempest-functional
+    nodeset: openstack-single-node-focal
+    override-checkout: stable/zed
+
 - job:
     name: watcher-tempest-functional-yoga
     parent: watcher-tempest-functional

{watcher-tempest-plugin-2.5.0 → watcher-tempest-plugin-3.0.0}/ChangeLog

@@ -1,6 +1,18 @@
 CHANGES
 =======
 
+3.0.0
+-----
+
+* fix hacking error
+* Remove Glance v1 APIs tests code
+* Add stable/2023.1 jobs on master gate
+
+2.6.0
+-----
+
+* Add stable/zed jobs on master gate
+
 2.5.0
 -----
 

{watcher-tempest-plugin-2.5.0 → watcher-tempest-plugin-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: watcher-tempest-plugin
-Version: 2.5.0
+Version: 3.0.0
 Summary: Tempest plugin watcher-tempest-plugin
 Home-page: https://docs.openstack.org/watcher/latest/
 Author: OpenStack

{watcher-tempest-plugin-2.5.0 → watcher-tempest-plugin-3.0.0}/test-requirements.txt

@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=3.2.,<3.3 # Apache-2.0
+hacking>=3.2
 stestr>=1.0.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0

{watcher-tempest-plugin-2.5.0 → watcher-tempest-plugin-3.0.0}/watcher_tempest_plugin/tests/scenario/manager.py

@@ -15,12 +15,10 @@
 #    under the License.
 
 from tempest.common import compute
-from tempest.common import image as common_image
 from tempest.common import waiters
 from tempest import config
 from tempest.lib.common.utils import data_utils
 from tempest.lib.common.utils import test_utils
-from tempest.lib import exceptions as lib_exc
 import tempest.test
 
 CONF = config.CONF
@@ -44,16 +42,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
         cls.flavors_client = cls.os_primary.flavors_client
         cls.compute_floating_ips_client = (
             cls.os_primary.compute_floating_ips_client)
-        if CONF.service_available.glance:
-            # Check if glance v1 is available to determine which client to use.
-            if CONF.image_feature_enabled.api_v1:
-                cls.image_client = cls.os_primary.image_client
-            elif CONF.image_feature_enabled.api_v2:
-                cls.image_client = cls.os_primary.image_client_v2
-            else:
-                raise lib_exc.InvalidConfiguration(
-                    'Either api_v1 or api_v2 must be True in '
-                    '[image-feature-enabled].')
+        cls.image_client = cls.os_primary.image_client_v2
         # Compute image client
         cls.compute_images_client = cls.os_primary.compute_images_client
         cls.keypairs_client = cls.os_primary.keypairs_client
@@ -211,11 +200,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
             clients = self.os_primary
 
         if imageRef:
-            if CONF.image_feature_enabled.api_v1:
-                resp = self.image_client.check_image(imageRef)
-                image = common_image.get_image_meta_from_headers(resp)
-            else:
-                image = self.image_client.show_image(imageRef)
+            image = self.image_client.show_image(imageRef)
             min_disk = image.get('min_disk')
             size = max(size, min_disk)
 

{watcher-tempest-plugin-2.5.0 → watcher-tempest-plugin-3.0.0}/watcher_tempest_plugin/tests/scenario/test_execute_vm_workload_consolidation.py

@@ -55,9 +55,9 @@ class TestExecuteVmWorkloadBalanceStrategy(base.BaseInfraOptimScenarioTest):
                 "skipping multinode tests.")
 
     def test_execute_vm_workload_consolidation_action_plan(self):
-        """Execute an action plan based on the vm_workload_consolidation strategy
+        """Execute an action plan of vm_workload_consolidation strategy
 
-        - create an audit template with the vm_workload_consolidation strategy
+        - create an audit template with vm_workload_consolidation strategy
         - run the audit to create an action plan
         - get the action plan
         - run the action plan

{watcher-tempest-plugin-2.5.0 → watcher-tempest-plugin-3.0.0}/watcher_tempest_plugin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: watcher-tempest-plugin
-Version: 2.5.0
+Version: 3.0.0
 Summary: Tempest plugin watcher-tempest-plugin
 Home-page: https://docs.openstack.org/watcher/latest/
 Author: OpenStack

watcher-tempest-plugin-3.0.0/watcher_tempest_plugin.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "92ca984", "is_release": true}

watcher-tempest-plugin-2.5.0/watcher_tempest_plugin.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "4dfcd27", "is_release": true}