Fix yamato bokken images and perf tests (#6032)

* Updated yamato CI to use updated bokken images.

* Fixed performance tests.

.yamato/com.unity.ml-agents-performance.yml

@@ -7,16 +7,16 @@ Run_Mac_Perfomance_Tests{{ editor.version }}:
   name: Run Mac Performance Tests {{ editor.version }}
   agent:
     type: Unity::VM::osx
-    image: package-ci/mac:stable
-    flavor: b1.small
+    image: package-ci/macos-13:v4
+    flavor: b1.large
   variables:
     UNITY_VERSION: {{ editor.version }}
   commands:
     - python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
     - unity-downloader-cli -u {{ editor.version }} -c editor --wait --fast
     - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
     - chmod +x ./utr
-    - ./utr --suite=editor --platform=StandaloneOSX --editor-location=.Editor --testproject=DevProject --artifacts_path=build/test-results --report-performance-data --performance-project-id=com.unity.ml-agents --zero-tests-are-ok=1
+    - ./utr --suite=editor --platform=StandaloneOSX --editor-location=.Editor --testproject=PerformanceProject --artifacts_path=build/test-results --report-performance-data --performance-project-id=com.unity.ml-agents --zero-tests-are-ok=1
   triggers:
     cancel_old_ci: true
     recurring:

.yamato/com.unity.ml-agents-promotion.yml

@@ -3,7 +3,7 @@ test_editors:
 test_platforms:
   - name: win
     type: Unity::VM
-    image: package-ci/win10:stable
+    image: package-ci/win11:v4
     flavor: b1.large
 ---
 
@@ -43,7 +43,7 @@ promote:
   name: Promote to Production
   agent:
     type: Unity::VM
-    image: package-ci/win10:stable
+    image: package-ci/win11:v4
     flavor: b1.large
   variables:
     UPMCI_PROMOTION: 1

.yamato/com.unity.ml-agents-publish.yml

@@ -2,7 +2,7 @@ publish:
   name: Publish ML-Agents to Internal Registry
   agent:
     type: Unity::VM
-    image: package-ci/win10:stable
+    image: package-ci/win11:v4
     flavor: b1.large
   variables:
     UPMCI_ENABLE_PACKAGE_SIGNING: 1

.yamato/com.unity.ml-agents-test.yml

@@ -16,11 +16,11 @@ trunk_editor:
 test_platforms:
     - name: win
       type: Unity::VM
-      image: package-ci/win10:stable
+      image: package-ci/win11:v4
       flavor: b1.large
     - name: mac
       type: Unity::VM::osx
-      image: package-ci/mac:stable
+      image: package-ci/macos-13:v4
       flavor: b1.large
     - name: linux
       type: Unity::VM

DevProject/Packages/manifest.json

@@ -8,7 +8,7 @@
     "com.unity.package-manager-doctools": "3.0.0-preview",
     "com.unity.package-validation-suite": "0.59.0-preview",
     "com.unity.test-framework": "1.1.33",
-    "com.unity.test-framework.performance": "2.2.0-preview",
+    "com.unity.test-framework.performance": "3.0.3",
     "com.unity.testtools.codecoverage": "1.2.4",
     "com.unity.modules.imageconversion": "1.0.0",
     "com.unity.modules.physics": "1.0.0",

DevProject/Packages/packages-lock.json

@@ -55,7 +55,7 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.sentis": "1.3.0-pre.1",
+        "com.unity.sentis": "1.3.0-pre.2",
         "com.unity.modules.imageconversion": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0",
         "com.unity.modules.physics": "1.0.0"
@@ -105,7 +105,7 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.sentis": {
-      "version": "1.3.0-pre.1",
+      "version": "1.3.0-pre.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -141,12 +141,12 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.test-framework.performance": {
-      "version": "2.2.0-preview",
+      "version": "3.0.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.test-framework": "1.1.0",
-        "com.unity.nuget.newtonsoft-json": "2.0.0-preview"
+        "com.unity.test-framework": "1.1.31",
+        "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },

PerformanceProject/.gitignore

@@ -0,0 +1,71 @@
+/[Ll]ibrary/
+/Logs/
+/[Tt]emp/
+/[Oo]bj/
+/[Bb]uild/
+/[Bb]uilds/
+/Assets/AssetStoreTools*
+/Assets/Plugins*
+/Assets/Demonstrations*
+/Assets/ML-Agents/Timers*
+/csharp_timers.json
+/CodeCoverage/
+
+# Environemnt logfile
+*Project.log
+
+# Visual Studio 2015 cache directory
+/.vs/
+
+# Autogenerated VS/MD/Consulo solution and project files
+/ProjectExportedObj/
+/Project.consulo/
+*.csproj
+*.unityproj
+*.sln
+*.suo
+*.tmp
+*.user
+*.userprefs
+*.pidb
+*.booproj
+*.svd
+*.pdb
+
+# Unity3D generated meta files
+*.pidb.meta
+
+# Unity3D Generated File On Crash Reports
+/sysinfo.txt
+
+# Builds
+*.apk
+*.unitypackage
+*.app
+*.exe
+*.x86_64
+*.x86
+
+# Plugins
+/Assets/VideoRecorder*
+
+# Mac hidden files
+*.DS_Store
+*/.ipynb_checkpoints
+*/.idea
+*.pyc
+*.idea/misc.xml
+*.idea/modules.xml
+*.idea/
+*.iml
+*.cache
+*/build/
+*/dist/
+*.egg-info*
+*.eggs*
+*.gitignore.swp
+
+# VSCode hidden files
+*.vscode/
+
+.DS_Store

PerformanceProject/Assets/ML-Agents/Scripts/Tests/Editor/MLAgentsExamples.Tests.Performance.asmdef

@@ -0,0 +1,26 @@
+{
+    "name": "MLAgentsExamples.Tests.Performance",
+    "rootNamespace": "",
+    "references": [
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner",
+        "Unity.PerformanceTesting",
+        "Unity.PerformanceTesting.Editor",
+        "Unity.ML-Agents"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

DevProject/Assets/ML-Agents/Scripts/Tests/Editor/Performance/SensorPerformanceTests.cs → PerformanceProject/Assets/ML-Agents/Scripts/Tests/Editor/Performance/SensorPerformanceTests.cs

@@ -193,3 +193,4 @@ public void TestObservablePropertyAgentMarkers()
         }
     }
 }
+