FIX: CI MacOS failures

.yamato/input-system-editor-functional-tests.yml

@@ -246,26 +246,6 @@ inputsystem-editorfunctionaltests_-_6000_6_-_win10:
       paths:
       - artifacts/**/*
 
-# InputSystem-EditorFunctionalTests - 6000.7 - MacOs13
-inputsystem-editorfunctionaltests_-_6000_7_-_macos13:
-  name: InputSystem-EditorFunctionalTests - 6000.7 - 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 trunk -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.7_project;flags:inputsystem_MacOS_6000.7_project" --timeout=3600 --artifacts-path=artifacts
-  after:
-  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
-  artifacts:
-    artifacts:
-      paths:
-      - artifacts/**/*
-
 # InputSystem-EditorFunctionalTests - 6000.7 - MacOs13Arm
 inputsystem-editorfunctionaltests_-_6000_7_-_macos13arm:
   name: InputSystem-EditorFunctionalTests - 6000.7 - MacOs13Arm

.yamato/input-system-editor-performance-tests.yml

@@ -234,25 +234,6 @@ inputsystem-editorperformancetests_-_6000_6_-_win10:
       paths:
       - artifacts/**/*
 
-# InputSystem-EditorPerformanceTests - 6000.7 - MacOs13
-inputsystem-editorperformancetests_-_6000_7_-_macos13:
-  name: InputSystem-EditorPerformanceTests - 6000.7 - 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 trunk -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.7 - MacOs13Arm
 inputsystem-editorperformancetests_-_6000_7_-_macos13arm:
   name: InputSystem-EditorPerformanceTests - 6000.7 - MacOs13Arm

.yamato/input-system-standalone-functional-tests.yml

@@ -234,25 +234,6 @@ inputsystem-standalonefunctionaltests_-_6000_6_-_win10:
       paths:
       - artifacts/**/*
 
-# InputSystem-StandaloneFunctionalTests - 6000.7 - MacOs13
-inputsystem-standalonefunctionaltests_-_6000_7_-_macos13:
-  name: InputSystem-StandaloneFunctionalTests - 6000.7 - 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 trunk -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.7 - MacOs13Arm
 inputsystem-standalonefunctionaltests_-_6000_7_-_macos13arm:
   name: InputSystem-StandaloneFunctionalTests - 6000.7 - MacOs13Arm

.yamato/input-system-standalone-il2-cpp-functional-tests.yml

@@ -234,25 +234,6 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_win10:
       paths:
       - artifacts/**/*
 
-# InputSystem-StandaloneIl2CppFunctionalTests - 6000.7 - MacOs13
-inputsystem-standaloneil2cppfunctionaltests_-_6000_7_-_macos13:
-  name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.7 - 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 trunk -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.7 - MacOs13Arm
 inputsystem-standaloneil2cppfunctionaltests_-_6000_7_-_macos13arm:
   name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.7 - MacOs13Arm

.yamato/input-system-standalone-il2-cpp-performance-tests.yml

@@ -234,25 +234,6 @@ inputsystem-standaloneil2cppperformancetests_-_6000_6_-_win10:
       paths:
       - artifacts/**/*
 
-# InputSystem-StandaloneIl2CppPerformanceTests - 6000.7 - MacOs13
-inputsystem-standaloneil2cppperformancetests_-_6000_7_-_macos13:
-  name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.7 - 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 trunk -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.7 - MacOs13Arm
 inputsystem-standaloneil2cppperformancetests_-_6000_7_-_macos13arm:
   name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.7 - MacOs13Arm

.yamato/input-system-standalone-performance-tests.yml

@@ -234,25 +234,6 @@ inputsystem-standaloneperformancetests_-_6000_6_-_win10:
       paths:
       - artifacts/**/*
 
