)]}'
{".zuul.yaml":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"f75c8b173bbd03f257e96a5291b4db82f9b3d4c8","unresolved":true,"context_lines":[{"line_number":729,"context_line":"             - ^releasenotes/.*$"},{"line_number":730,"context_line":"             - ^setup.cfg$"},{"line_number":731,"context_line":"             - ^tools/.*$"},{"line_number":732,"context_line":"             - ^tox.ini$"},{"line_number":733,"context_line":"        - tempest-integrated-compute-ubuntu-focal:"},{"line_number":734,"context_line":"            irrelevant-files: *policies-irrelevant-files"},{"line_number":735,"context_line":"        - tempest-integrated-compute-enforce-scope-new-defaults:"}],"source_content_type":"text/x-yaml","patch_set":2,"id":"b64276fe_0d0e6026","side":"PARENT","line":732,"updated":"2025-08-21 15:30:59.000000000","message":"since we use pinned tempest on unmaintained branches we don\u0027t have the necessary tempest patch [1] here. And since tempest is branchless, we have to simple use  \u0027tempest_exclude_regex\u0027 variable to skip the affected 2 test cases [2].\n\nI don\u0027t know top off my head, if we can use it here, or we can only add it to the job definition, but what we need is basically something like this:\n\n    # NOTE(\u003cname\u003e): since we use pinned tempest versions on old branches we cannot\n    # have tempest fix I72fdfe98c5c8b11d76bd2b212174d5617b081e25 here, hence we\n    # have to exclude the two affected test cases\n    vars:\n      tempest_exclude_regex: \u0027test_update_attached_volume_with_nonexistent_volume_in_body|test_multiattach_rw_volume_update_failure\u0027\n\n[1] I72fdfe98c5c8b11d76bd2b212174d5617b081e25\n[2] test_update_attached_volume_with_nonexistent_volume_in_body and test_multiattach_rw_volume_update_failure","commit_id":"0d055b451b9ee9c9dad01215eca4cbc4853451ec"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"f75c8b173bbd03f257e96a5291b4db82f9b3d4c8","unresolved":true,"context_lines":[{"line_number":731,"context_line":"             - ^tools/.*$"},{"line_number":732,"context_line":"             - ^tox.ini$"},{"line_number":733,"context_line":"        - tempest-integrated-compute-ubuntu-focal:"},{"line_number":734,"context_line":"            irrelevant-files: *policies-irrelevant-files"},{"line_number":735,"context_line":"        - tempest-integrated-compute-enforce-scope-new-defaults:"},{"line_number":736,"context_line":"            irrelevant-files: *policies-irrelevant-files"},{"line_number":737,"context_line":"        - grenade-skip-level:"}],"source_content_type":"text/x-yaml","patch_set":2,"id":"88353563_61a4e84c","side":"PARENT","line":734,"updated":"2025-08-21 15:30:59.000000000","message":"ditto for this job","commit_id":"0d055b451b9ee9c9dad01215eca4cbc4853451ec"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"f75c8b173bbd03f257e96a5291b4db82f9b3d4c8","unresolved":true,"context_lines":[{"line_number":732,"context_line":"             - ^tox.ini$"},{"line_number":733,"context_line":"        - tempest-integrated-compute-ubuntu-focal:"},{"line_number":734,"context_line":"            irrelevant-files: *policies-irrelevant-files"},{"line_number":735,"context_line":"        - tempest-integrated-compute-enforce-scope-new-defaults:"},{"line_number":736,"context_line":"            irrelevant-files: *policies-irrelevant-files"},{"line_number":737,"context_line":"        - grenade-skip-level:"},{"line_number":738,"context_line":"            irrelevant-files: *policies-irrelevant-files"}],"source_content_type":"text/x-yaml","patch_set":2,"id":"457b4952_7b49121a","side":"PARENT","line":735,"updated":"2025-08-21 15:30:59.000000000","message":"ditto","commit_id":"0d055b451b9ee9c9dad01215eca4cbc4853451ec"}],"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"196c2a63f739a3c5b13a7808826f39a0fb8d94a4","unresolved":true,"context_lines":[{"line_number":33,"context_line":"Prior to this change there was an explicit warning in nova API ref"},{"line_number":34,"context_line":"stating that humans should never call this API because it can lead"},{"line_number":35,"context_line":"to this situation. Now it considered a hard error due to the"},{"line_number":36,"context_line":"security implications."},{"line_number":37,"context_line":""},{"line_number":38,"context_line":"Closes-Bug: #2112187"},{"line_number":39,"context_line":"Depends-on: https://review.opendev.org/c/openstack/tempest/+/957753"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"67e9d175_2616a566","line":36,"updated":"2025-08-21 14:53:56.000000000","message":"nit: nova team requires stable backports to include file conflicts that git cherry pick generates to make reviewers life easier (and we also appreciate if the cause of the conflict is mentioned, but that is less important):\n\n    Conflicts:\n      nova/tests/fixtures/cinder.py\n    \n    NOTE(\u003cname\u003e): conflict is due to Iaf4a9182b79ec4d1c2d3436b3dc9a6c760cd48f9\n    refactoring patch, which was introduced in 2024.1 Caracal and we don\u0027t want\n    to backport.","commit_id":"93bdf97a95f637d0c19640b44d18d209061a4275"},{"author":{"_account_id":6476,"name":"Thomas Goirand","email":"thomas@goirand.fr","username":"thomas-goirand"},"change_message_id":"fb42825ada6944ca15be6c71d0198ebc67d1d5ea","unresolved":false,"context_lines":[{"line_number":33,"context_line":"Prior to this change there was an explicit warning in nova API ref"},{"line_number":34,"context_line":"stating that humans should never call this API because it can lead"},{"line_number":35,"context_line":"to this situation. Now it considered a hard error due to the"},{"line_number":36,"context_line":"security implications."},{"line_number":37,"context_line":""},{"line_number":38,"context_line":"Closes-Bug: #2112187"},{"line_number":39,"context_line":"Depends-on: https://review.opendev.org/c/openstack/tempest/+/957753"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"0c5322d9_332221d4","line":36,"in_reply_to":"67e9d175_2616a566","updated":"2025-08-21 14:58:49.000000000","message":"Done","commit_id":"93bdf97a95f637d0c19640b44d18d209061a4275"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"196c2a63f739a3c5b13a7808826f39a0fb8d94a4","unresolved":true,"context_lines":[{"line_number":38,"context_line":"Closes-Bug: #2112187"},{"line_number":39,"context_line":"Depends-on: https://review.opendev.org/c/openstack/tempest/+/957753"},{"line_number":40,"context_line":"Change-Id: I439338bd2f27ccd65a436d18c8cbc9c3127ee612"},{"line_number":41,"context_line":"Signed-off-by: Thomas Goirand \u003czigo@debian.org\u003e"},{"line_number":42,"context_line":"(cherry picked from commit 93c0f9bc749cea39f9cd1bd9d3e5a5585f1f6cac)"},{"line_number":43,"context_line":"(cherry picked from commit 76fe0294ffa8fc2444727ba8da584724d2493d56)"},{"line_number":44,"context_line":"(cherry picked from commit 6fcc9e2dd97abfc78fda822484d8d3592d719bea)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"524ba06a_bc931bc0","line":41,"updated":"2025-08-21 14:53:56.000000000","message":"nit: in my opinion it\u0027s better to keep the original \u0027Signed-off-by\u0027 line, and extend it with your \u0027Signed-off-by\u0027 line.","commit_id":"93bdf97a95f637d0c19640b44d18d209061a4275"},{"author":{"_account_id":6476,"name":"Thomas Goirand","email":"thomas@goirand.fr","username":"thomas-goirand"},"change_message_id":"fb42825ada6944ca15be6c71d0198ebc67d1d5ea","unresolved":false,"context_lines":[{"line_number":38,"context_line":"Closes-Bug: #2112187"},{"line_number":39,"context_line":"Depends-on: https://review.opendev.org/c/openstack/tempest/+/957753"},{"line_number":40,"context_line":"Change-Id: I439338bd2f27ccd65a436d18c8cbc9c3127ee612"},{"line_number":41,"context_line":"Signed-off-by: Thomas Goirand \u003czigo@debian.org\u003e"},{"line_number":42,"context_line":"(cherry picked from commit 93c0f9bc749cea39f9cd1bd9d3e5a5585f1f6cac)"},{"line_number":43,"context_line":"(cherry picked from commit 76fe0294ffa8fc2444727ba8da584724d2493d56)"},{"line_number":44,"context_line":"(cherry picked from commit 6fcc9e2dd97abfc78fda822484d8d3592d719bea)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"6d07d219_35927d67","line":41,"in_reply_to":"524ba06a_bc931bc0","updated":"2025-08-21 14:58:49.000000000","message":"Done","commit_id":"93bdf97a95f637d0c19640b44d18d209061a4275"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"196c2a63f739a3c5b13a7808826f39a0fb8d94a4","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"a2694775_f965d2ad","updated":"2025-08-21 14:53:56.000000000","message":"Thanks Thomas for working on this and proposing it upstream! It is appreciated if such important bug fixes are cherry picked to older branches, so that others can benefit from it and even work together on making and testing these patches!\n\nIn general the patch looks good to me and the file conflict is resolved correctly. There are only a couple of nits, but otherwise as i said, its fine and I\u0027ll +2 if the commit message is updated and tests are passing. Thanks again!","commit_id":"93bdf97a95f637d0c19640b44d18d209061a4275"}],"nova/tests/fixtures/cinder.py":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"196c2a63f739a3c5b13a7808826f39a0fb8d94a4","unresolved":false,"context_lines":[{"line_number":145,"context_line":"                        \u0027attachment_id\u0027: attachment[\u0027id\u0027],"},{"line_number":146,"context_line":"                        \u0027mountpoint\u0027: \u0027/dev/vdb\u0027,"},{"line_number":147,"context_line":"                    }"},{"line_number":148,"context_line":""},{"line_number":149,"context_line":"                migration_status \u003d ("},{"line_number":150,"context_line":"                    None if volume_id not in ("},{"line_number":151,"context_line":"                        self.SWAP_OLD_VOL, self.SWAP_ERR_OLD_VOL)"}],"source_content_type":"text/x-python","patch_set":2,"id":"3aa2880d_26ed6f6d","line":148,"updated":"2025-08-21 14:53:56.000000000","message":"nit: no need for extra line compared to the original patch o:)","commit_id":"93bdf97a95f637d0c19640b44d18d209061a4275"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"196c2a63f739a3c5b13a7808826f39a0fb8d94a4","unresolved":false,"context_lines":[{"line_number":154,"context_line":"                    \u0027status\u0027: \u0027in-use\u0027,"},{"line_number":155,"context_line":"                    \u0027attach_status\u0027: \u0027attached\u0027,"},{"line_number":156,"context_line":"                    \u0027attachments\u0027: attachments,"},{"line_number":157,"context_line":"                    \u0027migration_status\u0027: migration_status"},{"line_number":158,"context_line":"                })"},{"line_number":159,"context_line":"            # Otherwise mark the volume as avilable and detached"},{"line_number":160,"context_line":"            else:"}],"source_content_type":"text/x-python","patch_set":2,"id":"723ae430_d6072b60","line":157,"updated":"2025-08-21 14:53:56.000000000","message":"note for reviewers: this part was in conflict with Iaf4a9182b79ec4d1c2d3436b3dc9a6c760cd48f9.","commit_id":"93bdf97a95f637d0c19640b44d18d209061a4275"}]}
