Unity-Technologies · becksebenius-unity · Aug 4, 2021 · Jul 29, 2021 · Jul 29, 2021 · Jul 29, 2021
diff --git a/.yamato/_run-all.yml b/.yamato/_run-all.yml
@@ -5,11 +5,11 @@ run_all_tests:
   dependencies:
     # Pull in package and validate jobs through the badges job
     - .yamato/_triggers.yml#badges_test_trigger
-{% for editor in test_editors -%}
 {% for platform in test_platforms -%}
 {% for project in projects -%}
+{% for editor in project.test_editors -%}
 {% for package in project.packages -%}
-    - .yamato/package-tests.yml#test_{{ package.name }}_{{ editor }}_{{ platform.name }}
+    - .yamato/package-tests.yml#test_{{ project.name}}_{{ package.name }}_{{ editor }}_{{ platform.name }}
 {% endfor -%}
     - .yamato/project-tests.yml#test_{{ project.name }}_{{ editor }}_{{ platform.name }}
 {% endfor -%}
@@ -21,9 +21,9 @@ all_project_tests:
   dependencies:
     # Pull in package and validate jobs through the badges job
     - .yamato/_triggers.yml#badges_test_trigger
-{% for editor in test_editors -%}
 {% for platform in test_platforms -%}
 {% for project in projects -%}
+{% for editor in project.test_editors -%}
     - .yamato/project-tests.yml#test_{{ projects.first.name }}_{{ editor }}_{{ platform.name }}
 {% endfor -%}
 {% endfor -%}
@@ -34,11 +34,11 @@ all_package_tests:
   dependencies:
     # Pull in package and validate jobs through the badges job
     - .yamato/_triggers.yml#badges_test_trigger
-{% for editor in test_editors -%}
 {% for platform in test_platforms -%}
 {% for project in projects -%}
+{% for editor in test_editors -%}
 {% for package in project.packages -%}
-    - .yamato/package-tests.yml#test_{{ package.name }}_{{ editor }}_{{ platform.name }}
+    - .yamato/package-tests.yml#test_{{ project.name}}_{{ package.name }}_{{ editor }}_{{ platform.name }}
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}

diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml
@@ -22,11 +22,15 @@ pull_request_trigger:
     - .yamato/project-standards.yml#standards_{{ projects.first.name }}
 {% for project in projects -%}
 {% for package in project.packages -%}
-    - .yamato/project-tests.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
+{% if project.validate == "true" -%}
+    - .yamato/project-tests.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
+{% endif -%}
+{% endfor -%}
 {% for platform in test_platforms -%}
-    - .yamato/package-tests.yml#test_{{ package.name }}_{{ test_editors.first }}_{{ platform.name }}
-    - .yamato/project-tests.yml#test_{{ project.name }}_{{ test_editors.first }}_{{ platform.name }}
+{% for package in project.packages -%}
+    - .yamato/package-tests.yml#test_{{ project.name }}_{{ package.name }}_{{ project.test_editors.first }}_{{ platform.name }}
 {% endfor -%}
+    - .yamato/project-tests.yml#test_{{ project.name }}_{{ project.test_editors.first }}_{{ platform.name }}
 {% endfor -%}
 {% endfor -%}
   triggers:
@@ -59,10 +63,12 @@ badges_test_trigger:
   dependencies:
 {% for project in projects -%}
 {% for package in project.packages -%}
-    - .yamato/project-tests.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
-{% for editor in test_editors -%}
+{% if project.validate == "true" -%}
+    - .yamato/project-tests.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
+{% endif -%}
+{% for editor in project.test_editors -%}
 {% for platform in test_platforms -%}
-    - .yamato/package-tests.yml#test_{{ package.name }}_{{ editor }}_{{ platform.name }}
+    - .yamato/package-tests.yml#test_{{ project.name }}_{{ package.name }}_{{ editor }}_{{ platform.name }}
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}

diff --git a/.yamato/package-tests.yml b/.yamato/package-tests.yml
@@ -5,24 +5,26 @@
 # to generate its independent package tests and validation tests.
 # The idea is to only run validation once per package and not mix.
 # the results with package tests
-{% for package in projects.first.packages -%}
-{% for editor in test_editors -%}
+{% for project in projects -%}
+{% for package in project.packages -%}
+{% for editor in project.test_editors -%}
 {% for platform in test_platforms -%}
