[23.11] Adapt tests for upstream changes #765
Merged
Conversation
This file contains 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
As a side-effect of the introduction of the upstream virtualisation.interfaces option for explicitly specifying the names of interfaces in guest VMs, interfaces configured using the existing virtualisation.vlans option now include udev rules which force the name of the interface to ethX (for some vlan X). Due to ordering these rules override the rules set in the platform, which means that network interfaces are not named as expected within test VMs. As there is no straightforward way to disable these extra udev rules, refactor the tests to use the new virtualisation.interfaces option to specify the required network interfaces with their desired names.
Remove the port number from the database URL, otherwise k3s's postgresql driver will attempt to connect using TCP over the loopback.
|
Some tests are still broken. Will be fixed later. |
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.
Upstream has changed the handling of guest network interfaces in the test library, which now unconditionally creates udev rules to force network interfaces to have specific names. Unfortunately these rules clash with and take precedence over our own rules in the platform, which means that a variety of tests were failing because network interfaces did not have the expected names.
This PR refactors the existing tests to use the new
virtualisation.interfacesoption, which allows us to explicitly specify the desired name for each interface.@flyingcircusio/release-managers
Security implications