Updated model handling in desktop standalone tests

Author: michalChrobot

.yamato/desktop-standalone-tests.yml

@@ -73,12 +73,12 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
     type: {% if platform.name == "mac" %} {{ platform.type }} {% else %} {{ platform.type }}::GPU {% endif %}
     image: {{ platform.image }}
     flavor: {{ platform.flavor }}
-{% if platform.model %}
-    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% if platform.name == mac %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile). In this case it's specifically for macOS (if used for win/ubuntu then it will cause rust server to fail connecting)
 {% endif %}
 
 # Set additional variables for running the echo server (This is needed ONLY for NGOv2.X because relates to Distributed Authority)
-{% if platform.name == "ubuntu" %} # Issues with win and mac are tracked in MTT-11606
+{% if platform.name != "win" %} # Issues with win and mac are tracked in MTT-11606
   variables:
     ECHO_SERVER_PORT: "7788"
     # Set this to ensure the DA codec tests will fail if they cannot connect to the echo-server
@@ -91,7 +91,7 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
     - UnifiedTestRunner --suite=playmode --player-load-path=build/players --artifacts-path=test-results --testproject={{ project.path }} --editor-location=.Editor --playergraphicsapi=Null --fail-on-assert --reruncount=1 --clean-library-on-rerun --timeout=1800
 
 # If ubuntu, run rust echo server (This is needed ONLY for NGOv2.X because relates to Distributed Authority)
-{% if platform.name == "ubuntu" %} # Issues with win and mac are tracked in MTT-11606
+{% if platform.name != "win" %} # Issues with win and mac are tracked in MTT-11606
     - git clone https://github.com/Unity-Technologies/mps-common-multiplayer-backend.git
     # Install rust
     - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y