-# InputSystem-StandalonePerformanceTests - 6000.7 - MacOs13
-inputsystem-standaloneperformancetests_-_6000_7_-_macos13:
-  name: InputSystem-StandalonePerformanceTests - 6000.7 - 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 trunk -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.7 - MacOs13Arm
 inputsystem-standaloneperformancetests_-_6000_7_-_macos13arm:
   name: InputSystem-StandalonePerformanceTests - 6000.7 - MacOs13Arm

.yamato/test-samples.yml

@@ -5,8 +5,8 @@ test_sample_projects_{{ editor.version }}:
   name : Test Sample Projects {{ editor.version }}
   agent:
     type: Unity::VM::osx
-    image: package-ci/macos-12:default
-    flavor: m1.mac
+    image: package-ci/macos-13:v4
+    flavor: b1.xlarge
   commands:
     - {{ upm_ci_install }}
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/

.yamato/triggers.yml

@@ -19,7 +19,6 @@ all_functional_tests:
   - 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-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_7_-_macos13
   - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_7_-_macos13arm
   - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_7_-_ubuntu2204
   - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_7_-_win10
@@ -55,7 +54,6 @@ all_functional_tests:
   - 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
-  - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_7_-_macos13
   - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_7_-_macos13arm
   - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_7_-_ubuntu2204
   - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_7_-_win10
@@ -67,7 +65,6 @@ all_functional_tests:
   - 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/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_7_-_macos13
   - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_7_-_macos13arm
   - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_7_-_win10
   - path: .yamato/wrench/promotion-jobs.yml#publish_dry_run_inputsystem
@@ -93,7 +90,6 @@ all_performance_tests:
   - 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-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_7_-_macos13
   - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_7_-_macos13arm
   - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_7_-_ubuntu2204
   - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_7_-_win10
@@ -129,7 +125,6 @@ all_performance_tests:
   - 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
-  - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_7_-_macos13
   - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_7_-_macos13arm
   - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_7_-_ubuntu2204
   - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_7_-_win10
@@ -145,7 +140,6 @@ all_performance_tests:
   - 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
-  - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_7_-_macos13
   - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_7_-_macos13arm
   - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_7_-_ubuntu2204
   - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_7_-_win10

.yamato/wrench/promotion-jobs.yml

@@ -151,16 +151,6 @@ publish_dry_run_inputsystem:
       UTR:
         location: results/UTR/validate-inputsystem-6000.6-win10
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_7_-_macos13
-    specific_options:
-      packages:
-        ignore_artifact: true
-      pvp-results:
-        location: results/pvp/validate-inputsystem-6000.7-macos13
-        unzip: true
-      UTR:
-        location: results/UTR/validate-inputsystem-6000.7-macos13
-        unzip: true
   - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_7_-_macos13arm
     specific_options:
       packages:
@@ -343,16 +333,6 @@ publish_inputsystem:
       UTR:
         location: results/UTR/validate-inputsystem-6000.6-win10
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_7_-_macos13
-    specific_options:
-      packages:
-        ignore_artifact: true
-      pvp-results:
-        location: results/pvp/validate-inputsystem-6000.7-macos13
-        unzip: true
-      UTR:
-        location: results/UTR/validate-inputsystem-6000.7-macos13
-        unzip: true
   - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_7_-_macos13arm
     specific_options:
       packages:

.yamato/wrench/validation-jobs.yml

@@ -883,79 +883,6 @@ validate_-_inputsystem_-_6000_6_-_win10:
   labels:
   - Packages:inputsystem
 
-# PVP Editor and Playmode tests for Validate - inputsystem - 6000.7 - macos13 (6000.7 - MacOS).
-validate_-_inputsystem_-_6000_7_-_macos13:
-  name: Validate - inputsystem - 6000.7 - 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 trunk -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.7;flags:inputsystem_MacOS_6000.7" --coverage-pkg-version=1.3.0
-    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.7 - macos13arm (6000.7 - MacOS).
 validate_-_inputsystem_-_6000_7_-_macos13arm:
   name: Validate - inputsystem - 6000.7 - macos13arm