Skip to content

K
k3s
Unverified Commit 05f073dc authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #65468 from mindprince/remove-cos-requirement

Automatic merge from submit-queue (batch tested with PRs 65404, 65323, 65468). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Remove COS requirement while running e2e nvidia gpu tests. ```release-note NONE ```
parents e55ea160 af3bc705
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 18 deletions
test/e2e/scheduling/nvidia-gpus.go
View file @ 05f073dc
...@@ -18,7 +18,6 @@ package scheduling ...@@ -18,7 +18,6 @@ package scheduling
import ( import (
"os" "os"
"strings"
"time" "time"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
...@@ -35,7 +34,6 @@ import ( ...@@ -35,7 +34,6 @@ import (
const ( const (
testPodNamePrefix = "nvidia-gpu-" testPodNamePrefix = "nvidia-gpu-"
cosOSImage = "Container-Optimized OS from Google"
// Nvidia driver installation can take upwards of 5 minutes. // Nvidia driver installation can take upwards of 5 minutes.
driverInstallTimeout = 10 * time.Minute driverInstallTimeout = 10 * time.Minute
) )
...@@ -69,15 +67,12 @@ func makeCudaAdditionDevicePluginTestPod() *v1.Pod { ...@@ -69,15 +67,12 @@ func makeCudaAdditionDevicePluginTestPod() *v1.Pod {
return testPod return testPod
} }
func isClusterRunningCOS(f *framework.Framework) bool { func logOSImages(f *framework.Framework) {
nodeList, err := f.ClientSet.CoreV1().Nodes().List(metav1.ListOptions{}) nodeList, err := f.ClientSet.CoreV1().Nodes().List(metav1.ListOptions{})
framework.ExpectNoError(err, "getting node list") framework.ExpectNoError(err, "getting node list")
for _, node := range nodeList.Items { for _, node := range nodeList.Items {
if !strings.Contains(node.Status.NodeInfo.OSImage, cosOSImage) { framework.Logf("OS Image: %v", node.Status.NodeInfo.OSImage)
return false
}
} }
return true
} }
func areGPUsAvailableOnAllSchedulableNodes(f *framework.Framework) bool { func areGPUsAvailableOnAllSchedulableNodes(f *framework.Framework) bool {
...@@ -111,14 +106,7 @@ func getGPUsAvailable(f *framework.Framework) int64 { ...@@ -111,14 +106,7 @@ func getGPUsAvailable(f *framework.Framework) int64 {
} }
func SetupNVIDIAGPUNode(f *framework.Framework, setupResourceGatherer bool) *framework.ContainerResourceGatherer { func SetupNVIDIAGPUNode(f *framework.Framework, setupResourceGatherer bool) *framework.ContainerResourceGatherer {
// Skip the test if the base image is not COS. logOSImages(f)
// TODO: Add support for other base images.
// CUDA apps require host mounts which is not portable across base images (yet).
framework.Logf("Checking base image")
if !isClusterRunningCOS(f) {
Skip("Nvidia GPU tests are supproted only on Container Optimized OS image currently")
}
framework.Logf("Cluster is running on COS. Proceeding with test")
dsYamlUrlFromEnv := os.Getenv("NVIDIA_DRIVER_INSTALLER_DAEMONSET") dsYamlUrlFromEnv := os.Getenv("NVIDIA_DRIVER_INSTALLER_DAEMONSET")
if dsYamlUrlFromEnv != "" { if dsYamlUrlFromEnv != "" {
...@@ -163,7 +151,7 @@ func SetupNVIDIAGPUNode(f *framework.Framework, setupResourceGatherer bool) *fra ...@@ -163,7 +151,7 @@ func SetupNVIDIAGPUNode(f *framework.Framework, setupResourceGatherer bool) *fra
return rsgather return rsgather
} }
func testNvidiaGPUsOnCOS(f *framework.Framework) { func testNvidiaGPUs(f *framework.Framework) {
rsgather := SetupNVIDIAGPUNode(f, true) rsgather := SetupNVIDIAGPUNode(f, true)
framework.Logf("Creating as many pods as there are Nvidia GPUs and have the pods run a CUDA app") framework.Logf("Creating as many pods as there are Nvidia GPUs and have the pods run a CUDA app")
podList := []*v1.Pod{} podList := []*v1.Pod{}
...@@ -186,7 +174,7 @@ func testNvidiaGPUsOnCOS(f *framework.Framework) { ...@@ -186,7 +174,7 @@ func testNvidiaGPUsOnCOS(f *framework.Framework) {
var _ = SIGDescribe("[Feature:GPUDevicePlugin]", func() { var _ = SIGDescribe("[Feature:GPUDevicePlugin]", func() {
f := framework.NewDefaultFramework("device-plugin-gpus") f := framework.NewDefaultFramework("device-plugin-gpus")
It("run Nvidia GPU Device Plugin tests on Container Optimized OS only", func() { It("run Nvidia GPU Device Plugin tests", func() {
testNvidiaGPUsOnCOS(f) testNvidiaGPUs(f)
}) })
}) })
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment