Fix e2e tests on k8s environment #155
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
DiscoverSriov uses IsSupportedDevice function from sriovv1 package which relies on sriovv1.NicIdMap. After recent changes, NicIdMap is not a static map anymore. Need to update NicIdMap configmap with InitNicIdMap() function call before usage. Modify GetNodeSecureBootState to accept namespace argument. FIX GetNodeSecureBootState function to handle "/host/sys/kernel/security/lockdown" file absence correctly. This path will be unavailable if kernel is compiled without this feature. Signed-off-by: Yury Kulazhenkov <[email protected]>
moshe010
requested changes
Jul 1, 2021
| @@ -293,14 +299,14 @@ func GetNodeSecureBootState(clients *testclient.ClientSet, nodeName string) (boo | |||
| return false, err | |||
| } | |||
|
|
|||
| stdout, stderr, err := pod.ExecCommand(clients, runningPod, "cat", "/host/sys/kernel/security/lockdown") | |||
| stdout, _, err := pod.ExecCommand(clients, runningPod, "cat", "/host/sys/kernel/security/lockdown") | |||
There was a problem hiding this comment.
why did you remove the stderr check. I still can failed for other reason
There was a problem hiding this comment.
This check is useless. Stderr will be always empty.
TTY option set to true that mean that stdout will be used for stderr also.
sriov-network-operator/test/util/pod/pod.go
Line 125 in cb3b24b
Check Goclient src
Also, If command completes with non zero exit code, then err will be not nil, so check for error should be enough to catch all unexpected failures.
adrianchiris
approved these changes
Jul 4, 2021
zshi-redhat
approved these changes
Jul 5, 2021
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.
This PR fixes e2e tests on k8s enviroment
DiscoverSriov()usesIsSupportedDevice()function fromsriovv1package which relies on
sriovv1.NicIdMap.After recent changes, NicIdMap is not a static map anymore.
Need to update NicIdMap configmap with InitNicIdMap() function
call before usage.
Modify GetNodeSecureBootState to accept namespace argument and path sriov-network-operator
namespace to it. This required to keep all things in a single namespace during e2e.
FIX GetNodeSecureBootState function to handle
"/host/sys/kernel/security/lockdown" file absence correctly.
This path will be unavailable if kernel is compiled without lockdown
feature.