Merge "Fix unit tests broken by olso.utils"

ironic/tests/unit/objects/test_objects.py

@@ -980,6 +980,7 @@ class TestObjectSerializer(test_base.TestCase):
 class TestRegistry(test_base.TestCase):
     @mock.patch('ironic.objects.base.objects', autospec=True)
     def test_hook_chooses_newer_properly(self, mock_objects):
+        del mock_objects.MyObj
         reg = base.IronicObjectRegistry()
         reg.registration_hook(MyObj, 0)
 
@@ -996,6 +997,7 @@ class TestRegistry(test_base.TestCase):
 
     @mock.patch('ironic.objects.base.objects', autospec=True)
     def test_hook_keeps_newer_properly(self, mock_objects):
+        del mock_objects.MyObj
         reg = base.IronicObjectRegistry()
         reg.registration_hook(MyObj, 0)
 

zuul.d/ironic-jobs.yaml

@@ -742,6 +742,8 @@
       tox_envlist: py3
     # The job only tests the latest and shouldn't be run on the stable branches
     branches: ^master$
+    # TODO(tkajinam): Make this voting once oslo.utils is bumped to 6.3.0
+    voting: false
     required-projects:
       - name: github.com/sqlalchemy/sqlalchemy
         override-checkout: main