Merge pull request #10203 from sharifelgamal/reenable-addons-test

re-enable addons tests for amd64 arch
pull/10206/head^2
Sharif Elgamal 2021-01-21 14:15:25 -08:00 committed by GitHub
commit de5b9db121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions

View File

@ -41,11 +41,6 @@ import (
// TestAddons tests addons that require no special environment -- in parallel // TestAddons tests addons that require no special environment -- in parallel
func TestAddons(t *testing.T) { func TestAddons(t *testing.T) {
if !arm64Platform() {
t.Skipf("Skip helm addon test for arm64. See https://github.com/kubernetes/minikube/issues/10144")
}
profile := UniqueProfileName("addons") profile := UniqueProfileName("addons")
ctx, cancel := context.WithTimeout(context.Background(), Minutes(40)) ctx, cancel := context.WithTimeout(context.Background(), Minutes(40))
defer Cleanup(t, profile, cancel) defer Cleanup(t, profile, cancel)
@ -63,10 +58,13 @@ func TestAddons(t *testing.T) {
t.Fatalf("Failed setting GOOGLE_CLOUD_PROJECT env var: %v", err) t.Fatalf("Failed setting GOOGLE_CLOUD_PROJECT env var: %v", err)
} }
args := append([]string{"start", "-p", profile, "--wait=true", "--memory=4000", "--alsologtostderr", "--addons=registry", "--addons=metrics-server", "--addons=helm-tiller", "--addons=olm", "--addons=volumesnapshots", "--addons=csi-hostpath-driver", "--addons=gcp-auth"}, StartArgs()...) args := append([]string{"start", "-p", profile, "--wait=true", "--memory=4000", "--alsologtostderr", "--addons=registry", "--addons=metrics-server", "--addons=olm", "--addons=volumesnapshots", "--addons=csi-hostpath-driver", "--addons=gcp-auth"}, StartArgs()...)
if !NoneDriver() && !(runtime.GOOS == "darwin" && KicDriver()) { // none doesn't support ingress if !NoneDriver() && !(runtime.GOOS == "darwin" && KicDriver()) { // none doesn't support ingress
args = append(args, "--addons=ingress") args = append(args, "--addons=ingress")
} }
if !arm64Platform() {
args = append(args, "--addons=helm-tiller")
}
rr, err := Run(t, exec.CommandContext(ctx, Target(), args...)) rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
if err != nil { if err != nil {
t.Fatalf("%s failed: %v", rr.Command(), err) t.Fatalf("%s failed: %v", rr.Command(), err)