FIX: CI Sample Test project failure & MacOS failures

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

@@ -226,24 +226,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: git clone --branch "2.3.0-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 --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

@@ -226,24 +226,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: git clone --branch "2.3.0-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

@@ -226,24 +226,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: git clone --branch "2.3.0-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

@@ -226,24 +226,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: git clone --branch "2.3.0-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

@@ -226,24 +226,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: git clone --branch "2.3.0-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

@@ -226,24 +226,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: git clone --branch "2.3.0-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,11 +5,15 @@ 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/
+    - curl -fsSL https://dot.net/v1/dotnet-install.sh -o /tmp/dotnet-install.sh
+    - sudo bash /tmp/dotnet-install.sh --channel 6.0 --runtime dotnet --install-dir /usr/local/share/dotnet
+    - sudo bash /tmp/dotnet-install.sh --channel 8.0 --runtime dotnet --install-dir /usr/local/share/dotnet
+    - ls /usr/local/share/dotnet/shared/ 2>&1 || echo "WARNING dotnet shared directory not found"
     - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
     - Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=DryRun sh ExternalSampleProjects/publish.sh 
   triggers:

.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/package-pack-jobs.yml

@@ -33,3 +33,28 @@ package_pack_-_inputsystem:
     Job Maintainers: '#rm-packageworks'
     Wrench: 3.2.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
+    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
+    timeout: 20
+    retries: 10
+  - command: upm-ci package pack --package-path Packages/com.unity.package-manager-doctools
+  - command: cp upm-ci~/packages/packages.json upm-ci~/packages/com.unity.package-manager-doctools_packages.json
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+  artifacts:
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+  variables:
+    UPMCI_ACK_LARGE_PACKAGE: 1
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 3.2.1.0
+

.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: