Skip to content

Commit 5aeeb4a

Browse files
H3idi-XH3idi-X
authored
Feature/task 843 2 reorganize tests (#92)
* Added HDRP Tests for HDRP 2020.3 winDX11, Vulkan and Mac metal. [skip ci[ * added 2021.1 setting to yamato test files. * Added HDRP tests for 2021.2. * updated legacy tests yml files. * added 2022.1 into legacy tests yml files. * Added 2022.1 to legacy tests yml files both mac and windows. * deleted old DX12 sample projects and 2019.4 based HDRP default sample project. * Added Toonshader_ProjectHDRP_DX12 with Mac, not set up yet. * Set legacy test vm to 1080 to reduce the testing time. * Added URP a test project for 2021.2. * Added yml files to test the 2021.2 URP project. * disabled light and shadow scene because of a bake issue in 2021.2 project. * Setup DX12 HDRP Asset and a scene. * Set raytraced shadows in several scenes. [skip ci] * Added a DX12 test project and yml file. [skip ci] * Set up the DX12 test scene. * Added dx12 test for 2021.2 [skip ci] * Added HDRP DX12 2021.2 yml. [skip ci] * test HdrpDX12GraphicsTest-2021.2
1 parent 50b06cb commit 5aeeb4a

File tree

4,636 files changed

+745176
-93566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,636 files changed

+745176
-93566
lines changed

‎.gitattributes‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/.* export-ignore
22
/TestProjects export-ignore
33
/HDRP-DefaultVolumeProject-2019.4 export-ignore
4-
/HDRP-DefaultVolumeProject-2020.3 export-ignore
54

‎.yamato/osx_metal-hdrp-2020.3.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: HdrpGraphicsTest-2020.3
6+
unity_versions:
7+
- name: 2020.3
8+
- name: 2021.1
9+
---
10+
{% for test_project in test_projects %}
11+
{% for unity_version in unity_versions %}
12+
{{ test_project.name }}_OSX_Metal_playmode_mono_Linear_{{ unity_version.name }}:
13+
name: {{ test_project.name }} on OSX_Metal_playmode_mono_Linear on version {{ unity_version.name }}
14+
agent:
15+
type: Unity::metal::macmini
16+
image: slough-ops/macos-10.14-xcode:stable
17+
flavor: m1.mac
18+
variables:
19+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
20+
commands:
21+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output TestProjects/{{ test_project.name }}/utr
22+
- chmod +x TestProjects/{{ test_project.name }}/utr
23+
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'"
24+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/com.unity.toonshader
25+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
26+
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/com.unity.toonshader/unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only'
27+
- |5-
28+
29+
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/com.unity.toonshader/TestProjects/{{ test_project.name }} && ~/com.unity.toonshader/TestProjects/{{ test_project.name }}/utr --artifacts_path=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}"
30+
UTR_RESULT=$?
31+
mkdir -p TestProjects/{{ test_project.name }}/test-results/
32+
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results/ TestProjects/{{ test_project.name }}/test-results/
33+
exit $UTR_RESULT
34+
triggers:
35+
branches:
36+
only:
37+
- "/.*/"
38+
artifacts:
39+
logs:
40+
paths:
41+
- "**/test-results/**"
42+
- "TestProjects/{{ test_project.name }}/Logs/*.log"
43+
dependencies:
44+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:macos
45+
rerun: on-new-revision
46+
{% endfor %}
47+
{% endfor %}

‎.yamato/osx_metal-hdrp-2021.2.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: HdrpGraphicsTest-2021.2
6+
unity_versions:
7+
- name: 2021.2
8+
- name: 2022.1
9+
---
10+
{% for test_project in test_projects %}
11+
{% for unity_version in unity_versions %}
12+
{{ test_project.name }}_OSX_Metal_playmode_mono_Linear_{{ unity_version.name }}:
13+
name: {{ test_project.name }} on OSX_Metal_playmode_mono_Linear on version {{ unity_version.name }}
14+
agent:
15+
type: Unity::metal::macmini
16+
image: slough-ops/macos-10.14-xcode:stable
17+
flavor: m1.mac
18+
variables:
19+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
20+
commands:
21+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output TestProjects/{{ test_project.name }}/utr
22+
- chmod +x TestProjects/{{ test_project.name }}/utr
23+
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'"
24+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/com.unity.toonshader
25+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
26+
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/com.unity.toonshader/unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only'
27+
- |5-
28+
29+
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/com.unity.toonshader/TestProjects/{{ test_project.name }} && ~/com.unity.toonshader/TestProjects/{{ test_project.name }}/utr --artifacts_path=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}"
30+
UTR_RESULT=$?
31+
mkdir -p TestProjects/{{ test_project.name }}/test-results/
32+
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results/ TestProjects/{{ test_project.name }}/test-results/
33+
exit $UTR_RESULT
34+
triggers:
35+
branches:
36+
only:
37+
- "/.*/"
38+
artifacts:
39+
logs:
40+
paths:
41+
- "**/test-results/**"
42+
- "TestProjects/{{ test_project.name }}/Logs/*.log"
43+
dependencies:
44+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:macos
45+
rerun: on-new-revision
46+
{% endfor %}
47+
{% endfor %}

‎.yamato/osx_metal-legacy-2019.4.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ test_projects:
55
- name: LegacyGraphicsTest-2019.4
66
unity_versions:
77
- name: 2019.4
8-
- name: 2020.1
9-
- name: 2020.2
10-
# - name: 2021.1
11-
# - name: trunk
8+
- name: 2020.3
9+
- name: 2021.1
10+
- name: 2021.2
11+
- name: 2022.1
1212
---
1313
{% for test_project in test_projects %}
1414
{% for unity_version in unity_versions %}

‎.yamato/osx_metal-urp-2019.4.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ unity_versions:
77
- name: 2019.4
88
- name: 2020.3
99
- name: 2021.1
10-
- name: 2021.2
1110
# - name: trunk
1211
---
1312
{% for test_project in test_projects %}

‎.yamato/osx_metal-urp-2021.1.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: UniversalGraphicsTest-2021.2
6+
unity_versions:
7+
- name: 2021.2
8+
- name: 2022.1
9+
# - name: trunk
10+
---
11+
{% for test_project in test_projects %}
12+
{% for unity_version in unity_versions %}
13+
{{ test_project.name }}_OSX_Metal_playmode_mono_Linear_{{ unity_version.name }}:
14+
name: {{ test_project.name }} on OSX_Metal_playmode_mono_Linear on version {{ unity_version.name }}
15+
agent:
16+
type: Unity::metal::macmini
17+
image: slough-ops/macos-10.14-xcode:stable
18+
flavor: m1.mac
19+
variables:
20+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
21+
commands:
22+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output TestProjects/{{ test_project.name }}/utr
23+
- chmod +x TestProjects/{{ test_project.name }}/utr
24+
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'"
25+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/com.unity.toonshader
26+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
27+
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/com.unity.toonshader/unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only'
28+
- |5-
29+
30+
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/com.unity.toonshader/TestProjects/{{ test_project.name }} && ~/com.unity.toonshader/TestProjects/{{ test_project.name }}/utr --artifacts_path=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}"
31+
UTR_RESULT=$?
32+
mkdir -p TestProjects/{{ test_project.name }}/test-results/
33+
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results/ TestProjects/{{ test_project.name }}/test-results/
34+
exit $UTR_RESULT
35+
triggers:
36+
branches:
37+
only:
38+
- "/.*/"
39+
artifacts:
40+
logs:
41+
paths:
42+
- "**/test-results/**"
43+
- "TestProjects/{{ test_project.name }}/Logs/*.log"
44+
dependencies:
45+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:macos
46+
rerun: on-new-revision
47+
{% endfor %}
48+
{% endfor %}

