Merge branch 'develop-2.0.0' into fix/networkanimator-allow-disabling-or-enabling-parameter-synch

Author: NoelStephensUnity

.pr_agent.toml

@@ -0,0 +1,2 @@
+[github_app]
+pr_commands = []

.yamato/_run-all.yml

@@ -263,7 +263,7 @@ run_all_project_tests_cmb_service:
 {% for platform in test_platforms.default -%}
 {% for editor in validation_editors.all -%}
 {% for backend in scripting_backends -%}
-    - .yamato/cmb_service_standalone_tests.yml#cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}
+    - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}
@@ -275,10 +275,8 @@ run_all_project_tests_cmb_service_trunk:
   dependencies:
 {% for project in projects.default -%}
 {% for platform in test_platforms.default -%}
-{% for editor in validation_editors.default -%}
 {% for backend in scripting_backends -%}
-    - .yamato/cmb_service_standalone_tests.yml#cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}
-{% endfor -%}
+    - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_trunk
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}
@@ -290,7 +288,7 @@ run_all_project_tests_cmb_service_6000:
 {% for project in projects.default -%}
 {% for platform in test_platforms.default -%}
 {% for backend in scripting_backends -%}
-    - .yamato/cmb_service_standalone_tests.yml#cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_6000.0
+    - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_6000.0
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}

.yamato/_triggers.yml

@@ -87,8 +87,10 @@ pr_code_changes_checks:
     # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
     # desktop_standalone_test and cmb_service_standalone_test are both reusing desktop_standalone_build dependency so we run those in the same configuration on PRs to reduce waiting time.
     # Note that our daily tests will anyway run both test configurations in "minimal supported" and "trunk" configurations
-    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_trunk
-    - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk
+
+    # TODO: Move these tests back to trunk once CMB Service has addressed https://jira.unity3d.com/browse/MTTB-1680
+    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_6000.4
+    - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_6000.4
   triggers:
     expression: |-
       (pull_request.comment eq "ngo" OR

.yamato/cmb-service-standalone-tests.yml

@@ -54,7 +54,7 @@ cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}
 
   commands:
     # run_cmb_service.sh builds and starts a release version of the full CMB service (along with the limited echo server)
-    - ./Tools/CI/run_cmb_service.sh -e $ECHO_SERVER_PORT -s $CMB_SERVICE_PORT
+    - ./Tools/CI/service.cmb/run_cmb_service.sh -e $ECHO_SERVER_PORT -s $CMB_SERVICE_PORT
 
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
     - UnifiedTestRunner --suite=playmode --player-load-path=build/players --artifacts-path=test-results --testproject={{ project.path }} --editor-location=.Editor --playergraphicsapi=Null --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }}

.yamato/ngo-publish.yml

@@ -4,7 +4,7 @@ ngo_release_preparation:
   triggers:
     recurring:
       - branch: develop-2.0.0 # We make new releases from this branch
-        frequency: weekly # Run at some point every Saturday. Note that it's restricted to every 4th Saturday inside the script
+        frequency: "10 * * 1" # Runs every Sunday at 10:00 AM
   rerun: always
   commands:
     - pip install PyGithub

.yamato/project-builders/builder.metafile

@@ -3,9 +3,10 @@
 NetcodeProjects:
     # Note that we are using internal Unity repo. This means that we may test with newest changes that are not yet released to our users (there are also public versions)
     # Note that for BossRoom 'main' branch supports NGOv1.X and 'develop' branch supports NGOv2.X
+    # TODO: For BossRoom correct branch to develop when PR-3736 is merged in their repo
     BossRoom:
         GithubRepo: "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git"
-        branch: develop
+        branch: ngo-playtest-update
         manifestPath: Packages/manifest.json
         projectPath: '.'
     Asteroids:

.yamato/project-updated-dependencies-test.yml

@@ -42,7 +42,28 @@ updated-dependencies_{{ project.name }}_NGO_{{ platform.name }}_{{ editor }}:
       paths:
         - "upm-ci~/test-results/**/*"
   dependencies:
-    - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
+    - .yamato/project-updated-dependencies-test.yml#project_pack_-_{{ project.name }}_{{ platform.name }}
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}
+  
+  
+# TODO: This job was removed on PR-3711 but the above job somehow can find proper artifacts with package pack job. 
+# This job should be removed when issue will be resolved since it's not used anywhere
+{% for project in projects.all -%}
+{% for platform in test_platforms.desktop -%}
+project_pack_-_{{ project.name }}_{{ platform.name }}:
+  name: Project Pack - {{ project.name }} [{{ 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 # upm-ci is not preinstalled on the image so we need to download it
+    - upm-ci project pack --project-path {{ project.path }}
+  artifacts:
+    packages:
+      paths:
+        - "upm-ci~/packages/**/*"
+{% endfor -%}
+{% endfor -%}

.yamato/project.metafile

@@ -162,6 +162,7 @@ validation_editors:
         - 6000.0
         - 6000.2
         - 6000.3
+        - 6000.4
         - trunk
     minimal:
         - 6000.0

.yamato/wrench/api-validation-jobs.yml

@@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.2.0.0
+    UPMPVP_CONTEXT_WRENCH: 1.3.0.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.2.0.0
+    Wrench: 1.3.0.0
 

.yamato/wrench/package-pack-jobs.yml

@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
     UPMCI_ACK_LARGE_PACKAGE: 1
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.2.0.0
+    Wrench: 1.3.0.0