From 4c5a113663446d2f0d2d4339c5b8941ec0e3abaa Mon Sep 17 00:00:00 2001 From: Matt Rickard Date: Mon, 2 Oct 2017 08:59:13 -0700 Subject: [PATCH 1/2] Use virtualbox on windows for integration tests --- hack/jenkins/minikube_set_pending.sh | 2 +- ...t_hyperv.ps1 => windows_integration_test_virtualbox.ps1} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename hack/jenkins/{windows_integration_test_hyperv.ps1 => windows_integration_test_virtualbox.ps1} (85%) diff --git a/hack/jenkins/minikube_set_pending.sh b/hack/jenkins/minikube_set_pending.sh index aaac01a8d9d4..d1974bb3cdb8 100755 --- a/hack/jenkins/minikube_set_pending.sh +++ b/hack/jenkins/minikube_set_pending.sh @@ -27,7 +27,7 @@ set -e set +x -for job in "Linux-KVM-Kubeadm" "OSX-Virtualbox-Kubeadm" "OSX-Virtualbox" "OSX-XHyve" "OSX-Hyperkit" "Linux-Virtualbox" "Linux-KVM" "Linux-KVM-Alt" "Linux-None" "Windows-HyperV" "Linux-Container"; do +for job in "Linux-KVM-Kubeadm" "OSX-Virtualbox-Kubeadm" "OSX-Virtualbox" "OSX-XHyve" "OSX-Hyperkit" "Linux-Virtualbox" "Linux-KVM" "Linux-KVM-Alt" "Linux-None" "Windows-Virtualbox" "Linux-Container"; do target_url="https://storage.googleapis.com/minikube-builds/logs/${ghprbPullId}/${job}.txt" curl "https://api.github.com/repos/kubernetes/minikube/statuses/${ghprbActualCommit}?access_token=$access_token" \ -H "Content-Type: application/json" \ diff --git a/hack/jenkins/windows_integration_test_hyperv.ps1 b/hack/jenkins/windows_integration_test_virtualbox.ps1 similarity index 85% rename from hack/jenkins/windows_integration_test_hyperv.ps1 rename to hack/jenkins/windows_integration_test_virtualbox.ps1 index f84f43318100..d1f28b917f67 100644 --- a/hack/jenkins/windows_integration_test_hyperv.ps1 +++ b/hack/jenkins/windows_integration_test_virtualbox.ps1 @@ -21,15 +21,15 @@ gsutil.cmd cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata . ./out/minikube-windows-amd64.exe delete Remove-Item -Recurse -Force C:\Users\jenkins\.minikube -out/e2e-windows-amd64.exe --% -minikube-args="--vm-driver=hyperv --hyperv-virtual-switch=Minikube --v=10 $env:EXTRA_BUILD_ARGS" -test.v -test.timeout=30m -binary=out/minikube-windows-amd64.exe +out/e2e-windows-amd64.exe --% -minikube-start-args="--vm-driver=virtualbox" -minikube-args="--v=10 --logtostderr $env:EXTRA_BUILD_ARGS" -test.v -test.timeout=30m -binary=out/minikube-windows-amd64.exe $env:result=$lastexitcode # If the last exit code was 0->success, x>0->error If($env:result -eq 0){$env:status="success"} Else {$env:status="failure"} -$env:target_url="https://storage.googleapis.com/minikube-builds/logs/$env:MINIKUBE_LOCATION/Windows-hyperv.txt" -$json = "{`"state`": `"$env:status`", `"description`": `"Jenkins`", `"target_url`": `"$env:target_url`", `"context`": `"Windows-hyperv`"}" +$env:target_url="https://storage.googleapis.com/minikube-builds/logs/$env:MINIKUBE_LOCATION/Windows-virtualbox.txt" +$json = "{`"state`": `"$env:status`", `"description`": `"Jenkins`", `"target_url`": `"$env:target_url`", `"context`": `"Windows-virtualbox`"}" Invoke-WebRequest -Uri "https://api.github.com/repos/kubernetes/minikube/statuses/$env:COMMIT`?access_token=$env:access_token" -Body $json -ContentType "application/json" -Method Post -usebasicparsing Exit $env:result From cae751ad38d04bf20ba6addbe0419d3afc411b99 Mon Sep 17 00:00:00 2001 From: Matt Rickard Date: Tue, 3 Oct 2017 08:53:41 -0700 Subject: [PATCH 2/2] Disable busybox cache for windows --- test/integration/functional_test.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index a49ae677c150..93233b76583f 100755 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -21,21 +21,11 @@ package integration import ( "strings" "testing" - - "k8s.io/minikube/pkg/minikube/constants" - "k8s.io/minikube/pkg/minikube/machine" ) func TestFunctional(t *testing.T) { minikubeRunner := NewMinikubeRunner(t) minikubeRunner.EnsureRunning() - integrationTestImages := []string{"busybox:glibc"} - if err := machine.CacheImages(integrationTestImages, constants.ImageCacheDir); err != nil { - t.Fatalf("caching images: %s", err) - } - if err := machine.LoadFromCacheBlocking(&minikubeRunner, constants.ImageCacheDir); err != nil { - t.Fatalf("loading images: %s", err) - } // This one is not parallel, and ensures the cluster comes up // before we run any other tests. t.Run("Status", testClusterStatus)