-test_{{  package.name }}_{{ editor }}_{{ platform.name }}:
-  name : {{ package.name }} package tests - {{ editor }} on {{ platform.name }}
+test_{{project.name}}_{{  package.name }}_{{ editor }}_{{ platform.name }}:
+  name : {{ project.name }} - {{ package.name }} package tests - {{ editor }} on {{ platform.name }}
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}
     flavor: {{ platform.flavor}}
   commands:
     - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ editor }} --type package-tests --project-path {{ projects.first.name }} --package-filter {{ package.name }}
+    - {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ editor }} --type package-tests --project-path {{ project.name }} --package-filter {{ package.name }}
   artifacts:
     logs:
       paths:
         - "upm-ci~/test-results/**/*"
   dependencies:
-    - .yamato/project-pack.yml#pack_{{ projects.first.name }}
+    - .yamato/project-pack.yml#pack_{{ project.name }}
+{% endfor -%}
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}
diff --git a/.yamato/project-promotion.yml b/.yamato/project-promotion.yml
@@ -4,8 +4,8 @@
 {% for package in project.packages -%}
 # Validation job for package {{ package.name }}, only using the first entry in the
 # platform and editor meta data
-promotion_validate_{{ project.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}:
-  name : Validate Project {{ project.name }} - Package {{ package.name }} - {{ test_editors.first }} on {{ test_platforms.first.name }}
+promotion_validate_{{ project.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}:
+  name : Validate Project {{ project.name }} - Package {{ package.name }} - {{ validation_editor }} on {{ test_platforms.first.name }}
   agent:
     type: {{ test_platforms.first.type }}
     image: {{ test_platforms.first.image }}
@@ -14,7 +14,7 @@ promotion_validate_{{ project.name }}_{{ package.name }}_{{ test_platforms.first
     UPMCI_PROMOTION: 1
   commands:
     - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - upm-ci project test -u {{ test_editors.first }} --project-path {{ project.path }} --type vetting-tests --project-path {{ project.path }} --package-filter {{ package.name }}
+    - upm-ci project test -u {{ validation_editor }} --project-path {{ project.path }} --type vetting-tests --project-path {{ project.path }} --package-filter {{ package.name }}
   artifacts:
     logs:
       paths:
@@ -39,7 +39,7 @@ promote_{{ project.name }}_{{ package.name }}:
         - "upm-ci~/packages/*.tgz"
   dependencies:
     - .yamato/project-pack.yml#pack_{{ project.name }}
-    - .yamato/project-promotion.yml#promotion_validate_{{ project.name }}_{{ project.packages.first.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
+    - .yamato/project-promotion.yml#promotion_validate_{{ project.name }}_{{ project.packages.first.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
 
 {% endfor -%}
 
@@ -60,5 +60,5 @@ promote_{{ project.name }}:
         - "upm-ci~/packages/*.tgz"
   dependencies:
     - .yamato/project-pack.yml#pack_{{ project.name }}
-    - .yamato/project-promotion.yml#promotion_validate_{{ project.packages.first.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
+    - .yamato/project-promotion.yml#promotion_validate_{{ project.packages.first.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
 {% endfor -%}
diff --git a/.yamato/project-publish.yml b/.yamato/project-publish.yml
@@ -17,8 +17,8 @@ publish_{{ project.name }}_{{ package.name }}:
         - "upm-ci~/packages/*.tgz"
   dependencies:
     - .yamato/project-pack.yml#pack_{{ project.name }}
-    - .yamato/project-tests.yml#validate_{{ project.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
-{% for editor in test_editors -%}
+    - .yamato/project-tests.yml#validate_{{ project.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
+{% for editor in project.test_editors -%}
 {% for platform in test_platforms -%}
     - .yamato/project-tests.yml#test_{{ project.name }}_{{ package.name }}_{{ platform.name }}_{{ editor }}
 {% endfor -%}

diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml
@@ -11,6 +11,6 @@ standards_{{ projects.first.name }}:
     - $HOME/.dotnet/tools/dotnet-format --version
     - python3 --version
     - pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - unity-downloader-cli -u {{ test_editors.first }} -c editor --wait --fast
+    - unity-downloader-cli -u {{ projects.first.test_editors.first }} -c editor --wait --fast
     - .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ projects.first.path }} -quit
     - ./standards.py --tool-path $HOME/.dotnet/tools/dotnet-format --project-path {{ projects.first.path }} --yamato
diff --git a/.yamato/project-tests.yml b/.yamato/project-tests.yml
@@ -6,30 +6,32 @@
 # Validation only occurs in editmode.
 
 {% for project in projects -%}
+{% if project.validate == "true" %}
 {% for package in project.packages -%}
-validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}:
-  name : Validate Package {{ package.name }} - {{ test_editors.first }} on {{ test_platforms.first.name }}
+validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}:
+  name : Validate Package {{ package.name }} - {{ validation_editor }} on {{ test_platforms.first.name }}
   agent:
     type: {{ test_platforms.first.type }}
     image: {{ test_platforms.first.image }}
     flavor: {{ test_platforms.first.flavor}}
   commands:
     - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ test_editors.first }} --type vetting-tests --project-path {{ project.path }} --package-filter {{ package.name }} --platform editmode
