Skip to content

Commit e5e21dc

Browse files
author
Chris Elion
authored
use old yamato test config (#4231)
1 parent 582bd1b commit e5e21dc

File tree

1 file changed

+12
-29
lines changed

1 file changed

+12
-29
lines changed

.yamato/com.unity.ml-agents-test.yml

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,20 @@ test_platforms:
2929
type: Unity::VM
3030
image: package-ci/ubuntu:stable
3131
flavor: b1.medium
32-
packages:
33-
- name: com.unity.ml-agents
34-
- name: com.unity.ml-agents.extensions
3532
---
3633

3734
all_package_tests:
3835
name: Run All Combinations of Editors/Platforms Tests
3936
dependencies:
4037
{% for editor in test_editors %}
4138
{% for platform in test_platforms %}
42-
- .yamato/com.unity.ml-agents-test.yml#test_com.unity.ml-agents_{{ platform.name }}_{{ editor.version }}
39+
- .yamato/com.unity.ml-agents-test.yml#test_{{ platform.name }}_{{ editor.version }}
4340
{% endfor %}
4441
{% endfor %}
4542

4643
{% for editor in trunk_editor %}
4744
{% for platform in test_platforms %}
48-
- .yamato/com.unity.ml-agents-test.yml#test_com.unity.ml-agents_{{ platform.name }}_{{ editor.version }}
45+
- .yamato/com.unity.ml-agents-test.yml#test_{{ platform.name }}_{{ editor.version }}
4946
{% endfor %}
5047
{% endfor %}
5148
triggers:
@@ -54,23 +51,18 @@ all_package_tests:
5451
- branch: master
5552
frequency: daily
5653

57-
{% for package in packages %}
58-
{% for editor in test_editors %}
59-
{% for platform in test_platforms %}
60-
test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
61-
name : {{ package.name }} test {{ editor.version }} on {{ platform.name }}
54+
{% for editor in test_editors %}
55+
{% for platform in test_platforms %}
56+
test_{{ platform.name }}_{{ editor.version }}:
57+
name : com.unity.ml-agents test {{ editor.version }} on {{ platform.name }}
6258
agent:
6359
type: {{ platform.type }}
6460
image: {{ platform.image }}
6561
flavor: {{ platform.flavor}}
6662
commands:
6763
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
68-
- upm-ci project test -u {{ editor.version }} --project-path Project --type package-tests --package-filter {{ package.name }} {{ editor.coverageOptions }}
69-
70-
{% if package.name == "com.unity.ml-agents" %}
71-
# TODO get coverage tests running for extensions too
64+
- upm-ci package test -u {{ editor.version }} --package-path com.unity.ml-agents {{ editor.coverageOptions }}
7265
- python ml-agents/tests/yamato/check_coverage_percent.py upm-ci~/test-results/ {{ editor.minCoveragePct }}
73-
{% endif %}
7466
artifacts:
7567
logs:
7668
paths:
@@ -85,20 +77,15 @@ test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
8577
pull_request.target match "release.+") AND
8678
NOT pull_request.draft AND
8779
(pull_request.changes.any match "com.unity.ml-agents/**" OR
88-
{% if package.name == "com.unity.ml-agents.extensions" %}
89-
pull_request.changes.any match "com.unity.ml-agents.extensions/**" OR
90-
{% endif %}
9180
pull_request.changes.any match ".yamato/com.unity.ml-agents-test.yml")
9281
{% endif %}
93-
{% endfor %}
9482
{% endfor %}
9583
{% endfor %}
9684

97-
{% for package in packages %}
98-
{% for editor in trunk_editor %}
99-
{% for platform in test_platforms %}
100-
test_{{ package.name }}_{{ platform.name }}_trunk:
101-
name : {{ package.name }} test {{ editor.version }} on {{ platform.name }}
85+
{% for editor in trunk_editor %}
86+
{% for platform in test_platforms %}
87+
test_{{ platform.name }}_trunk:
88+
name : com.unity.ml-agents test {{ editor.version }} on {{ platform.name }}
10289
agent:
10390
type: {{ platform.type }}
10491
image: {{ platform.image }}
@@ -107,11 +94,8 @@ test_{{ package.name }}_{{ platform.name }}_trunk:
10794
- python -m pip install unity-downloader-cli --extra-index-url https://artifactory.eu-cph-1.unityops.net/api/pypi/common-python/simple
10895
- unity-downloader-cli -u trunk -c editor --wait --fast
10996
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
110-
- upm-ci project test -u {{ editor.version }} --project-path Project --type package-tests --package-filter {{ package.name }} {{ editor.coverageOptions }}
111-
{% if package.name == "com.unity.ml-agents" %}
112-
# TODO get coverage tests running for extensions too
97+
- upm-ci package test -u {{ editor.version }} --package-path com.unity.ml-agents {{ editor.coverageOptions }}
11398
- python ml-agents/tests/yamato/check_coverage_percent.py upm-ci~/test-results/ {{ editor.minCoveragePct }}
114-
{% endif %}
11599
artifacts:
116100
logs:
117101
paths:
@@ -122,4 +106,3 @@ test_{{ package.name }}_{{ platform.name }}_trunk:
122106
cancel_old_ci: true
123107
{% endfor %}
124108
{% endfor %}
125-
{% endfor %}

0 commit comments

Comments
 (0)