diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index ea30d94e4b..3e29e66c06 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -275,6 +275,7 @@ echo "" echo ">> Starting ${E2E_BIN} at $(date)" ${SUDO_PREFIX}${E2E_BIN} \ -minikube-start-args="--vm-driver=${VM_DRIVER} ${EXTRA_START_ARGS}" \ + -test.v \ -test.timeout=60m \ -test.parallel=${PARALLEL_COUNT} \ -binary="${MINIKUBE_BIN}" && result=$? || result=$? diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 204d042626..f6c3365cc1 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -404,7 +404,7 @@ func (k *Bootstrapper) RestartCluster(k8s config.KubernetesConfig) error { glog.Errorf("failed to create compat symlinks: %v", err) } - baseCmd := fmt.Sprintf("%s %s", invokeKubeadm(k8s.KubernetesVersion), phase) + baseCmd := fmt.Sprintf("%s --alsologtostderr -v=1 %s", invokeKubeadm(k8s.KubernetesVersion), phase) cmds := []string{ fmt.Sprintf("%s phase certs all --config %s", baseCmd, yamlConfigPath), fmt.Sprintf("%s phase kubeconfig all --config %s", baseCmd, yamlConfigPath), diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go index 727557227b..b63b6b5896 100644 --- a/pkg/minikube/cluster/cluster.go +++ b/pkg/minikube/cluster/cluster.go @@ -166,15 +166,15 @@ func configureHost(h *host.Host, e *engine.Options) error { } } - if !localDriver(h.Driver.DriverName()) { - glog.Infof("Configuring auth for driver %s ...", h.Driver.DriverName()) - if err := h.ConfigureAuth(); err != nil { - return &retry.RetriableError{Err: errors.Wrap(err, "Error configuring auth on host")} - } - return ensureSyncedGuestClock(h) + if localDriver(h.Driver.DriverName()) { + glog.Infof("%s is a local driver, skipping auth/time setup", h.Driver.DriverName()) + return nil } - - return nil + glog.Infof("Configuring auth for driver %s ...", h.Driver.DriverName()) + if err := h.ConfigureAuth(); err != nil { + return &retry.RetriableError{Err: errors.Wrap(err, "Error configuring auth on host")} + } + return ensureSyncedGuestClock(h) } // ensureGuestClockSync ensures that the guest system clock is relatively in-sync diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index c34ff3b8f6..fecc582b13 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -42,7 +42,7 @@ func TestAddons(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), 40*time.Minute) defer CleanupWithLogs(t, profile, cancel) - args := append([]string{"start", "-p", profile, "--wait=false", "--memory=2600"}, StartArgs()...) + args := append([]string{"start", "-p", profile, "--wait=false", "--memory=2600", "--alsologtostderr", "-v=1"}, StartArgs()...) rr, err := Run(t, exec.CommandContext(ctx, Target(), args...)) if err != nil { t.Fatalf("%s failed: %v", rr.Args, err) diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go index 2608e61962..442c249bfc 100644 --- a/test/integration/version_upgrade_test.go +++ b/test/integration/version_upgrade_test.go @@ -63,7 +63,7 @@ func TestVersionUpgrade(t *testing.T) { } } - args := append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.OldestKubernetesVersion)}, StartArgs()...) + args := append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.OldestKubernetesVersion), "--alsologtostderr", "-v=1"}, StartArgs()...) rr := &RunResult{} releaseStart := func() error { rr, err = Run(t, exec.CommandContext(ctx, tf.Name(), args...)) @@ -71,7 +71,7 @@ func TestVersionUpgrade(t *testing.T) { } // Retry to allow flakiness for the previous release - if err := retry.Expo(releaseStart, 1*time.Second, 20*time.Minute); err != nil { + if err := retry.Expo(releaseStart, 1*time.Second, 30*time.Minute, 3); err != nil { t.Fatalf("release start failed: %v", err) } @@ -89,7 +89,7 @@ func TestVersionUpgrade(t *testing.T) { t.Errorf("status = %q; want = %q", got, state.Stopped.String()) } - args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion)}, StartArgs()...) + args = append([]string{"start", "-p", profile, fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion), "--alsologtostderr", "-v=2"}, StartArgs()...) rr, err = Run(t, exec.CommandContext(ctx, Target(), args...)) if err != nil { t.Errorf("%s failed: %v", rr.Args, err)