Synchronise 2025.1 with upstream#284
Merged
Merged
Conversation
github-actions
Bot
added
automated
There is no need to wait for processes like e.g. neutron-ovs-agent to
stop gracefully in the fixture cleanup phase. We can simply kill such
processes and don't waste time waiting for them to be stopped.
Stable-only: we don't need this patch in branches newer than 2025.1
as we already stopped running fullstack CI job there
Closes-bug: #2143707
Change-Id: I8519d31e3edb916643ef05453f95484b40e6c156
Signed-off-by: Slawek Kaplonski <skaplons@redhat.com>
The _is_vlan_project_network method in DNSExtensionDriverML2 was only checking the static network_vlan_ranges configuration from ml2_conf.ini, ignoring the dynamic ranges provided by the network-segment-range service plugin. This caused a KeyError when creating subnets or VMs on VLAN networks with segment ranges managed via the API. This fix updates the method to use VlanTypeDriver.get_network_segment_ranges(), which properly handles both static configuration and DB-based dynamic ranges when the network-segment-range plugin is enabled. Conflicts: neutron/plugins/ml2/extensions/dns_integration.py neutron/tests/unit/plugins/ml2/extensions/test_dns_integration.py Depends-On: https://review.opendev.org/c/openstack/tempest/+/990436 Closes-Bug: #2140291 Signed-off-by: Kyuyeong Lee <kyu0.lee@samsung.com> Change-Id: I8f3a2b1c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a (cherry picked from commit cd8f88e) (cherry picked from commit 134148d)
Verify the port-forwarding floating IP id matches the child floating IP id so we satisfy the policy requirements for GET and PUT operations. Closes-bug: #2150121 Change-Id: Ie68e57da6222965e79d015a5568190d8bc29b9e8 Signed-off-by: Brian Haley <haleyb.dev@gmail.com> Assisted-by: Claude Sonnet 4.6
Alex-Welsh
force-pushed
the
upstream/2025.1-2026-06-01
branch
from
6548959 to
53a6131
Compare
mnasiadka
approved these changes
Jun 2, 2026
Member
mnasiadka
left a comment
mnasiadka
left a comment
There was a problem hiding this comment.
Only jammy jobs are failing due to requirements dropping py310 in master (and tempest is using master u-c for stable/2025.1 right now - fix upstream in progress)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 2025.1 from upstream stable/2025.1.