‎.yamato/rths-dx11-hdrp-2020.3.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ test_projects:
55
- name: HdrpRthsGraphicsTest-2020.3
66
unity_versions:
77
- name: 2020.3
8+
- name: 2021.1
89
---
910
{% for test_project in test_projects %}
1011
{% for unity_version in unity_versions %}

‎.yamato/rths-dx11-legacy-2019.4.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ test_projects:
66
unity_versions:
77
- name: 2019.4
88
- name: 2020.3
9+
- name: 2021.1
10+
- name: 2021.2
911
---
1012
{% for test_project in test_projects %}
1113
{% for unity_version in unity_versions %}

‎.yamato/win_dx11-hdrp-2020.3.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: HdrpGraphicsTest-2020.3
6+
unity_versions:
7+
- name: 2020.3
8+
- name: 2021.1
9+
---
10+
{% for test_project in test_projects %}
11+
{% for unity_version in unity_versions %}
12+
{{ test_project.name }}_Win_DX11_playmode_{{ unity_version.name }}:
13+
name: {{ test_project.name }} on Win_DX11_playmode on version {{ unity_version.name }}
14+
agent:
15+
type: Unity::VM::GPU
16+
image: graphics-foundation/win10-dxr:stable
17+
flavor: b1.xlarge
18+
model: rtx2080
19+
variables:
20+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
21+
dependencies:
22+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
23+
rerun: on-new-revision
24+
commands:
25+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
26+
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
27+
- cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only
28+
# - cd TestProjects/{{ test_project.name }} && utr --scripting-backend=Mono2x --suite=playmode --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" --zero-tests-are-ok=1
29+
- cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11"
30+
timeout: 360000
31+
retries: 1
32+
triggers:
33+
branches:
34+
only:
35+
- "/.*/"
36+
artifacts:
37+
logs:
38+
paths:
39+
- "**/test-results/**"
40+
{% endfor %}
41+
{% endfor %}

‎.yamato/win_dx11-hdrp-2021.2.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: HdrpGraphicsTest-2021.2
6+
unity_versions:
7+
- name: 2021.2
8+
- name: 2022.1
9+
---
10+
{% for test_project in test_projects %}
11+
{% for unity_version in unity_versions %}
12+
{{ test_project.name }}_Win_DX11_playmode_{{ unity_version.name }}:
13+
name: {{ test_project.name }} on Win_DX11_playmode on version {{ unity_version.name }}
14+
agent:
15+
type: Unity::VM::GPU
16+
image: graphics-foundation/win10-dxr:stable
17+
flavor: b1.xlarge
18+
model: rtx2080
19+
variables:
20+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
21+
dependencies:
22+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
23+
rerun: on-new-revision
24+
commands:
25+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
26+
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
27+
- cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only
28+
# - cd TestProjects/{{ test_project.name }} && utr --scripting-backend=Mono2x --suite=playmode --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" --zero-tests-are-ok=1
29+
- cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11"
30+
timeout: 360000
31+
retries: 1
32+
triggers:
33+
branches:
34+
only:
35+
- "/.*/"
36+
artifacts:
37+
logs:
38+
paths:
39+
- "**/test-results/**"
40+
{% endfor %}
41+
{% endfor %}

0 commit comments

Comments
 (0)