diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index a6c72097bc..49e526cd99 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 -gt 0){ exit 2 } If ($numPass -eq 0){ exit 2 } + If ($numFail -eq 0){ exit 0 } functional_test_hyperv_windows: needs: [build_minikube] env: @@ -288,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) @@ -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 -gt 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..9589182a4c 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 -gt 0){ exit 2 } If ($numPass -eq 0){ exit 2 } + If ($numFail -eq 0){ exit 0 } functional_test_hyperv_windows: needs: [build_minikube] env: @@ -286,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) @@ -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 -gt 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/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..8833aca48d 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: access direct test is broken on windows: https://github.com/kubernetes/minikube/issues/8304") + } + checkRoutePassword(t) got := []byte{}