diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index cceb3f7d61..56de95ad92 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -28,7 +28,7 @@ readonly OS_ARCH="${OS}-${ARCH}" readonly TEST_ROOT="${HOME}/minikube-integration" -readonly TEST_HOME="${TEST_ROOT}/${OS_ARCH}-${DRIVER}-${CONTAINER_RUNTIME}-${MINIKUBE_LOCATION}-$$-${COMMIT}" +readonly TEST_HOME="${TEST_ROOT}/$$-${COMMIT:0:7}" export GOPATH="$HOME/go" export KUBECONFIG="${TEST_HOME}/kubeconfig" diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index 7df44ab1ee..c30a07f6b8 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -63,7 +63,7 @@ func TestStartStop(t *testing.T) { "--network-plugin=cni", "--extra-config=kubeadm.pod-network-cidr=192.168.111.111/16", }}, - {"default-k8s-different-port", constants.DefaultKubernetesVersion, []string{ + {"default-k8s-diff-port", constants.DefaultKubernetesVersion, []string{ "--apiserver-port=8444", }}, {"no-preload", constants.NewestKubernetesVersion, []string{ diff --git a/test/integration/util_test.go b/test/integration/util_test.go index c5d3094a36..ab8421fbb1 100644 --- a/test/integration/util_test.go +++ b/test/integration/util_test.go @@ -34,8 +34,8 @@ func UniqueProfileName(prefix string) string { if NoneDriver() { return "minikube" } - // example: prefix-20200413162239-3215 - return fmt.Sprintf("%s-%s-%d", prefix, time.Now().Format("20060102150405"), os.Getpid()) + // example: prefix-162239 + return fmt.Sprintf("%s-%s", prefix, time.Now().Format("150405")) } // auditContains checks if the provided string is contained within the logs.