From b44510c8350ca2e9c82a9831461cc0d95eadc13f Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 28 May 2020 10:57:41 -0700 Subject: [PATCH 1/6] skip two always failing test on windows and create issue --- test/integration/fn_mount_cmd.go | 6 +++++- test/integration/fn_tunnel_cmd.go | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/test/integration/fn_mount_cmd.go b/test/integration/fn_mount_cmd.go index f6e218d8a4..306fd5482e 100644 --- a/test/integration/fn_mount_cmd.go +++ b/test/integration/fn_mount_cmd.go @@ -43,7 +43,7 @@ const ( createdByPodRemovedByTest = "created-by-pod-removed-by-test" ) -func validateMountCmd(ctx context.Context, t *testing.T, profile string) { +func validateMountCmd(ctx context.Context, t *testing.T, profile string) { // nolint: cyclomatic complexity 31 if NoneDriver() { t.Skip("skipping: none driver does not support mount") } @@ -51,6 +51,10 @@ func validateMountCmd(ctx context.Context, t *testing.T, profile string) { t.Skip("skipping: mount broken on hyperv: https://github.com/kubernetes/minikube/issues/5029") } + if runtime.GOOS == "windows" { + t.Skip("skipping: mount broken on windows: https://github.com/kubernetes/minikube/issues/8303") + } + tempDir, err := ioutil.TempDir("", "mounttest") defer func() { //clean up tempdir err := os.RemoveAll(tempDir) diff --git a/test/integration/fn_tunnel_cmd.go b/test/integration/fn_tunnel_cmd.go index e990b02778..f6f419232e 100644 --- a/test/integration/fn_tunnel_cmd.go +++ b/test/integration/fn_tunnel_cmd.go @@ -173,6 +173,10 @@ func validateServiceStable(ctx context.Context, t *testing.T, profile string) { // validateAccessDirect validates if the test service can be accessed with LoadBalancer IP from host func validateAccessDirect(ctx context.Context, t *testing.T, profile string) { + if runtime.GOOS == "windows" { + t.Skip("skipping: mount broken on windows: https://github.com/kubernetes/minikube/issues/8304") + } + checkRoutePassword(t) got := []byte{} From 54673ecef33a5a07fa9c0fe4267c81534b23c8f8 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 28 May 2020 12:13:51 -0700 Subject: [PATCH 2/6] exit on 0 --- .github/workflows/master.yml | 6 ++++-- .github/workflows/pr.yml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index a6c72097bc..7da7bbb052 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -249,8 +249,9 @@ jobs: echo "-------------------------------------------------------" $numPass=$(echo $Env:STAT | jq '.NumberOfPass') echo "*** $numPass Passed ***" - If ($numFail -ge 0){ exit 2 } else { echo "goodjob" } + If ($numFail -ge 0){ exit 2 } If ($numPass -eq 0){ exit 2 } + If ($numFail -eq 0){ exit 0 } functional_test_hyperv_windows: needs: [build_minikube] env: @@ -335,8 +336,9 @@ jobs: echo "-------------------------------------------------------" $numPass=$(echo $Env:STAT | jq '.NumberOfPass') echo "*** $numPass Passed ***" - If ($numFail -ge 0){ exit 2 } else { echo "goodjob" } + If ($numFail -ge 0){ exit 2 } If ($numPass -eq 0){ exit 2 } + If ($numFail -eq 0){ exit 0 } addons_certs_tests_docker_ubuntu: runs-on: ubuntu-18.04 env: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a545e381a7..7a4f2e5385 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -247,8 +247,9 @@ jobs: echo "-------------------------------------------------------" $numPass=$(echo $Env:STAT | jq '.NumberOfPass') echo "*** $numPass Passed ***" - If ($numFail -ge 0){ exit 2 } else { echo "goodjob" } + If ($numFail -ge 0){ exit 2 } If ($numPass -eq 0){ exit 2 } + If ($numFail -eq 0){ exit 0 } functional_test_hyperv_windows: needs: [build_minikube] env: @@ -333,8 +334,9 @@ jobs: echo "-------------------------------------------------------" $numPass=$(echo $Env:STAT | jq '.NumberOfPass') echo "*** $numPass Passed ***" - If ($numFail -ge 0){ exit 2 } else { echo "goodjob" } + If ($numFail -ge 0){ exit 2 } If ($numPass -eq 0){ exit 2 } + If ($numFail -eq 0){ exit 0 } addons_certs_tests_docker_ubuntu: runs-on: ubuntu-18.04 env: From 32e6cae52247026b0971df1c3fcfdad284649c5d Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 28 May 2020 12:37:48 -0700 Subject: [PATCH 3/6] silently continue --- .github/workflows/master.yml | 2 ++ .github/workflows/pr.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 7da7bbb052..e50bd4093c 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -242,6 +242,7 @@ jobs: - name: The End Result functional_test_docker_windows shell: powershell run: | + $ErrorActionPreference = "SilentlyContinue" $numFail=(echo $Env:STAT | jq '.NumberOfFail') $failedTests=( echo $Env:STAT | jq '.FailedTests') echo "----------------${numFail} Failures----------------------------" @@ -329,6 +330,7 @@ jobs: - name: The End Result functional_test_hyperv_windows shell: powershell run: | + $ErrorActionPreference = "SilentlyContinue" $numFail=(echo $Env:STAT | jq '.NumberOfFail') $failedTests=( echo $Env:STAT | jq '.FailedTests') echo "----------------${numFail} Failures----------------------------" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7a4f2e5385..cb380cffea 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -240,6 +240,7 @@ jobs: - name: The End Result functional_test_docker_windows shell: powershell run: | + $ErrorActionPreference = "SilentlyContinue" $numFail=(echo $Env:STAT | jq '.NumberOfFail') $failedTests=( echo $Env:STAT | jq '.FailedTests') echo "----------------${numFail} Failures----------------------------" @@ -327,6 +328,7 @@ jobs: - name: The End Result functional_test_hyperv_windows shell: powershell run: | + $ErrorActionPreference = "SilentlyContinue" $numFail=(echo $Env:STAT | jq '.NumberOfFail') $failedTests=( echo $Env:STAT | jq '.FailedTests') echo "----------------${numFail} Failures----------------------------" From 088e5f68a56680361a42cbd67661274dc3a63379 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 28 May 2020 12:45:14 -0700 Subject: [PATCH 4/6] fix logical operator --- .github/workflows/master.yml | 6 ++---- .github/workflows/pr.yml | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index e50bd4093c..77ec5caf08 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -242,7 +242,6 @@ jobs: - name: The End Result functional_test_docker_windows shell: powershell run: | - $ErrorActionPreference = "SilentlyContinue" $numFail=(echo $Env:STAT | jq '.NumberOfFail') $failedTests=( echo $Env:STAT | jq '.FailedTests') echo "----------------${numFail} Failures----------------------------" @@ -250,7 +249,7 @@ jobs: echo "-------------------------------------------------------" $numPass=$(echo $Env:STAT | jq '.NumberOfPass') echo "*** $numPass Passed ***" - If ($numFail -ge 0){ exit 2 } + If ($numFail -gt 0){ exit 2 } If ($numPass -eq 0){ exit 2 } If ($numFail -eq 0){ exit 0 } functional_test_hyperv_windows: @@ -330,7 +329,6 @@ jobs: - name: The End Result functional_test_hyperv_windows shell: powershell run: | - $ErrorActionPreference = "SilentlyContinue" $numFail=(echo $Env:STAT | jq '.NumberOfFail') $failedTests=( echo $Env:STAT | jq '.FailedTests') echo "----------------${numFail} Failures----------------------------" @@ -338,7 +336,7 @@ jobs: echo "-------------------------------------------------------" $numPass=$(echo $Env:STAT | jq '.NumberOfPass') echo "*** $numPass Passed ***" - If ($numFail -ge 0){ exit 2 } + If ($numFail -gt 0){ exit 2 } If ($numPass -eq 0){ exit 2 } If ($numFail -eq 0){ exit 0 } addons_certs_tests_docker_ubuntu: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index cb380cffea..5853ac4d90 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -240,7 +240,6 @@ jobs: - name: The End Result functional_test_docker_windows shell: powershell run: | - $ErrorActionPreference = "SilentlyContinue" $numFail=(echo $Env:STAT | jq '.NumberOfFail') $failedTests=( echo $Env:STAT | jq '.FailedTests') echo "----------------${numFail} Failures----------------------------" @@ -248,7 +247,7 @@ jobs: echo "-------------------------------------------------------" $numPass=$(echo $Env:STAT | jq '.NumberOfPass') echo "*** $numPass Passed ***" - If ($numFail -ge 0){ exit 2 } + If ($numFail -gt 0){ exit 2 } If ($numPass -eq 0){ exit 2 } If ($numFail -eq 0){ exit 0 } functional_test_hyperv_windows: @@ -328,7 +327,6 @@ jobs: - name: The End Result functional_test_hyperv_windows shell: powershell run: | - $ErrorActionPreference = "SilentlyContinue" $numFail=(echo $Env:STAT | jq '.NumberOfFail') $failedTests=( echo $Env:STAT | jq '.FailedTests') echo "----------------${numFail} Failures----------------------------" @@ -336,7 +334,7 @@ jobs: echo "-------------------------------------------------------" $numPass=$(echo $Env:STAT | jq '.NumberOfPass') echo "*** $numPass Passed ***" - If ($numFail -ge 0){ exit 2 } + If ($numFail -gt 0){ exit 2 } If ($numPass -eq 0){ exit 2 } If ($numFail -eq 0){ exit 0 } addons_certs_tests_docker_ubuntu: From 0a1c1d85978878127557d4f4123844a949def9eb Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 28 May 2020 13:13:22 -0700 Subject: [PATCH 5/6] log test name --- test/integration/fn_tunnel_cmd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/fn_tunnel_cmd.go b/test/integration/fn_tunnel_cmd.go index f6f419232e..8833aca48d 100644 --- a/test/integration/fn_tunnel_cmd.go +++ b/test/integration/fn_tunnel_cmd.go @@ -174,7 +174,7 @@ func validateServiceStable(ctx context.Context, t *testing.T, profile string) { // validateAccessDirect validates if the test service can be accessed with LoadBalancer IP from host func validateAccessDirect(ctx context.Context, t *testing.T, profile string) { if runtime.GOOS == "windows" { - t.Skip("skipping: mount broken on windows: https://github.com/kubernetes/minikube/issues/8304") + t.Skip("skipping: access direct test is broken on windows: https://github.com/kubernetes/minikube/issues/8304") } checkRoutePassword(t) From 5ecb6da470e098af9e0d48cc11b1d76f2b434340 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 28 May 2020 13:35:10 -0700 Subject: [PATCH 6/6] hperv multiplier --- .github/workflows/master.yml | 2 +- .github/workflows/pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 77ec5caf08..49e526cd99 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -289,7 +289,7 @@ jobs: $env:KUBECONFIG="${pwd}\testhome\kubeconfig" $env:MINIKUBE_HOME="${pwd}\testhome" $ErrorActionPreference = "SilentlyContinue" - ./e2e-windows-amd64.exe --minikube-start-args="--driver=hyperv" --test.timeout=13m --test.v --test.run=TestFunctional --binary="./minikube-windows-amd64.exe" | Out-File -FilePath .\report\testout.txt -Encoding ASCII + ./e2e-windows-amd64.exe --minikube-start-args="--driver=hyperv" --test.timeout=13m -timeout-multiplier=1.5 --test.v --test.run=TestFunctional --binary="./minikube-windows-amd64.exe" | Out-File -FilePath .\report\testout.txt -Encoding ASCII $END_TIME=(GET-DATE) echo $END_TIME $DURATION=(NEW-TIMESPAN -Start $START_TIME -End $END_TIME) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 5853ac4d90..9589182a4c 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -287,7 +287,7 @@ jobs: $env:KUBECONFIG="${pwd}\testhome\kubeconfig" $env:MINIKUBE_HOME="${pwd}\testhome" $ErrorActionPreference = "SilentlyContinue" - ./e2e-windows-amd64.exe --minikube-start-args="--driver=hyperv" --test.timeout=13m --test.v --test.run=TestFunctional --binary="./minikube-windows-amd64.exe" | Out-File -FilePath .\report\testout.txt -Encoding ASCII + ./e2e-windows-amd64.exe --minikube-start-args="--driver=hyperv" --test.timeout=13m -timeout-multiplier=1.5 --test.v --test.run=TestFunctional --binary="./minikube-windows-amd64.exe" | Out-File -FilePath .\report\testout.txt -Encoding ASCII $END_TIME=(GET-DATE) echo $END_TIME $DURATION=(NEW-TIMESPAN -Start $START_TIME -End $END_TIME)