Merge pull request #153 from Unity-Technologies/update-ci-versions

Update CI versions

Author: aurimasc

.yamato/upm-ci.yml

@@ -1,21 +1,15 @@
 test_editors:
   - version: trunk
+  - version: 2022.1
   - version: 2021.2
-  - version: 2021.1
   - version: 2020.3
   - version: 2019.4
 
-# running test is currently broken in trunk and 2021.2
-android_test_editors:
-  - version: 2021.1
-  - version: 2020.3
-  - version: 2019.4
-
-# Some issues with 2019.4 on iOS on Yamato, but passes locally
+# 2019.4 fails due to issue unrelated to package
 ios_test_editors:
   - version: trunk
+  - version: 2022.1
   - version: 2021.2
-  - version: 2021.1
   - version: 2020.3
 
 test_platforms:
@@ -85,7 +79,7 @@ test_{{ platform.name }}_{{ editor.version }}:
 {% endfor %}
 {% endfor %}
 
-{% for editor in android_test_editors %}
+{% for editor in test_editors %}
 test_Android_{{ editor.version }}:
   name: Test {{ editor.version }} on Android
   agent:
@@ -104,10 +98,11 @@ test_Android_{{ editor.version }}:
     - curl -s {{ utr.url_win }} --output utr.bat
     - pip install unity-downloader-cli --index-url {{ artifactory.production }}pypi/pypi/simple --upgrade
     - unity-downloader-cli -c Editor -c Android -u {{ editor.version }} --wait --fast
+    - utr.bat --testproject=.MyTestProject --editor-location=.Editor --suite=playmode --platform=android --scripting-backend=mono --artifacts_path=upm-ci~/test-results/android --timeout=900  --extra-editor-arg="-upmNoDefaultPackages" --player-save-path=build/players --build-only
     - |
        set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
        start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
-       utr.bat --testproject=.MyTestProject --editor-location=.Editor --suite=playmode --platform=android --scripting-backend=mono --artifacts_path=upm-ci~/test-results/android --timeout=900
+       utr.bat --testproject=.MyTestProject --editor-location=.Editor --suite=playmode --platform=android --scripting-backend=mono --artifacts_path=upm-ci~/test-results/android --timeout=900 --player-load-path=build/players
   after:
     - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
     - powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe logcat -d > upm-ci~/test-results/android/android_device_log.txt
@@ -123,9 +118,11 @@ test_Android_{{ editor.version }}:
 test_iOS_{{ editor.version }}:
   name: Test {{ editor.version }} on iOS
   agent:
-    type: Unity::mobile::iPhone
-    image: mobile/macos-10.13-testing:stable
-    flavor: b1.medium
+    type: Unity::VM::osx
+    image: mobile/ios-macos-10.15:latest
+    flavor: i1.large
+  variables:
+    IOS_SIMULATOR_SDK: 1
   commands:
     - brew tap --force-auto-update unity/unity [email protected]:unity/homebrew-unity.git
     - brew install unity-config
@@ -139,7 +136,8 @@ test_iOS_{{ editor.version }}:
     - chmod u+x utr
     - pip install unity-downloader-cli --index-url {{ artifactory.production }}pypi/pypi/simple --upgrade
     - unity-downloader-cli -c Editor -c iOS -u {{ editor.version }} --wait --fast
-    - ./utr --testproject=.MyTestProject --editor-location=.Editor --suite=playmode --platform=ios --artifacts_path=upm-ci~/test-results/ios --extra-editor-arg="-playerHeartbeatTimeout 900" --extra-editor-arg="-upmNoDefaultPackages"
+    - ./utr --testproject=.MyTestProject --editor-location=.Editor --suite=playmode --platform=ios --artifacts_path=upm-ci~/test-results/ios --timeout=900 --extra-editor-arg="-upmNoDefaultPackages" --player-save-path=build/players --build-only
+    - ./utr --testproject=.MyTestProject --editor-location=.Editor --suite=playmode --platform=ios --artifacts_path=upm-ci~/test-results/ios --timeout=900 --player-load-path=build/players
   artifacts:
     packages:
       paths:
@@ -173,13 +171,11 @@ test_trigger:
     {% for platform in test_platforms %}
     - .yamato/upm-ci.yml#test_{{ platform.name }}_{{ editor.version }}
     {% endfor %}
+    - .yamato/upm-ci.yml#test_Android_{{ editor.version }}
     {% endfor %}
     {% for editor in ios_test_editors %}
     - .yamato/upm-ci.yml#test_iOS_{{ editor.version }}
     {% endfor %}
-    {% for editor in android_test_editors %}
-    - .yamato/upm-ci.yml#test_Android_{{ editor.version }}
-    {% endfor %}
 
 publish:
   name: Publish to Internal Registry