+    - {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ validation_editor }} --type vetting-tests --project-path {{ project.path }} --package-filter {{ package.name }} --platform editmode
   artifacts:
     logs:
       paths:
         - "upm-ci~/test-results/**/*"
   dependencies:
     - .yamato/project-pack.yml#pack_{{ project.name }}
 {% endfor -%}
+{% endif -%}
 {% endfor -%}
 
 # For every platform and editor version, run its project tests without
 # running package tests too since they are handled on their respective
 # jobs
 {% for project in projects -%}
-{% for editor in test_editors -%}
+{% for editor in project.test_editors -%}
 {% for platform in test_platforms -%}
 test_{{ project.name }}_{{ editor }}_{{ platform.name }}:
   name : {{ project.name }} project tests - {{ editor }} on {{ platform.name }}

diff --git a/.yamato/project-updated-dependencies-test.yml b/.yamato/project-updated-dependencies-test.yml
@@ -5,7 +5,7 @@
 # The idea is to only run validation once per package and not mix.
 # the results with package tests
 {% for package in projects.first.packages -%}
-{% for editor in test_editors -%}
+{% for editor in projects.first.test_editors -%}
 {% for platform in test_platforms -%}
 dependency_{{ projects.first.name }}_{{ package.name }}_{{ platform.name }}_{{ editor }}:
   name : Dependency Test of Project {{ projects.first.name }} - Package {{ package.name }} - {{ editor }} on {{ platform.name }}
@@ -51,7 +51,7 @@ dependency_test_trigger_{{ projects.first.name }}:
         frequency: 22 * * ?
   dependencies:
 {% for package in projects.first.packages -%}
-{% for editor in test_editors -%}
+{% for editor in projects.first.test_editors -%}
 {% for platform in test_platforms -%}
     - .yamato/project-updated-dependencies-test.yml#dependency_{{ projects.first.name }}_{{ package.name }}_{{ platform.name }}_{{ editor }}
 {% endfor -%}

diff --git a/.yamato/project.metafile b/.yamato/project.metafile
@@ -1,13 +1,4 @@
-# Editors where tests will happen. The first entry of this array is also used
-# for validation.
-#
-# Therefore, **do not** put an older V1-lifecycle ver. 
-#  like 2020.x or 2019.x on top of 'test_editors'
-test_editors:
-  - 2021.1
-  - 2021.2
-  - 2020.3
-  - trunk
+validation_editor: 2021.1
 
 # Platforms that will be tested. The first entry in this array will also
 # be used for validation
@@ -30,9 +21,21 @@ test_platforms:
 projects:
   - name: testproject
     path: testproject
+    validate: true
     # Packages within a project that will be tested
     packages:
       - name: com.unity.multiplayer.mlapi
         path: com.unity.multiplayer.mlapi
       - name: com.unity.multiplayer.transport.utp
         path: com.unity.multiplayer.transport.utp
+    test_editors:
+      - 2021.1
+      - 2021.2
+      - 2020.3
+      - trunk
+  - name: testproject-tools-integration
+    path: testproject-tools-integration
+    validate: false
+    test_editors:
+      - 2021.2
+      - trunk
diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Metrics/MessagingMetricsTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Metrics/MessagingMetricsTests.cs
@@ -1,3 +1,4 @@
+#if MULTIPLAYER_TOOLS
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -156,3 +157,4 @@ public IEnumerator TrackUnnamedMessageReceivedMetric()
         }
     }
 }
+#endif
diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs
@@ -1,3 +1,4 @@
+#if MULTIPLAYER_TOOLS
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -99,9 +100,9 @@ public IEnumerator TrackNetworkObjectDestroyReceivedMetric()
             yield return new WaitForSeconds(0.2f);
 
             var waitForMetricEvent = new WaitForMetricValues<ObjectDestroyedEvent>(ClientMetrics.Dispatcher, MetricNames.ObjectDestroyedReceived);
-            
+
             Server.SpawnManager.OnDespawnObject(m_NewNetworkObject, true);
