Merge pull request #58782 from mindprince/override-installer-url

Automatic merge from submit-queue (batch tested with PRs 58302, 58782, 58555, 58741). 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>. Make it possible to override the driver installer daemonset url from test-infra. This will enable things like kubernetes/test-infra#6430 /kind enhancement /sig testing /sig scheduling **Release note**: ```release-note NONE ``` /assign @jiayingz @vishh

Merge pull request #58782 from mindprince/override-installer-url
c59589c4 · Kubernetes Submit Queue · GitHub · ab788d23 · a959ae63 · c59589c4
Unverified Commit c59589c4 authored Jan 25, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

nvidia-gpus.go test/e2e/scheduling/nvidia-gpus.go +8 -1

No files found.
--- a/test/e2e/scheduling/nvidia-gpus.go
+++ b/test/e2e/scheduling/nvidia-gpus.go
@@ -17,6 +17,7 @@ limitations under the License.
 package scheduling

 import (
+	"os"
 	"strings"
 	"time"

@@ -163,7 +164,12 @@ func testNvidiaGPUsOnCOS(f *framework.Framework) {
 	framework.Logf("Cluster is running on COS. Proceeding with test")

 	if f.BaseName == "device-plugin-gpus" {
-		dsYamlUrl = "https://raw.githubusercontent.com/GoogleCloudPlatform/container-engine-accelerators/master/daemonset.yaml"
+		dsYamlUrlFromEnv := os.Getenv("NVIDIA_DRIVER_INSTALLER_DAEMONSET")
+		if dsYamlUrlFromEnv != "" {
+			dsYamlUrl = dsYamlUrlFromEnv
+		} else {
+			dsYamlUrl = "https://raw.githubusercontent.com/GoogleCloudPlatform/container-engine-accelerators/master/daemonset.yaml"
+		}
 		gpuResourceName = framework.NVIDIAGPUResourceName
 		podCreationFunc = makeCudaAdditionDevicePluginTestPod
 	} else {
@@ -172,6 +178,7 @@ func testNvidiaGPUsOnCOS(f *framework.Framework) {
 		podCreationFunc = makeCudaAdditionTestPod
 	}

+	framework.Logf("Using %v", dsYamlUrl)
 	// Creates the DaemonSet that installs Nvidia Drivers.
 	// The DaemonSet also runs nvidia device plugin for device plugin test.
 	ds, err := framework.DsFromManifest(dsYamlUrl)