Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use bridge interface IP from tart #7429

Conversation

Serock3
Copy link
Contributor

@Serock3 Serock3 commented Jan 8, 2025

The IP of the bridge interface was incorrectly assumed to be constant, but has at some point changed. This broke the algorithm or finding the bridge interface.

Replace the algorithm with one based on the guest IP, which is given by tart. As the bridge IP is no longer constant, we also expose it through the TEST_CONFIG.

Test run: https://github.com/mullvad/mullvadvpn-app/actions/runs/12673264547


This change is Reviewable

@Serock3 Serock3 added the Daemon Issues related to mullvad-daemon label Jan 8, 2025
@Serock3 Serock3 requested a review from dlon January 8, 2025 10:59
@Serock3 Serock3 self-assigned this Jan 8, 2025
Copy link

linear bot commented Jan 8, 2025

The IP of the bridge interface was incorrectly
assumed to be constant, but has at some point
changed. This broke the algorithm for finding
the bridge interface.

Replace the algorithm with one based on the
guest IP, which is given by `tart`. As the bridge
IP is no longer constant, we also expose it through
the `TEST_CONFIG`.
Copy link
Member

@dlon dlon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 11 of 11 files at r2, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Serock3)


test/test-manager/src/vm/network/macos.rs line 47 at r2 (raw file):

}

/// A hack to find the Tart bridge interface using `NON_TUN_GATEWAY`.

Comment is stale now (the part about NON_TUN_GATEWAY).

@Serock3 Serock3 force-pushed the all-macos-e2e-tests-have-failed-to-start-since-2024-12-12-des-1611 branch from 67dc5e9 to aab384f Compare January 8, 2025 15:03
@Serock3 Serock3 marked this pull request as ready for review January 8, 2025 15:14
Copy link
Member

@dlon dlon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@Serock3 Serock3 merged commit 9286c9f into main Jan 8, 2025
49 checks passed
@Serock3 Serock3 deleted the all-macos-e2e-tests-have-failed-to-start-since-2024-12-12-des-1611 branch January 8, 2025 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Daemon Issues related to mullvad-daemon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants