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

NAS-128506 / 24.04.1 / Fix test iscsi auth network (by bmeagherix) #13620

Merged
merged 1 commit into from Apr 24, 2024

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Apr 24, 2024

Automatic cherry-pick failed. Please resolve conflicts by running:

git cherry-pick -x 6f84e7d53f2c70a0b9a3fafdcb72c00b14eb18c2
git cherry-pick -x 7cd26dd90508b219b73f41890002ef5c8f008706

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~1
git cherry-pick -x dbbd64f0874452c34715f2244ac027be20106094

Fix a bunch of tests that are failing in CI

  • When running iscsiadm in tests precede with a sudo if we are not running as root.
  • Improve test_iscsi_auth_network.py in several ways
    • Make my_ip4 a fixture so it only needs to run once
    • Extend my_ip4 so that it can even handle NAT situations (ssh / SSH_CLIENT)
    • flake8 fixes

Also required the ZFS fix in PR #230 (and PR #231)

Original PR: #13618
Jira URL: https://ixsystems.atlassian.net/browse/NAS-128506

* Make tests capable less susceptible to network environment

* Add sudo before iscsiadm for non-root test runners

(cherry picked from commit dbbd64f)
@yocalebo yocalebo marked this pull request as ready for review April 24, 2024 19:11
@yocalebo yocalebo merged commit c1ca293 into stable/dragonfish Apr 24, 2024
1 check passed
@yocalebo yocalebo deleted the NAS-128506-24.04.1 branch April 24, 2024 19:11
@bugclerk
Copy link
Contributor Author

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators Apr 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
3 participants