Merge pull request kubernetes#88721 from Deepthidharwar/sriov-tm-bug

k8s-ci-robot · web-flow · commit 67c6767b7da9 · 2020-03-05T02:58:50.000-08:00
FIX SRIOV detection logic not to error out if device not present on the system
diff --git a/test/e2e_node/topology_manager_test.go b/test/e2e_node/topology_manager_test.go
@@ -170,9 +170,8 @@ func findNUMANodeWithoutSRIOVDevicesFromSysfs(numaNodes int) (int, bool) {
 	}
 
 	if len(pciPerNuma) == 0 {
-		// if we got this far we already passed a rough check that SRIOV devices
-		// are available in the box, so something is seriously wrong
-		framework.Failf("failed to find any VF devices from %v", pciDevs)
+		framework.Logf("failed to find any VF device from %v", pciDevs)
+		return -1, false
 	}
 
 	for nodeNum := 0; nodeNum < numaNodes; nodeNum++ {

Original file line number	Diff line number	Diff line change
`@@ -170,9 +170,8 @@ func findNUMANodeWithoutSRIOVDevicesFromSysfs(numaNodes int) (int, bool) {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`if len(pciPerNuma) == 0 {`
`173`		`- // if we got this far we already passed a rough check that SRIOV devices`
`174`		`- // are available in the box, so something is seriously wrong`
`175`		`- framework.Failf("failed to find any VF devices from %v", pciDevs)`
	`173`	`+ framework.Logf("failed to find any VF device from %v", pciDevs)`
	`174`	`+ return -1, false`
`176`	`175`	`}`
`177`	`176`
`178`	`177`	`for nodeNum := 0; nodeNum < numaNodes; nodeNum++ {`