-            
+
             yield return waitForMetricEvent.WaitForMetricsReceived();
 
             var objectDestroyedReceivedMetricValues = waitForMetricEvent.AssertMetricValuesHaveBeenFound();
@@ -195,3 +196,4 @@ public IEnumerator TrackMultipleNetworkObjectDestroySentMetric()
         }
     }
 }
+#endif
diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs
@@ -1,3 +1,4 @@
+#if MULTIPLAYER_TOOLS
 using System;
 using System.Collections;
 using System.Linq;
@@ -48,3 +49,4 @@ public IEnumerator TrackNetworkVariableDeltaReceivedMetric()
         }
     }
 }
+#endif
diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs
@@ -1,4 +1,5 @@
-using System;
+#if MULTIPLAYER_TOOLS
+using System;
 using System.Collections;
 using System.Linq;
 using MLAPI.Metrics;
@@ -60,4 +61,5 @@ public IEnumerator TrackOwnershipChangeReceivedMetric()
             Assert.AreEqual(2, ownershipChangeReceived.BytesCount);
         }
     }
-}
+}
+#endif
diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Metrics/RpcMetricsTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Metrics/RpcMetricsTests.cs
@@ -1,3 +1,4 @@
+#if MULTIPLAYER_TOOLS
 using System;
 using System.Collections;
 using System.Linq;
@@ -18,7 +19,7 @@ public IEnumerator TrackRpcSentMetricOnServer()
         {
             var clientPlayer = new MultiInstanceHelpers.CoroutineResultWrapper<NetworkObject>();
             yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation(x => x.IsPlayerObject && x.OwnerClientId == Client.LocalClientId, Server, clientPlayer));
-            
+
             var waitForMetricValues = new WaitForMetricValues<RpcEvent>(ServerMetrics.Dispatcher, MetricNames.RpcSent);
 
             clientPlayer.Result.GetComponent<RpcTestComponent>().MyClientRpc();
@@ -27,7 +28,7 @@ public IEnumerator TrackRpcSentMetricOnServer()
 
             var serverRpcSentValues = waitForMetricValues.AssertMetricValuesHaveBeenFound();
             Assert.AreEqual(2, serverRpcSentValues.Count); // Server will receive this, since it's host
-            
+
             Assert.That(serverRpcSentValues, Has.All.Matches<RpcEvent>(x => x.Name == nameof(RpcTestComponent.MyClientRpc)));
             Assert.That(serverRpcSentValues, Has.All.Matches<RpcEvent>(x => x.BytesCount != 0));
             Assert.Contains(Server.LocalClientId, serverRpcSentValues.Select(x => x.Connection.Id).ToArray());
@@ -39,7 +40,7 @@ public IEnumerator TrackRpcSentMetricOnClient()
         {
             var clientPlayer = new MultiInstanceHelpers.CoroutineResultWrapper<NetworkObject>();
             yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation(x => x.IsPlayerObject && x.OwnerClientId == Client.LocalClientId, Client, clientPlayer));
-            
+
             var waitForClientMetricsValues = new WaitForMetricValues<RpcEvent>(ClientMetrics.Dispatcher, MetricNames.RpcSent);
 
             clientPlayer.Result.GetComponent<RpcTestComponent>().MyServerRpc();
@@ -81,7 +82,7 @@ public IEnumerator TrackRpcReceivedMetricOnClient()
         {
             var clientPlayer = new MultiInstanceHelpers.CoroutineResultWrapper<NetworkObject>();
             yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.GetNetworkObjectByRepresentation(x => x.IsPlayerObject && x.OwnerClientId == Client.LocalClientId, Server, clientPlayer));
-            
+
             var waitForServerMetricsValues = new WaitForMetricValues<RpcEvent>(ServerMetrics.Dispatcher, MetricNames.RpcReceived);
 
             clientPlayer.Result.GetComponent<RpcTestComponent>().MyClientRpc();
@@ -98,3 +99,4 @@ public IEnumerator TrackRpcReceivedMetricOnClient()
         }
     }
 }
+#endif
diff --git a/com.unity.multiplayer.mlapi/Tests/Runtime/Metrics/ServerLogsMetricTests.cs b/com.unity.multiplayer.mlapi/Tests/Runtime/Metrics/ServerLogsMetricTests.cs
@@ -1,3 +1,4 @@
+#if MULTIPLAYER_TOOLS
 using System;
 using System.Collections;
 using System.Linq;
@@ -51,3 +52,4 @@ public IEnumerator TrackServerLogReceivedMetric()
         }
     }
 }
+#endif