Merge "Update the clear job id's constant" into stable/train

ironic/drivers/modules/drac/management.py

@@ -79,7 +79,7 @@ _DRAC_BOOT_MODES = ['Bios', 'Uefi']
 _NON_PERSISTENT_BOOT_MODE = 'OneTime'
 
 # Clear job id's constant
-_CLEAR_JOB_IDS = 'JID_CLEARALL_FORCE'
+_CLEAR_JOB_IDS = 'JID_CLEARALL'
 
 # Clean steps constant
 _CLEAR_JOBS_CLEAN_STEPS = ['clear_job_queue', 'known_good_state']

ironic/tests/unit/drivers/modules/drac/test_management.py

@@ -806,7 +806,7 @@ class DracManagementTestCase(test_utils.BaseDracTest):
             mock_client.reset_idrac.assert_called_once_with(
                 force=True, wait=True)
             mock_client.delete_jobs.assert_called_once_with(
-                job_ids=['JID_CLEARALL_FORCE'])
+                job_ids=['JID_CLEARALL'])
 
             self.assertIsNone(return_value)
 
@@ -818,6 +818,6 @@ class DracManagementTestCase(test_utils.BaseDracTest):
                                   shared=False) as task:
             return_value = task.driver.management.clear_job_queue(task)
             mock_client.delete_jobs.assert_called_once_with(
-                job_ids=['JID_CLEARALL_FORCE'])
+                job_ids=['JID_CLEARALL'])
 
             self.assertIsNone(return_value)

releasenotes/notes/update-clear-job-id-constant-fix-c69cf96c55364bb3.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes an issue of powering off with the ``idrac-wsman`` management
+    interface while the execution of a clear job queue cleaning step is
+    proceeding.
+    Prior to this fix, the clean step would fail when powering off a node.