diff --git a/hack/jenkins/windows_cleanup_and_reboot.ps1 b/hack/jenkins/windows_cleanup_and_reboot.ps1 index 9db30e6452..6f20799ac8 100644 --- a/hack/jenkins/windows_cleanup_and_reboot.ps1 +++ b/hack/jenkins/windows_cleanup_and_reboot.ps1 @@ -3,10 +3,6 @@ function Jenkins { if ($?) { return $TRUE } - $common = Get-WMIObject -Class Win32_Process -Filter "Name='PowerShell.EXE'" | Where {$_.CommandLine -Like "*common.ps1*"} - if ($common -ne $NULL) { - return $TRUE - } return $FALSE } diff --git a/hack/jenkins/windows_cleanup_cron.ps1 b/hack/jenkins/windows_cleanup_cron.ps1 index 7f7e62e53f..b17f1716cc 100644 --- a/hack/jenkins/windows_cleanup_cron.ps1 +++ b/hack/jenkins/windows_cleanup_cron.ps1 @@ -1 +1,2 @@ Schtasks /create /tn cleanup_reboot /sc MINUTE /mo 30 /tr "Powershell C:\jenkins\windows_cleanup_and_reboot.ps1" /f +Disable-ScheduledTask -TaskName cleanup_reboot diff --git a/hack/jenkins/windows_integration_test_docker.ps1 b/hack/jenkins/windows_integration_test_docker.ps1 index a903a15883..b06bdc13ff 100644 --- a/hack/jenkins/windows_integration_test_docker.ps1 +++ b/hack/jenkins/windows_integration_test_docker.ps1 @@ -21,4 +21,4 @@ $timeout="180m" $env:JOB_NAME="Docker_Windows" $env:EXTERNAL="yes" -. Powershell -File ./out/common.ps1 +. ./out/common.ps1 diff --git a/hack/jenkins/windows_integration_test_hyperv.ps1 b/hack/jenkins/windows_integration_test_hyperv.ps1 index 7d9e77479a..69b768f039 100644 --- a/hack/jenkins/windows_integration_test_hyperv.ps1 +++ b/hack/jenkins/windows_integration_test_hyperv.ps1 @@ -21,4 +21,4 @@ $timeout="180m" $env:JOB_NAME="Hyper-V_Windows" $env:EXTERNAL="yes" -. Powershell -File ./out/common.ps1 +. ./out/common.ps1