diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 29d4131d95..1fc17d2d92 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -1,7 +1,6 @@ editors: - version: 6000.0 - version: 6000.3 - - version: 6000.4 - - version: trunk + - version: 6000.6 upm_ci_install: npm install -g upm-ci-utils@stable --registry https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-npm diff --git a/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh b/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh index aef156dad9..1f7b566191 100644 --- a/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh +++ b/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh @@ -2,6 +2,13 @@ # This is an auto-generated script. Do not edit manually! set -x +crashReportDir="${TMPDIR%/}/BugReporterCrashReportJson" +if [ -d "$crashReportDir" ]; then + for f in "$crashReportDir"/CrashReport_*.json; do + [ -e "$f" ] || continue + curl -X POST --connect-timeout 5 --max-time 10 -H "Content-Type: application/json" -T "$f" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo "Failed to upload $f. Ignoring..." + done +fi set -e if [ -f "infrastructure_instability_detection_standalone.zip" ]; then echo "removed existing archive infrastructure_instability_detection_standalone.zip" diff --git a/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd b/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd index 40d3bc8b3d..2397b45ae0 100644 --- a/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd +++ b/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd @@ -1,7 +1,7 @@ @echo on rem This is an auto-generated script. Do not edit manually! -if exist "%TEMP%\BugReporterCrashReportJson" for /f "delims=" %%i in ('dir /b /a-d "%TEMP%\BugReporterCrashReportJson\*.json"') do curl -X POST -H "Content-Type: application/json" -T "%TEMP%\BugReporterCrashReportJson\%%i" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo Failed to upload %%i. Ignoring... +if exist "%TEMP%\BugReporterCrashReportJson" for /f "delims=" %%i in ('dir /b /a-d "%TEMP%\BugReporterCrashReportJson\CrashReport_*.json"') do curl -X POST --connect-timeout 5 --max-time 10 -H "Content-Type: application/json" -T "%TEMP%\BugReporterCrashReportJson\%%i" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo Failed to upload %%i. Ignoring... curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/windows.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('infrastructure_instability_detection_standalone.zip', '.'); }" && DEL "infrastructure_instability_detection_standalone.zip" diff --git a/.yamato/input-system-editor-functional-tests.yml b/.yamato/input-system-editor-functional-tests.yml index 187bcd2b8d..ae95bb4b78 100644 --- a/.yamato/input-system-editor-functional-tests.yml +++ b/.yamato/input-system-editor-functional-tests.yml @@ -125,66 +125,6 @@ inputsystem-editorfunctionaltests_-_6000_3_-_win10: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.5 - MacOs13 -inputsystem-editorfunctionaltests_-_6000_5_-_macos13: - name: InputSystem-EditorFunctionalTests - 6000.5 - MacOs13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path $HOME/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait - - command: .Editor/Unity.app/Contents/MacOS/Unity -projectPath . -batchmode -nographics -quit -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -logFile - - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.5_project;flags:inputsystem_MacOS_6000.5_project" --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-EditorFunctionalTests - 6000.5 - Ubuntu2204 -inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu2204: - name: InputSystem-EditorFunctionalTests - 6000.5 - Ubuntu2204 - agent: - image: package-ci/ubuntu-22.04:v4 - type: Unity::VM::GPU - flavor: b1.large - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path $HOME/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait - - command: .Editor/Unity -projectPath . -batchmode -nographics -quit -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -logFile - - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.5_project;flags:inputsystem_Ubuntu_6000.5_project" --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-EditorFunctionalTests - 6000.5 - Win10 -inputsystem-editorfunctionaltests_-_6000_5_-_win10: - name: InputSystem-EditorFunctionalTests - 6000.5 - Win10 - agent: - image: package-ci/win10:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path %USERPROFILE%/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait - - command: .Editor\Unity.exe -projectPath . -batchmode -nographics -quit -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -logFile - - - command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.5_project;flags:inputsystem_Windows_6000.5_project" --timeout=3600 --artifacts-path=artifacts - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-EditorFunctionalTests - 6000.6 - MacOs13Arm inputsystem-editorfunctionaltests_-_6000_6_-_macos13arm: name: InputSystem-EditorFunctionalTests - 6000.6 - MacOs13Arm diff --git a/.yamato/input-system-editor-performance-tests.yml b/.yamato/input-system-editor-performance-tests.yml index c7b4f7a1b6..e73e13528d 100644 --- a/.yamato/input-system-editor-performance-tests.yml +++ b/.yamato/input-system-editor-performance-tests.yml @@ -119,63 +119,6 @@ inputsystem-editorperformancetests_-_6000_3_-_win10: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.5 - MacOs13 -inputsystem-editorperformancetests_-_6000_5_-_macos13: - name: InputSystem-EditorPerformanceTests - 6000.5 - MacOs13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path $HOME/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-EditorPerformanceTests - 6000.5 - Ubuntu2204 -inputsystem-editorperformancetests_-_6000_5_-_ubuntu2204: - name: InputSystem-EditorPerformanceTests - 6000.5 - Ubuntu2204 - agent: - image: package-ci/ubuntu-22.04:v4 - type: Unity::VM::GPU - flavor: b1.large - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path $HOME/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-EditorPerformanceTests - 6000.5 - Win10 -inputsystem-editorperformancetests_-_6000_5_-_win10: - name: InputSystem-EditorPerformanceTests - 6000.5 - Win10 - agent: - image: package-ci/win10:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path %USERPROFILE%/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait - - command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-EditorPerformanceTests - 6000.6 - MacOs13Arm inputsystem-editorperformancetests_-_6000_6_-_macos13arm: name: InputSystem-EditorPerformanceTests - 6000.6 - MacOs13Arm diff --git a/.yamato/input-system-mobile-functional-build-jobs.yml b/.yamato/input-system-mobile-functional-build-jobs.yml index e54fc114e0..92ff1ee411 100644 --- a/.yamato/input-system-mobile-functional-build-jobs.yml +++ b/.yamato/input-system-mobile-functional-build-jobs.yml @@ -184,96 +184,6 @@ inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_tvos: paths: - build/players/**/* -# InputSystem-MobileFunctionalBuildJobs - 6000.5 - Android - il2cpp -inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_il2cpp: - name: InputSystem-MobileFunctionalBuildJobs - 6000.5 - Android - il2cpp - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.xlarge - commands: - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c Android --fast --wait - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android --scripting-backend=il2cpp - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - -# InputSystem-MobileFunctionalBuildJobs - 6000.5 - Android - mono -inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_mono: - name: InputSystem-MobileFunctionalBuildJobs - 6000.5 - Android - mono - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.xlarge - commands: - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c Android --fast --wait - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - -# InputSystem-MobileFunctionalBuildJobs - 6000.5 - IOS -inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_ios: - name: InputSystem-MobileFunctionalBuildJobs - 6000.5 - IOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: m1.mac - commands: - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c iOS --fast --wait - - command: |- - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - chmod u+x utr - - command: ./utr --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=ios - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - variables: - UNITY_HANDLEUIINTERRUPTIONS: 1 - UTR_VERSION: 1.42.0 - -# InputSystem-MobileFunctionalBuildJobs - 6000.5 - TvOS -inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_tvos: - name: InputSystem-MobileFunctionalBuildJobs - 6000.5 - TvOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: m1.mac - commands: - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c AppleTV --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=tvOS - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - # InputSystem-MobileFunctionalBuildJobs - 6000.6 - Android - il2cpp inputsystem-mobilefunctionalbuildjobs_-_6000_6_-_android_-_il2cpp: name: InputSystem-MobileFunctionalBuildJobs - 6000.6 - Android - il2cpp diff --git a/.yamato/input-system-mobile-functional-tests.yml b/.yamato/input-system-mobile-functional-tests.yml index f10d29941c..dc1f72f2b0 100644 --- a/.yamato/input-system-mobile-functional-tests.yml +++ b/.yamato/input-system-mobile-functional-tests.yml @@ -201,104 +201,6 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_tvos: dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_tvos -# InputSystem-MobileFunctionalTests - 6000.5 - Android - il2cpp -inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_il2cpp: - name: InputSystem-MobileFunctionalTests - 6000.5 - Android - il2cpp - agent: - image: mobile/android-execution-base:v2.3785910 - type: Unity::mobile::shield - flavor: b1.xlarge - commands: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android - after: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: if not exist build\test-results mkdir build\test-results - - command: powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe logcat -d > build/test-results/device_log.txt - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_il2cpp - variables: - UTR_VERSION: 1.42.0 - -# InputSystem-MobileFunctionalTests - 6000.5 - Android - mono -inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_mono: - name: InputSystem-MobileFunctionalTests - 6000.5 - Android - mono - agent: - image: mobile/android-execution-base:v2.3785910 - type: Unity::mobile::shield - flavor: b1.xlarge - commands: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android - after: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: if not exist build\test-results mkdir build\test-results - - command: powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe logcat -d > build/test-results/device_log.txt - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_mono - variables: - UTR_VERSION: 1.42.0 - -# InputSystem-MobileFunctionalTests - 6000.5 - IOS -inputsystem-mobilefunctionaltests_-_6000_5_-_ios: - name: InputSystem-MobileFunctionalTests - 6000.5 - IOS - agent: - image: package-ci/macos-13:default - type: Unity::mobile::iPhone - flavor: m1.mac - model: SE-Gen3 - commands: - - command: |- - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - chmod u+x utr - - command: ./utr --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_ios - variables: - UTR_VERSION: 1.42.0 - -# InputSystem-MobileFunctionalTests - 6000.5 - TvOS -inputsystem-mobilefunctionaltests_-_6000_5_-_tvos: - name: InputSystem-MobileFunctionalTests - 6000.5 - TvOS - agent: - image: package-ci/macos-13:default - type: Unity::mobile::appletv - flavor: m1.mac - commands: - - command: UnifiedTestRunner --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=tvOS - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_tvos - # InputSystem-MobileFunctionalTests - 6000.6 - Android - il2cpp inputsystem-mobilefunctionaltests_-_6000_6_-_android_-_il2cpp: name: InputSystem-MobileFunctionalTests - 6000.6 - Android - il2cpp diff --git a/.yamato/input-system-mobile-performance-build-jobs.yml b/.yamato/input-system-mobile-performance-build-jobs.yml index e47828d5b8..2f6e8c9d9c 100644 --- a/.yamato/input-system-mobile-performance-build-jobs.yml +++ b/.yamato/input-system-mobile-performance-build-jobs.yml @@ -184,96 +184,6 @@ inputsystem-mobileperformancebuildjobs_-_6000_3_-_tvos: paths: - build/players/**/* -# InputSystem-MobilePerformanceBuildJobs - 6000.5 - Android - il2cpp -inputsystem-mobileperformancebuildjobs_-_6000_5_-_android_-_il2cpp: - name: InputSystem-MobilePerformanceBuildJobs - 6000.5 - Android - il2cpp - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.xlarge - commands: - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c Android --fast --wait - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android --scripting-backend=il2cpp - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - -# InputSystem-MobilePerformanceBuildJobs - 6000.5 - Android - mono -inputsystem-mobileperformancebuildjobs_-_6000_5_-_android_-_mono: - name: InputSystem-MobilePerformanceBuildJobs - 6000.5 - Android - mono - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.xlarge - commands: - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c Android --fast --wait - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - -# InputSystem-MobilePerformanceBuildJobs - 6000.5 - IOS -inputsystem-mobileperformancebuildjobs_-_6000_5_-_ios: - name: InputSystem-MobilePerformanceBuildJobs - 6000.5 - IOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: m1.mac - commands: - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c iOS --fast --wait - - command: |- - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - chmod u+x utr - - command: ./utr --testproject=. --editor-location=.Editor --suite=playmode --category=Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=ios - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - variables: - UNITY_HANDLEUIINTERRUPTIONS: 1 - UTR_VERSION: 1.42.0 - -# InputSystem-MobilePerformanceBuildJobs - 6000.5 - TvOS -inputsystem-mobileperformancebuildjobs_-_6000_5_-_tvos: - name: InputSystem-MobilePerformanceBuildJobs - 6000.5 - TvOS - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: m1.mac - commands: - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c AppleTV --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=tvOS - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/logs/**/* - players: - paths: - - build/players/**/* - # InputSystem-MobilePerformanceBuildJobs - 6000.6 - Android - il2cpp inputsystem-mobileperformancebuildjobs_-_6000_6_-_android_-_il2cpp: name: InputSystem-MobilePerformanceBuildJobs - 6000.6 - Android - il2cpp diff --git a/.yamato/input-system-mobile-performance-tests.yml b/.yamato/input-system-mobile-performance-tests.yml index 0c7e2e00e9..98b44b2ac6 100644 --- a/.yamato/input-system-mobile-performance-tests.yml +++ b/.yamato/input-system-mobile-performance-tests.yml @@ -201,104 +201,6 @@ inputsystem-mobileperformancetests_-_6000_3_-_tvos: dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_3_-_tvos -# InputSystem-MobilePerformanceTests - 6000.5 - Android - il2cpp -inputsystem-mobileperformancetests_-_6000_5_-_android_-_il2cpp: - name: InputSystem-MobilePerformanceTests - 6000.5 - Android - il2cpp - agent: - image: mobile/android-execution-base:v2.3785910 - type: Unity::mobile::shield - flavor: b1.xlarge - commands: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr.bat --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android - after: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: if not exist build\test-results mkdir build\test-results - - command: powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe logcat -d > build/test-results/device_log.txt - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_android_-_il2cpp - variables: - UTR_VERSION: 1.42.0 - -# InputSystem-MobilePerformanceTests - 6000.5 - Android - mono -inputsystem-mobileperformancetests_-_6000_5_-_android_-_mono: - name: InputSystem-MobilePerformanceTests - 6000.5 - Android - mono - agent: - image: mobile/android-execution-base:v2.3785910 - type: Unity::mobile::shield - flavor: b1.xlarge - commands: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - - command: |- - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr.bat --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android - after: - - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - - command: if not exist build\test-results mkdir build\test-results - - command: powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe logcat -d > build/test-results/device_log.txt - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_android_-_mono - variables: - UTR_VERSION: 1.42.0 - -# InputSystem-MobilePerformanceTests - 6000.5 - IOS -inputsystem-mobileperformancetests_-_6000_5_-_ios: - name: InputSystem-MobilePerformanceTests - 6000.5 - IOS - agent: - image: package-ci/macos-13:default - type: Unity::mobile::iPhone - flavor: m1.mac - model: SE-Gen3 - commands: - - command: |- - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - chmod u+x utr - - command: ./utr --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_ios - variables: - UTR_VERSION: 1.42.0 - -# InputSystem-MobilePerformanceTests - 6000.5 - TvOS -inputsystem-mobileperformancetests_-_6000_5_-_tvos: - name: InputSystem-MobilePerformanceTests - 6000.5 - TvOS - agent: - image: package-ci/macos-13:default - type: Unity::mobile::appletv - flavor: m1.mac - commands: - - command: UnifiedTestRunner --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=tvOS - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - logs: - paths: - - build/test-results/**/* - dependencies: - - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_tvos - # InputSystem-MobilePerformanceTests - 6000.6 - Android - il2cpp inputsystem-mobileperformancetests_-_6000_6_-_android_-_il2cpp: name: InputSystem-MobilePerformanceTests - 6000.6 - Android - il2cpp diff --git a/.yamato/input-system-standalone-functional-tests.yml b/.yamato/input-system-standalone-functional-tests.yml index cec933ead6..af6fe1f295 100644 --- a/.yamato/input-system-standalone-functional-tests.yml +++ b/.yamato/input-system-standalone-functional-tests.yml @@ -119,63 +119,6 @@ inputsystem-standalonefunctionaltests_-_6000_3_-_win10: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.5 - MacOs13 -inputsystem-standalonefunctionaltests_-_6000_5_-_macos13: - name: InputSystem-StandaloneFunctionalTests - 6000.5 - MacOs13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path $HOME/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandaloneFunctionalTests - 6000.5 - Ubuntu2204 -inputsystem-standalonefunctionaltests_-_6000_5_-_ubuntu2204: - name: InputSystem-StandaloneFunctionalTests - 6000.5 - Ubuntu2204 - agent: - image: package-ci/ubuntu-22.04:v4 - type: Unity::VM::GPU - flavor: b1.large - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path $HOME/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneLinux64 --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandaloneFunctionalTests - 6000.5 - Win10 -inputsystem-standalonefunctionaltests_-_6000_5_-_win10: - name: InputSystem-StandaloneFunctionalTests - 6000.5 - Win10 - agent: - image: package-ci/win10:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path %USERPROFILE%/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait - - command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneWindows64 --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandaloneFunctionalTests - 6000.6 - MacOs13Arm inputsystem-standalonefunctionaltests_-_6000_6_-_macos13arm: name: InputSystem-StandaloneFunctionalTests - 6000.6 - MacOs13Arm diff --git a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml index 47a71cd2a0..6c7c8abcdd 100644 --- a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml @@ -119,63 +119,6 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_win10: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - MacOs13 -inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_macos13: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - MacOs13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path $HOME/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - Ubuntu2204 -inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_ubuntu2204: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - Ubuntu2204 - agent: - image: package-ci/ubuntu-22.04:v4 - type: Unity::VM::GPU - flavor: b1.large - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path $HOME/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneLinux64 --scripting-backend=il2cpp --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - Win10 -inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_win10: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - Win10 - agent: - image: package-ci/win10:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path %USERPROFILE%/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneWindows64 --scripting-backend=il2cpp --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOs13Arm inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos13arm: name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOs13Arm diff --git a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml index 6ece04ed83..eb9aeafc62 100644 --- a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml @@ -119,63 +119,6 @@ inputsystem-standaloneil2cppperformancetests_-_6000_3_-_win10: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - MacOs13 -inputsystem-standaloneil2cppperformancetests_-_6000_5_-_macos13: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - MacOs13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path $HOME/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - Ubuntu2204 -inputsystem-standaloneil2cppperformancetests_-_6000_5_-_ubuntu2204: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - Ubuntu2204 - agent: - image: package-ci/ubuntu-22.04:v4 - type: Unity::VM::GPU - flavor: b1.large - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path $HOME/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneLinux64 --scripting-backend=il2cpp --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - Win10 -inputsystem-standaloneil2cppperformancetests_-_6000_5_-_win10: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - Win10 - agent: - image: package-ci/win10:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path %USERPROFILE%/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneWindows64 --scripting-backend=il2cpp --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOs13Arm inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos13arm: name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOs13Arm diff --git a/.yamato/input-system-standalone-performance-tests.yml b/.yamato/input-system-standalone-performance-tests.yml index e809b4c138..716cff4c32 100644 --- a/.yamato/input-system-standalone-performance-tests.yml +++ b/.yamato/input-system-standalone-performance-tests.yml @@ -119,63 +119,6 @@ inputsystem-standaloneperformancetests_-_6000_3_-_win10: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.5 - MacOs13 -inputsystem-standaloneperformancetests_-_6000_5_-_macos13: - name: InputSystem-StandalonePerformanceTests - 6000.5 - MacOs13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path $HOME/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandalonePerformanceTests - 6000.5 - Ubuntu2204 -inputsystem-standaloneperformancetests_-_6000_5_-_ubuntu2204: - name: InputSystem-StandalonePerformanceTests - 6000.5 - Ubuntu2204 - agent: - image: package-ci/ubuntu-22.04:v4 - type: Unity::VM::GPU - flavor: b1.large - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path $HOME/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneLinux64 --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - -# InputSystem-StandalonePerformanceTests - 6000.5 - Win10 -inputsystem-standaloneperformancetests_-_6000_5_-_win10: - name: InputSystem-StandalonePerformanceTests - 6000.5 - Win10 - agent: - image: package-ci/win10:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: dotnet tool install docfx --version 2.70.0 --tool-path %USERPROFILE%/.pmdt - - command: git clone --branch "3.14.8-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait - - command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneWindows64 --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandalonePerformanceTests - 6000.6 - MacOs13Arm inputsystem-standaloneperformancetests_-_6000_6_-_macos13arm: name: InputSystem-StandalonePerformanceTests - 6000.6 - MacOs13Arm diff --git a/.yamato/triggers.yml b/.yamato/triggers.yml index 3292d5c27b..611d8ff79e 100644 --- a/.yamato/triggers.yml +++ b/.yamato/triggers.yml @@ -13,15 +13,11 @@ all_functional_tests: - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_3_-_macos13 - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_3_-_ubuntu2204 - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_3_-_win10 - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_macos13 - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu2204 - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_win10 - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_macos13arm - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu2204 - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_win10 - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_tvos - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_tvos - - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_tvos - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_6_-_tvos - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_il2cpp - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_mono @@ -29,9 +25,6 @@ all_functional_tests: - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_il2cpp - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_mono - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_3_-_ios - - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_il2cpp - - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_mono - - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_5_-_ios - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_6_-_android_-_il2cpp - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_6_-_android_-_mono - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_6_-_ios @@ -41,9 +34,6 @@ all_functional_tests: - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_3_-_macos13 - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_3_-_ubuntu2204 - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_3_-_win10 - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_macos13 - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_ubuntu2204 - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_win10 - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_macos13arm - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_ubuntu2204 - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_win10 @@ -51,8 +41,6 @@ all_functional_tests: - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_win10 - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_macos13 - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_win10 - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_macos13 - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_win10 - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos13arm - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_win10 - path: .yamato/wrench/promotion-jobs.yml#publish_dry_run_inputsystem @@ -72,15 +60,11 @@ all_performance_tests: - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_3_-_macos13 - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_3_-_ubuntu2204 - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_3_-_win10 - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_macos13 - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_ubuntu2204 - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_win10 - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_macos13arm - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_ubuntu2204 - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_win10 - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_tvos - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_3_-_tvos - - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_tvos - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_6_-_tvos - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_0_-_android_-_il2cpp - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_0_-_android_-_mono @@ -88,9 +72,6 @@ all_performance_tests: - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_3_-_android_-_il2cpp - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_3_-_android_-_mono - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_3_-_ios - - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_5_-_android_-_il2cpp - - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_5_-_android_-_mono - - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_5_-_ios - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_6_-_android_-_il2cpp - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_6_-_android_-_mono - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_6_-_ios @@ -100,9 +81,6 @@ all_performance_tests: - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_3_-_macos13 - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_3_-_ubuntu2204 - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_3_-_win10 - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_macos13 - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_ubuntu2204 - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_win10 - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos13arm - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_ubuntu2204 - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_win10 @@ -112,9 +90,6 @@ all_performance_tests: - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_3_-_macos13 - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_3_-_ubuntu2204 - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_3_-_win10 - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_macos13 - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_ubuntu2204 - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_win10 - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_macos13arm - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_ubuntu2204 - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_win10 @@ -123,7 +98,6 @@ nightly_trigger: dependencies: - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_ubuntu2204 - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_ubuntu2204 - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_ubuntu2204 - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_ubuntu2204 - path: .yamato/triggers.yml#all_performance_tests triggers: diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index 4d7f43101e..a9e3487ee2 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -18,7 +18,7 @@ api_validation_-_inputsystem_-_6000_0_-_win10: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "%WRENCH_LOCALAPV_URL%" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -31,7 +31,7 @@ api_validation_-_inputsystem_-_6000_0_-_win10: - command: python PythonScripts/PackageJsonCondersor.py timeout: 1 retries: 0 - - command: upm-ci package test -u .Editor --package-path Packages/com.unity.inputsystem --type vetting-tests || exit 0 + - command: upm-ci package test -u .Editor --package-path Packages/com.unity.inputsystem --type vetting-tests --extra-utr-arg="--zero-tests-are-ok=1" || exit 0 timeout: 30 retries: 0 - command: python PythonScripts/parse_upm_ci_results.py --package-path=Packages/com.unity.inputsystem @@ -60,8 +60,9 @@ api_validation_-_inputsystem_-_6000_0_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index d79e36f29a..469e2e708f 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.yamato/wrench/package-pack-jobs.yml @@ -29,16 +29,17 @@ package_pack_-_inputsystem: - upm-ci~/packages/**/* variables: UPMCI_ACK_LARGE_PACKAGE: 1 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 # Pack Package Manager DocTools package_pack_-_package-manager-doctools: name: Package Pack - package-manager-doctools agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM::GPU + type: Unity::VM flavor: b1.large commands: - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm @@ -54,7 +55,8 @@ package_pack_-_package-manager-doctools: - upm-ci~/packages/**/* variables: UPMCI_ACK_LARGE_PACKAGE: 1 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index 9135d3d461..46a1d0ae8e 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -16,15 +16,12 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_macos13 - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_ubuntu2204 - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_win10 - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_macos13 - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_ubuntu2204 - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_win10 - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_macos13arm - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_ubuntu2204 - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_win10 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS). preview_apv_-_6000_0_-_macos13: @@ -34,7 +31,7 @@ preview_apv_-_6000_0_-_macos13: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -44,7 +41,7 @@ preview_apv_-_6000_0_-_macos13: - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --artifacts-path=PreviewApvArtifacts~ - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' after: - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh @@ -79,10 +76,11 @@ preview_apv_-_6000_0_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). preview_apv_-_6000_0_-_ubuntu2204: @@ -92,7 +90,7 @@ preview_apv_-_6000_0_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -102,7 +100,7 @@ preview_apv_-_6000_0_-_ubuntu2204: - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --artifacts-path=PreviewApvArtifacts~ - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' after: - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh @@ -137,10 +135,11 @@ preview_apv_-_6000_0_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 # Functional tests for dependents found in the latest 6000.0 manifest (Windows). preview_apv_-_6000_0_-_win10: @@ -151,7 +150,7 @@ preview_apv_-_6000_0_-_win10: flavor: b1.large commands: - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "%WRENCH_LOCALAPV_URL%" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -161,7 +160,7 @@ preview_apv_-_6000_0_-_win10: - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --artifacts-path=PreviewApvArtifacts~ - command: python PythonScripts/editor_manifest_validator.py --version=6000.0 --wrench-config=.yamato/wrench/wrench_config.json after: - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd @@ -196,10 +195,11 @@ preview_apv_-_6000_0_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 # Functional tests for dependents found in the latest 6000.3 manifest (MacOS). preview_apv_-_6000_3_-_macos13: @@ -209,7 +209,7 @@ preview_apv_-_6000_3_-_macos13: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -219,7 +219,7 @@ preview_apv_-_6000_3_-_macos13: - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --artifacts-path=PreviewApvArtifacts~ - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' after: - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh @@ -254,10 +254,11 @@ preview_apv_-_6000_3_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 # Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu). preview_apv_-_6000_3_-_ubuntu2204: @@ -267,7 +268,7 @@ preview_apv_-_6000_3_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -277,7 +278,7 @@ preview_apv_-_6000_3_-_ubuntu2204: - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --artifacts-path=PreviewApvArtifacts~ - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' after: - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh @@ -312,10 +313,11 @@ preview_apv_-_6000_3_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 # Functional tests for dependents found in the latest 6000.3 manifest (Windows). preview_apv_-_6000_3_-_win10: @@ -326,7 +328,7 @@ preview_apv_-_6000_3_-_win10: flavor: b1.large commands: - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "%WRENCH_LOCALAPV_URL%" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -336,7 +338,7 @@ preview_apv_-_6000_3_-_win10: - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --artifacts-path=PreviewApvArtifacts~ - command: python PythonScripts/editor_manifest_validator.py --version=6000.3 --wrench-config=.yamato/wrench/wrench_config.json after: - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd @@ -371,185 +373,11 @@ preview_apv_-_6000_3_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 - -# Functional tests for dependents found in the latest 6000.5 manifest (MacOS). -preview_apv_-_6000_5_-_macos13: - name: Preview APV - 6000.5 - macos13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ - UNITY_LICENSING_SERVER_DELETE_NUL: 0 - UNITY_LICENSING_SERVER_DELETE_ULF: 0 - UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 - -# Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu). -preview_apv_-_6000_5_-_ubuntu2204: - name: Preview APV - 6000.5 - ubuntu2204 - agent: - image: package-ci/ubuntu-22.04:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ - UNITY_LICENSING_SERVER_DELETE_NUL: 0 - UNITY_LICENSING_SERVER_DELETE_ULF: 0 - UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 - -# Functional tests for dependents found in the latest 6000.5 manifest (Windows). -preview_apv_-_6000_5_-_win10: - name: Preview APV - 6000.5 - win10 - agent: - image: package-ci/win10:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=6000.5 --wrench-config=.yamato/wrench/wrench_config.json - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ - UNITY_LICENSING_SERVER_DELETE_NUL: 0 - UNITY_LICENSING_SERVER_DELETE_ULF: 0 - UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 # Functional tests for dependents found in the latest 6000.6 manifest (MacOS). preview_apv_-_6000_6_-_macos13arm: @@ -560,7 +388,7 @@ preview_apv_-_6000_6_-_macos13arm: flavor: m1.mac model: M1 commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -570,7 +398,7 @@ preview_apv_-_6000_6_-_macos13arm: - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast --arch arm64 timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --artifacts-path=PreviewApvArtifacts~ - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' after: - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh @@ -605,10 +433,11 @@ preview_apv_-_6000_6_-_macos13arm: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 # Functional tests for dependents found in the latest 6000.6 manifest (Ubuntu). preview_apv_-_6000_6_-_ubuntu2204: @@ -618,7 +447,7 @@ preview_apv_-_6000_6_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -628,7 +457,7 @@ preview_apv_-_6000_6_-_ubuntu2204: - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --artifacts-path=PreviewApvArtifacts~ - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' after: - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh @@ -663,10 +492,11 @@ preview_apv_-_6000_6_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 # Functional tests for dependents found in the latest 6000.6 manifest (Windows). preview_apv_-_6000_6_-_win10: @@ -677,7 +507,7 @@ preview_apv_-_6000_6_-_win10: flavor: b1.large commands: - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "%WRENCH_LOCALAPV_URL%" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -687,7 +517,7 @@ preview_apv_-_6000_6_-_win10: - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --artifacts-path=PreviewApvArtifacts~ - command: python PythonScripts/editor_manifest_validator.py --version=6000.6 --wrench-config=.yamato/wrench/wrench_config.json after: - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd @@ -722,8 +552,9 @@ preview_apv_-_6000_6_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 1a6fcaa7d6..7fd114e1ab 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -14,7 +14,7 @@ publish_dry_run_inputsystem: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -91,36 +91,6 @@ publish_dry_run_inputsystem: UTR: location: results/UTR/validate-inputsystem-6000.3-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_5_-_macos13 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.5-macos13 - unzip: true - UTR: - location: results/UTR/validate-inputsystem-6000.5-macos13 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_5_-_ubuntu2204 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.5-ubuntu2204 - unzip: true - UTR: - location: results/UTR/validate-inputsystem-6000.5-ubuntu2204 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_5_-_win10 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.5-win10 - unzip: true - UTR: - location: results/UTR/validate-inputsystem-6000.5-win10 - unzip: true - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13arm specific_options: packages: @@ -153,10 +123,11 @@ publish_dry_run_inputsystem: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 # Publish for inputsystem to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_inputsystem: @@ -166,7 +137,7 @@ publish_inputsystem: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -243,36 +214,6 @@ publish_inputsystem: UTR: location: results/UTR/validate-inputsystem-6000.3-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_5_-_macos13 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.5-macos13 - unzip: true - UTR: - location: results/UTR/validate-inputsystem-6000.5-macos13 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_5_-_ubuntu2204 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.5-ubuntu2204 - unzip: true - UTR: - location: results/UTR/validate-inputsystem-6000.5-ubuntu2204 - unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_5_-_win10 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.5-win10 - unzip: true - UTR: - location: results/UTR/validate-inputsystem-6000.5-win10 - unzip: true - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13arm specific_options: packages: @@ -305,9 +246,10 @@ publish_inputsystem: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip allow_on: branch match "^release/.*" metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index aa62f085cc..14c0b66de6 100644 --- a/.yamato/wrench/recipe-regeneration.yml +++ b/.yamato/wrench/recipe-regeneration.yml @@ -31,5 +31,5 @@ test_-_wrench_jobs_up_to_date: cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index b9ddb4ebab..ed642a6e71 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -14,7 +14,7 @@ validate_-_inputsystem_-_6000_0_-_macos13: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -28,13 +28,19 @@ validate_-_inputsystem_-_6000_0_-_macos13: - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp timeout: 20 retries: 0 + - command: python PythonScripts/ignore_clean_console_failures.py + timeout: 5 + retries: 0 - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.0;flags:inputsystem_MacOS_6000.0" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.0;flags:inputsystem_MacOS_6000.0" --coverage-pkg-version=1.3.0 --zero-tests-are-ok=1 + timeout: 20 + retries: 1 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.0;flags:inputsystem_MacOS_6000.0" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -72,10 +78,11 @@ validate_-_inputsystem_-_6000_0_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 labels: - Packages:inputsystem @@ -87,7 +94,7 @@ validate_-_inputsystem_-_6000_0_-_ubuntu2204: type: Unity::VM::GPU flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -101,13 +108,19 @@ validate_-_inputsystem_-_6000_0_-_ubuntu2204: - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp timeout: 20 retries: 0 + - command: python PythonScripts/ignore_clean_console_failures.py + timeout: 5 + retries: 0 - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.0;flags:inputsystem_Ubuntu_6000.0" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.0;flags:inputsystem_Ubuntu_6000.0" --coverage-pkg-version=1.3.0 --zero-tests-are-ok=1 + timeout: 20 + retries: 1 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.0;flags:inputsystem_Ubuntu_6000.0" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -145,10 +158,11 @@ validate_-_inputsystem_-_6000_0_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 labels: - Packages:inputsystem @@ -160,7 +174,7 @@ validate_-_inputsystem_-_6000_0_-_win10: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "%WRENCH_LOCALAPV_URL%" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -174,13 +188,19 @@ validate_-_inputsystem_-_6000_0_-_win10: - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp timeout: 20 retries: 0 + - command: python PythonScripts/ignore_clean_console_failures.py + timeout: 5 + retries: 0 - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.0;flags:inputsystem_Windows_6000.0" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.0;flags:inputsystem_Windows_6000.0" --coverage-pkg-version=1.3.0 --zero-tests-are-ok=1 + timeout: 20 + retries: 1 + - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.0;flags:inputsystem_Windows_6000.0" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -218,10 +238,11 @@ validate_-_inputsystem_-_6000_0_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 labels: - Packages:inputsystem @@ -233,7 +254,7 @@ validate_-_inputsystem_-_6000_3_-_macos13: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -247,13 +268,19 @@ validate_-_inputsystem_-_6000_3_-_macos13: - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp timeout: 20 retries: 0 + - command: python PythonScripts/ignore_clean_console_failures.py + timeout: 5 + retries: 0 - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.3;flags:inputsystem_MacOS_6000.3" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.3;flags:inputsystem_MacOS_6000.3" --coverage-pkg-version=1.3.0 --zero-tests-are-ok=1 + timeout: 20 + retries: 1 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.3;flags:inputsystem_MacOS_6000.3" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -291,10 +318,11 @@ validate_-_inputsystem_-_6000_3_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 labels: - Packages:inputsystem @@ -306,7 +334,7 @@ validate_-_inputsystem_-_6000_3_-_ubuntu2204: type: Unity::VM::GPU flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -320,13 +348,19 @@ validate_-_inputsystem_-_6000_3_-_ubuntu2204: - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp timeout: 20 retries: 0 + - command: python PythonScripts/ignore_clean_console_failures.py + timeout: 5 + retries: 0 - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.3;flags:inputsystem_Ubuntu_6000.3" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.3;flags:inputsystem_Ubuntu_6000.3" --coverage-pkg-version=1.3.0 --zero-tests-are-ok=1 + timeout: 20 + retries: 1 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.3;flags:inputsystem_Ubuntu_6000.3" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -364,10 +398,11 @@ validate_-_inputsystem_-_6000_3_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 labels: - Packages:inputsystem @@ -379,7 +414,7 @@ validate_-_inputsystem_-_6000_3_-_win10: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "%WRENCH_LOCALAPV_URL%" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -393,232 +428,19 @@ validate_-_inputsystem_-_6000_3_-_win10: - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp timeout: 20 retries: 0 - - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + - command: python PythonScripts/ignore_clean_console_failures.py timeout: 5 retries: 0 - - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.3;flags:inputsystem_Windows_6000.3" --coverage-pkg-version=1.3.0 - timeout: 20 - retries: 1 - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - Coverage: - paths: - - upm-ci~/CodeCoverage/** - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - test-inputsystem/Logs/** - - test-inputsystem/Library/*.log - - test-inputsystem/*.log - - test-inputsystem/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ - UNITY_LICENSING_SERVER_DELETE_NUL: 0 - UNITY_LICENSING_SERVER_DELETE_ULF: 0 - UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 - labels: - - Packages:inputsystem - -# PVP Editor and Playmode tests for Validate - inputsystem - 6000.5 - macos13 (6000.5 - MacOS). -validate_-_inputsystem_-_6000_5_-_macos13: - name: Validate - inputsystem - 6000.5 - macos13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast - timeout: 20 - retries: 3 - - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor - timeout: 10 - retries: 1 - - command: echo No internal packages to add. - - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp - timeout: 20 - retries: 0 - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.5;flags:inputsystem_MacOS_6000.5" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.3;flags:inputsystem_Windows_6000.3" --coverage-pkg-version=1.3.0 --zero-tests-are-ok=1 timeout: 20 retries: 1 - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - Coverage: - paths: - - upm-ci~/CodeCoverage/** - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - test-inputsystem/Logs/** - - test-inputsystem/Library/*.log - - test-inputsystem/*.log - - test-inputsystem/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ - UNITY_LICENSING_SERVER_DELETE_NUL: 0 - UNITY_LICENSING_SERVER_DELETE_ULF: 0 - UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 - labels: - - Packages:inputsystem - -# PVP Editor and Playmode tests for Validate - inputsystem - 6000.5 - ubuntu2204 (6000.5 - Ubuntu). -validate_-_inputsystem_-_6000_5_-_ubuntu2204: - name: Validate - inputsystem - 6000.5 - ubuntu2204 - agent: - image: package-ci/ubuntu-22.04:v4 - type: Unity::VM::GPU - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast - timeout: 20 - retries: 3 - - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor - timeout: 10 - retries: 1 - - command: echo No internal packages to add. - - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp - timeout: 20 - retries: 0 - - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 5 - retries: 0 - - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.5;flags:inputsystem_Ubuntu_6000.5" --coverage-pkg-version=1.3.0 - timeout: 20 - retries: 1 - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - Coverage: - paths: - - upm-ci~/CodeCoverage/** - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - test-inputsystem/Logs/** - - test-inputsystem/Library/*.log - - test-inputsystem/*.log - - test-inputsystem/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ - UNITY_LICENSING_SERVER_DELETE_NUL: 0 - UNITY_LICENSING_SERVER_DELETE_ULF: 0 - UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 - labels: - - Packages:inputsystem - -# PVP Editor and Playmode tests for Validate - inputsystem - 6000.5 - win10 (6000.5 - Windows). -validate_-_inputsystem_-_6000_5_-_win10: - name: Validate - inputsystem - 6000.5 - win10 - agent: - image: package-ci/win10:v4 - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast - timeout: 20 - retries: 3 - - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor - timeout: 10 - retries: 1 - - command: echo No internal packages to add. - - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp - timeout: 20 - retries: 0 - - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 5 - retries: 0 - - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.5;flags:inputsystem_Windows_6000.5" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.3;flags:inputsystem_Windows_6000.3" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -656,10 +478,11 @@ validate_-_inputsystem_-_6000_5_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 labels: - Packages:inputsystem @@ -672,7 +495,7 @@ validate_-_inputsystem_-_6000_6_-_macos13arm: flavor: m1.mac model: M1 commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -686,13 +509,19 @@ validate_-_inputsystem_-_6000_6_-_macos13arm: - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp timeout: 20 retries: 0 + - command: python PythonScripts/ignore_clean_console_failures.py + timeout: 5 + retries: 0 - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6;flags:inputsystem_MacOS_6000.6" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6;flags:inputsystem_MacOS_6000.6" --coverage-pkg-version=1.3.0 --zero-tests-are-ok=1 + timeout: 20 + retries: 1 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6;flags:inputsystem_MacOS_6000.6" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -730,10 +559,11 @@ validate_-_inputsystem_-_6000_6_-_macos13arm: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 labels: - Packages:inputsystem @@ -745,7 +575,7 @@ validate_-_inputsystem_-_6000_6_-_ubuntu2204: type: Unity::VM::GPU flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -759,13 +589,19 @@ validate_-_inputsystem_-_6000_6_-_ubuntu2204: - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp timeout: 20 retries: 0 + - command: python PythonScripts/ignore_clean_console_failures.py + timeout: 5 + retries: 0 - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.6;flags:inputsystem_Ubuntu_6000.6" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.6;flags:inputsystem_Ubuntu_6000.6" --coverage-pkg-version=1.3.0 --zero-tests-are-ok=1 + timeout: 20 + retries: 1 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.6;flags:inputsystem_Ubuntu_6000.6" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -803,10 +639,11 @@ validate_-_inputsystem_-_6000_6_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 labels: - Packages:inputsystem @@ -818,7 +655,7 @@ validate_-_inputsystem_-_6000_6_-_win10: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: curl "%WRENCH_LOCALAPV_URL%" -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -832,13 +669,19 @@ validate_-_inputsystem_-_6000_6_-_win10: - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp timeout: 20 retries: 0 + - command: python PythonScripts/ignore_clean_console_failures.py + timeout: 5 + retries: 0 - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.6;flags:inputsystem_Windows_6000.6" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.6;flags:inputsystem_Windows_6000.6" --coverage-pkg-version=1.3.0 --zero-tests-are-ok=1 + timeout: 20 + retries: 1 + - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.6;flags:inputsystem_Windows_6000.6" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -876,10 +719,11 @@ validate_-_inputsystem_-_6000_6_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.1.0 + UPMPVP_CONTEXT_WRENCH: 3.13.1.0 + WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.1.0 + Wrench: 3.13.1.0 labels: - Packages:inputsystem diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 3f18a3fcbe..4e6e3d64ed 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -77,7 +77,7 @@ }, "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_inputsystem", "branch_pattern": "ReleaseSlash", - "wrench_version": "3.2.1.0", + "wrench_version": "3.13.1.0", "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json", "cs_project_path": "Tools/CI/InputSystem.Cookbook.csproj" } \ No newline at end of file diff --git a/Assets/Tests/InputSystem/Plugins/DeviceSimulatorTests.cs b/Assets/Tests/InputSystem/Plugins/DeviceSimulatorTests.cs index f3e7284e78..163da734cc 100644 --- a/Assets/Tests/InputSystem/Plugins/DeviceSimulatorTests.cs +++ b/Assets/Tests/InputSystem/Plugins/DeviceSimulatorTests.cs @@ -15,6 +15,31 @@ public class DeviceSimulatorTests : InputTestFixture { + private TouchSimulation m_OldTouchSimulationInstance; + + public override void Setup() + { + // Detach before base.Setup() resets the input system, so that a TouchSimulation instance + // already in place does not see the devices being removed. + m_OldTouchSimulationInstance = TouchSimulation.s_Instance; + TouchSimulation.s_Instance = null; + + base.Setup(); + } + + public override void TearDown() + { + // Destroy while the test's input system is still the current one, since OnDisable removes + // the simulated touchscreen from it. + TouchSimulation.s_DeviceSimulatorCount = 0; + TouchSimulation.Destroy(); + + base.TearDown(); + + TouchSimulation.s_Instance = m_OldTouchSimulationInstance; + m_OldTouchSimulationInstance = null; + } + [UnityTest] [Category("Device Simulator")] public IEnumerator InputEventsArePropagated() @@ -65,6 +90,63 @@ public void TouchscreenAddedAndRemoved() Assert.IsFalse(touchscreen.added); } + [Test] + [Category("Device Simulator")] + public void TouchSimulationDoesNotQueueTouchesWhileSimulatorIsOpen() + { + var mouse = InputSystem.AddDevice(); + TouchSimulation.Enable(); + + var plugin = new InputSystemPlugin(); + plugin.OnCreate(); + + Press(mouse.leftButton); + + Assert.That(TouchSimulation.instance.simulatedTouchscreen.touches[0].isInProgress, Is.False); + + plugin.OnDestroy(); + } + + [Test] + [Category("Device Simulator")] + public void TouchInProgressWhenSimulatorOpens_IsCanceled() + { + var mouse = InputSystem.AddDevice(); + TouchSimulation.Enable(); + var simulatedTouchscreen = TouchSimulation.instance.simulatedTouchscreen; + + Press(mouse.leftButton); + Assert.That(simulatedTouchscreen.touches[0].isInProgress, Is.True); + + var plugin = new InputSystemPlugin(); + plugin.OnCreate(); + InputSystem.Update(); + + Assert.That(simulatedTouchscreen.touches[0].isInProgress, Is.False); + + // The release is swallowed by the early out, so the touch must not come back to life. + Release(mouse.leftButton); + Assert.That(simulatedTouchscreen.touches[0].isInProgress, Is.False); + + plugin.OnDestroy(); + } + + [Test] + [Category("Device Simulator")] + public void TouchSimulationQueuesTouchesAgainAfterSimulatorCloses() + { + var mouse = InputSystem.AddDevice(); + TouchSimulation.Enable(); + + var plugin = new InputSystemPlugin(); + plugin.OnCreate(); + plugin.OnDestroy(); + + Press(mouse.leftButton); + + Assert.That(TouchSimulation.instance.simulatedTouchscreen.touches[0].isInProgress, Is.True); + } + [Test] [Category("Device Simulator")] public void ConflictingDevicesAreNotDisabledOnCreate() diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 8b84942d50..f76e95292a 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed +- Fixed a single click producing two simultaneous touches when the Device Simulator view is open and "Simulate Touch Input From Mouse or Pen" is enabled in the Input Debugger; Touch Simulation now suppresses its events while a Device Simulator view is open [UUM-153420] - Fixed the search field in the "Add supported device" popup (Input System Package Settings > Supported Devices > "+") drawing flush against the popup's left edge with no left margin, unlike its right-side spacing; it is now inset to match [UUM-150217](https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-150217) - Fixed the "Supported Devices" list in the Input System Package Settings sitting flush against the panel edge with no left/right margin, unlike the surrounding fields; it is now inset to line up with the other settings controls [UUM-150207](https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-150207) - Fixed the Inspector help button for a selected `.inputactions` asset ("Open Reference for Input Action Importer") opening a missing documentation page; it now links to the Action Assets manual page [UUM-149518](https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-149518) diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDebuggerWindow.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDebuggerWindow.cs index 6832442482..6147d0eb30 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDebuggerWindow.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDebuggerWindow.cs @@ -326,7 +326,10 @@ private void DrawToolbarGUI() ToggleAddDevicesNotSupportedByProject); menu.AddItem(Contents.diagnosticsModeContent, InputSystem.manager.m_Diagnostics != null, ToggleDiagnosticMode); - menu.AddItem(Contents.touchSimulationContent, InputEditorUserSettings.simulateTouch, ToggleTouchSimulation); + if (InputSystemPlugin.isSimulatorActive) + menu.AddDisabledItem(Contents.touchSimulationSuppressedBySimulatorContent, InputEditorUserSettings.simulateTouch); + else + menu.AddItem(Contents.touchSimulationContent, InputEditorUserSettings.simulateTouch, ToggleTouchSimulation); // Add the inverse of "Copy Device Description" which adds a device with the description from // the clipboard to the system. This is most useful for debugging and makes it very easy to @@ -380,6 +383,7 @@ private static class Contents { public static readonly GUIContent optionsContent = new GUIContent("Options"); public static readonly GUIContent touchSimulationContent = new GUIContent("Simulate Touch Input From Mouse or Pen"); + public static readonly GUIContent touchSimulationSuppressedBySimulatorContent = new GUIContent("Simulate Touch Input From Mouse or Pen (events suppressed by Device Simulator view)"); public static readonly GUIContent pasteDeviceDescriptionAsDevice = new GUIContent("Paste Device Description as Device"); public static readonly GUIContent addDevicesNotSupportedByProjectContent = new GUIContent("Add Devices Not Listed in 'Supported Devices'"); public static readonly GUIContent diagnosticsModeContent = new GUIContent("Enable Event Diagnostics"); diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/DeviceSimulator/InputSystemPlugin.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/DeviceSimulator/InputSystemPlugin.cs index c3a18612ec..a3ce412c48 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/DeviceSimulator/InputSystemPlugin.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/DeviceSimulator/InputSystemPlugin.cs @@ -14,6 +14,9 @@ internal class InputSystemPlugin : DeviceSimulatorPlugin { internal Touchscreen SimulatorTouchscreen; + // The Input Debugger reads this to show its touch simulation toggle as unavailable. + internal static bool isSimulatorActive => EnhancedTouch.TouchSimulation.s_DeviceSimulatorCount > 0; + private bool m_InputSystemEnabled; private bool m_Quitting; private bool m_ConflictingDevicesDisabled; @@ -41,6 +44,8 @@ public override void OnCreate() deviceSimulator.touchScreenInput += OnTouchEvent; InputSystem.onDeviceChange += OnDeviceChange; + EnhancedTouch.TouchSimulation.IncreaseDeviceSimulatorCount(); + SimulatorTouchscreen = InputSystem.AddDevice("Device Simulator Touchscreen"); } } @@ -179,6 +184,8 @@ public override void OnDestroy() InputSystem.RemoveDevice(SimulatorTouchscreen); SetConflictingDevicesDisabled(false); + + EnhancedTouch.TouchSimulation.DecreaseDeviceSimulatorCount(); m_RootElement = null; } } diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/EnhancedTouch/TouchSimulation.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/EnhancedTouch/TouchSimulation.cs index 9fd02205e0..4b3e4cf855 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/EnhancedTouch/TouchSimulation.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/EnhancedTouch/TouchSimulation.cs @@ -120,6 +120,13 @@ private unsafe void OnEvent(InputEventPtr eventPtr, InputDevice device) return; } + if (s_DeviceSimulatorCount > 0) + { + // The Device Simulator supplies its own Touchscreen, so simulating a second one + // would report every touch twice + return; + } + var pointerIndex = m_Pointers.IndexOfReference(device, m_NumPointers); if (pointerIndex < 0) return; @@ -334,6 +341,42 @@ private unsafe void UpdateTouch(int touchIndex, int pointerIndex, TouchPhase pha internal static TouchSimulation s_Instance; + // Kept in sync by the Device Simulator plugin for every simulator window it has open. + internal static int s_DeviceSimulatorCount; + + internal static void IncreaseDeviceSimulatorCount() + { + ++s_DeviceSimulatorCount; + + // Touches in progress would never see their release once OnEvent starts early-ing out. + if (s_DeviceSimulatorCount == 1 && s_Instance != null) + s_Instance.CancelAllTouches(); + } + + internal static void DecreaseDeviceSimulatorCount() + { + Debug.Assert(s_DeviceSimulatorCount > 0, "Device Simulator count decreased more often than it was increased"); + --s_DeviceSimulatorCount; + } + + private void CancelAllTouches() + { + if (m_Touches == null || simulatedTouchscreen == null || !simulatedTouchscreen.added) + return; + + for (var i = 0; i < m_Touches.Length; ++i) + { + if (m_Touches[i] == null) + continue; + + var pointerIndex = m_Pointers.IndexOfReference(m_Touches[i].device, m_NumPointers); + if (pointerIndex < 0) + continue; + + UpdateTouch(i, pointerIndex, TouchPhase.Canceled); + } + } + ////TODO: Remove IInputStateChangeMonitor from this class when we can break the API void IInputStateChangeMonitor.NotifyControlStateChanged(InputControl control, double time, InputEventPtr eventPtr, long monitorIndex) { diff --git a/Tools/CI/InputSystem.Cookbook.csproj b/Tools/CI/InputSystem.Cookbook.csproj index 08911f2563..3abf6e0304 100644 --- a/Tools/CI/InputSystem.Cookbook.csproj +++ b/Tools/CI/InputSystem.Cookbook.csproj @@ -8,7 +8,7 @@ - + diff --git a/Tools/CI/Settings/InputSystemSettings.cs b/Tools/CI/Settings/InputSystemSettings.cs index 5f4e5125d1..820630f4df 100644 --- a/Tools/CI/Settings/InputSystemSettings.cs +++ b/Tools/CI/Settings/InputSystemSettings.cs @@ -77,7 +77,14 @@ public class InputSystemSettings : AnnotatedSettingsBase ReleaseOptions = new ReleaseOptions() { IsReleasing = true }, ValidationOptions = new ValidationOptions() { - AdditionalUtrArguments = ["--coverage-pkg-version=1.3.0"] + AdditionalUtrArguments = ["--coverage-pkg-version=1.3.0"], + + // The packed test project carries only PlayMode tests, so the EditMode run is + // always empty and UTR fails a run that selected no tests. + HostsWhereZeroEditmodeTestsAreAllowed = new HashSet + { + HostPlatform.Windows, HostPlatform.MacOS, HostPlatform.Ubuntu + } }, PackJobOptions = new PackJobOptions() {