diff --git a/install/ci-vm/ci-linux/ci/runCI b/install/ci-vm/ci-linux/ci/runCI index cef70526..46ac2c96 100644 --- a/install/ci-vm/ci-linux/ci/runCI +++ b/install/ci-vm/ci-linux/ci/runCI @@ -63,7 +63,7 @@ if [ -e "${dstDir}/ccextractor" ]; then chmod +x ${tester} postStatus "testing" "Running tests" executeCommand cd ${suiteDstDir} - executeCommand ${tester} --debug --entries "${testFile}" --executable "ccextractor" --tempfolder "${tempFolder}" --timeout 3000 --reportfolder "${reportFolder}" --resultfolder "${resultFolder}" --samplefolder "${sampleFolder}" --method Server --url "${reportURL}" + executeCommand ${tester} --debug --entries "${testFile}" --executable "ccextractor" --tempfolder "${tempFolder}" --timeout 600 --reportfolder "${reportFolder}" --resultfolder "${resultFolder}" --samplefolder "${sampleFolder}" --method Server --url "${reportURL}" sendLogFile postStatus "completed" "Ran all tests" diff --git a/install/ci-vm/ci-windows/ci/runCI.bat b/install/ci-vm/ci-windows/ci/runCI.bat index a199f052..efe6ecd8 100644 --- a/install/ci-vm/ci-windows/ci/runCI.bat +++ b/install/ci-vm/ci-windows/ci/runCI.bat @@ -23,7 +23,7 @@ if EXIST "%dstDir%\ccextractorwinfull.exe" ( copy "%dstDir%\*" . call :postStatus "testing" "Running tests" call :executeCommand cd %suiteDstDir% - call :executeCommand "%tester%" --debug True --entries "%testFile%" --executable "ccextractorwinfull.exe" --tempfolder "%tempFolder%" --timeout 3000 --reportfolder "%reportFolder%" --resultfolder "%resultFolder%" --samplefolder "%sampleFolder%" --method Server --url "%reportURL%" + call :executeCommand "%tester%" --debug True --entries "%testFile%" --executable "ccextractorwinfull.exe" --tempfolder "%tempFolder%" --timeout 600 --reportfolder "%reportFolder%" --resultfolder "%resultFolder%" --samplefolder "%sampleFolder%" --method Server --url "%reportURL%" curl -s -A "%userAgent%" --form "type=logupload" --form "file=@%logFile%" -w "\n" "%reportURL%" >> "%logFile%" timeout 10 diff --git a/install/ci-vm/ci-windows/startup-script.ps1 b/install/ci-vm/ci-windows/startup-script.ps1 index d74c5c37..f324ff68 100644 --- a/install/ci-vm/ci-windows/startup-script.ps1 +++ b/install/ci-vm/ci-windows/startup-script.ps1 @@ -3,10 +3,10 @@ choco install winfsp -y cd C:\Windows\Temp -curl.exe https://downloads.rclone.org/v1.59.0/rclone-v1.59.0-windows-amd64.zip --output rclone.zip +curl.exe https://downloads.rclone.org/v1.69.3/rclone-v1.69.3-windows-amd64.zip --output rclone.zip Expand-Archive -Path rclone.zip -DestinationPath .\ New-Item -Path '.\repository' -ItemType Directory -Copy-Item -Path .\rclone-v1.59.0-windows-amd64\rclone.exe -Destination .\repository\ +Copy-Item -Path .\rclone-v1.69.3-windows-amd64\rclone.exe -Destination .\repository\ Add-MpPreference -ExclusionProcess 'C:\Windows\Temp\repository\rclone.exe' cd repository @@ -24,7 +24,7 @@ curl.exe http://metadata/computeMetadata/v1/instance/attributes/rclone_conf -H " curl.exe http://metadata/computeMetadata/v1/instance/attributes/service_account -H "Metadata-Flavor: Google" > service-account.json (Get-Content -path .\service-account.json) | Set-Content -Encoding ASCII -Path .\service-account.json -start powershell {.\rclone.exe mount $env:mount_path\TestFiles .\TestFiles --config=".\rclone.conf" --no-console --read-only} +start powershell {.\rclone.exe mount $env:mount_path\TestFiles .\TestFiles --config=".\rclone.conf" -o FileInfoTimeout=-1 --vfs-read-wait 0 --no-console --read-only} Start-Sleep -Seconds 5 start powershell {.\rclone.exe mount $env:mount_path\TestData\ci-windows .\temp --config=".\rclone.conf" --no-console --read-only}