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

Fix Tests: Update portmap test's iptables error check #793

Merged
merged 1 commit into from
Dec 12, 2022

Conversation

EmilyShepherd
Copy link
Contributor

@EmilyShepherd EmilyShepherd commented Dec 6, 2022

GitHub Actions recently updated ubuntu-latest to 22.04 [1], which now
defaults to nfttables (rather than iptables-legacy) [2]. The portmap
tests in this project are written with the expectation that expected
error message for one test is in the iptables-legacy format.

This commit updates the check to make it work for both the
iptables-legecy and iptables-nftables variants.

References:
[1]: actions/runner-images@4aba37b
[2]: https://ubuntu.com/blog/whats-new-in-security-for-ubuntu-22-04-lts

Signed-off-by: Emily Shepherd [email protected]

@EmilyShepherd EmilyShepherd force-pushed the fix-ci branch 2 times, most recently from cc95e7a to 9a42204 Compare December 6, 2022 13:16
@EmilyShepherd EmilyShepherd marked this pull request as draft December 6, 2022 13:59
@EmilyShepherd EmilyShepherd force-pushed the fix-ci branch 3 times, most recently from a56b728 to 125a98c Compare December 6, 2022 18:56
GitHub Actions recently updated ubuntu-latest to 22.04 [1], which now
defaults to nfttables (rather than iptables-legacy) [2]. The portmap
tests in this project are written with the expectation that expected
error message for one test is in the iptables-legacy format.

This commit updates the check to make it work for both the
iptables-legecy and iptables-nftables variants.

References:
[1]: actions/runner-images@4aba37b
[2]: https://ubuntu.com/blog/whats-new-in-security-for-ubuntu-22-04-lts

Signed-off-by: Emily Shepherd <[email protected]>
@EmilyShepherd EmilyShepherd changed the title Set iptables back to iptables-legacy Update portmap test's iptables error check Dec 6, 2022
@EmilyShepherd EmilyShepherd marked this pull request as ready for review December 6, 2022 19:09
@EmilyShepherd EmilyShepherd changed the title Update portmap test's iptables error check Fix Tests: Update portmap test's iptables error check Dec 6, 2022
@dcbw
Copy link
Member

dcbw commented Dec 12, 2022

LGTM thanks!

@dcbw dcbw merged commit ec76e3c into containernetworking:main Dec 12, 2022
@EmilyShepherd EmilyShepherd deleted the fix-ci branch December 12, 2022 21:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants