Synchronise 2023.1 with upstream #91
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
When we call nova.privsep.fs.mount(), we are catching ProcessExecutionError() (an instance of a class) and that is not allowed in python3. This changes the except statement to catch ProcessExecutionError (class) instead. Closes-Bug: #1984736 Change-Id: I24a269f9809063f864a4f0443d6724dfa8703d9d (cherry picked from commit f996674)
Kernels don't accept to access the governor strategy on an offline core, so we need to only validate strategies for online cores. Change-Id: I14c9b268d0b97221216bd1a9ab9e48b48d6dcc2c Closes-Bug: #2073528 (cherry picked from commit 757c333) (cherry picked from commit cf72133) (cherry picked from commit 52f6968)
Note that this includes seemingly-unrelated test changes because we were actually skipping the snapshot_running test for libvirt, which has been a bug for years. In that test case, when we went to look for image_meta.disk_format, that attribute was not set on the o.vo object, which raised a NotImplementedError. That error is also checked by the test to skip the test for drivers that do not support snapshot, which meant that for libvirt, we haven't been running that case beyond the point at which we create snapshot metadata and trip that exception. Thus, once removing that, there are other mocks not in place that are required for the test to actually run. So, this adds mocks for qemu_img_info() calls that actually try to read the file on disk, as well as the privsep chown() that attempts to run after. Change-Id: Ie731045629f0899840a4680d21793a16ade9b98e (cherry picked from commit d5a631b) (cherry picked from commit 8c5929f) (cherry picked from commit d2d3b2c)
…em_limit_stream_optimized These tests depend on qemu-img being installed and in the path, if it is not installed, skip them. Change-Id: I896f16c512f24bcdd898ab002af4e5e068f66b64 Closes-bug: #2073862 Signed-off-by: Julien Le Jeune <julien.le-jeune@ovhcloud.com> (cherry picked from commit a3202f7) (cherry picked from commit c782f0e) (cherry picked from commit 828a5d0)
Because in the process of judging whether the image id is Duplicate,there is only deduplication without sorting, so no duplicate image error is judged as duplicate and an error "Duplicate images in request" is reported. Now it is changed to sort after deduplication and then compare. Two unit test cases were added to verify the fix Related-Bug: #2034702 Change-Id: I300a3e29ba56584f4c99d534a6cf8ee7dc0ed4b7 (cherry picked from commit aa500fb) (cherry picked from commit f9abe04)
This is a fix for the test whether a patch is bot generated or not, as that did not worked as intended. The problem is that the script is checking the email address of the parent patch (HEAD~), which probably should be right in case the patch would be a MERGE patch. But this is wrong in case the patch is not a MERGE patch. This fix uses the very same pattern as it is using for the commit message parsing: the $commit_hash variable, which is the parent's commit hash if the patch is a MERGE patch, and an empty string in the other case (causing to call 'git show' on HEAD). Change-Id: I0abc72180edf34a6dd0624a40fb8682397805eca (cherry picked from commit b8f3975) (cherry picked from commit 92b781f) (cherry picked from commit 7a914d6)
When the script was created there were only stable/* branches, but now there are unmaintained/* branches as well, where the validator fails when looking for hashes only on stable/* branches even if the given hash is already on unmtaintained/* branch. This patch matches now both stable/* and unmaintained/* branches. Change-Id: I08fcc63ab0fbe5af1be70d5fde5af98bf006101c (cherry picked from commit e2697de) (cherry picked from commit 602e683) (cherry picked from commit 56e73cc)
In general the card_serial_number will not be present on sriov VFs/PFs, it is only supported on very new cards. Also, all 3 need not to be always required for vf_profile. Related-Bug: #2008238 Change-Id: I00b126635612ace51b5e3138afcb064f001f1901 (cherry picked from commit a1a07e0) (cherry picked from commit 9146e90) (cherry picked from commit 114eabb)
github-actions
bot
added
automated
markgoddard
approved these changes
Aug 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains a snapshot of 2023.1 from upstream stable/2023.1.