No longer need separate test editors for Android

Author: aurimasc

.yamato/upm-ci.yml

@@ -5,13 +5,6 @@ test_editors:
   - version: 2020.3
   - version: 2019.4
 
-android_test_editors:
-  - version: trunk
-  - version: 2022.1
-  - version: 2021.2
-  - version: 2020.3
-  - version: 2019.4
-
 # 2019.4 fails due to issue unrelated to package
 ios_test_editors:
   - version: trunk
@@ -86,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:
@@ -178,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