Skip to content

Hybrid Renderer Automation Tests (HDRP & URP) #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 45 commits into from
Apr 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
4a3a3c5
Hybrid Renderer test projects: HDRP_HybridTests & UniversalHybridTest
cinight Mar 12, 2020
5ac50f2
Cleanup UniversalHybridTest & HDRP_HybridTests. Local playmode tests …
cinight Mar 12, 2020
f23248b
Yamato yml for UniversalHybridTest & HDRP_HybridTests
cinight Mar 12, 2020
f6546c9
Fix Yamato yml for UniversalHybridTest & HDRP_HybridTests
cinight Mar 12, 2020
7a5ff12
fix project name in Yamato yml for UniversalHybridTest
cinight Mar 12, 2020
a6d575d
UniversalHybridTest - DX11 standalone test workaround
cinight Mar 12, 2020
e758f81
[UniversalHybridTest] [HDRP_HybridTests] disable OSX glcore and editm…
cinight Mar 12, 2020
b18379c
Merge branch 'master' into hybrid/hybrid-samples-srp
cinight Mar 17, 2020
3a1b326
[UniversalHybridTest] [HDRP_HybridTests] update to new hybrid package…
cinight Mar 17, 2020
5dd9f2a
[UniversalHybridTest] [HDRP_HybridTests] Remove custom build pipeline…
cinight Mar 17, 2020
2fa6b31
[UniversalHybridTest] Remove OSX GLcore on URP hybrid yamato
cinight Mar 17, 2020
5ccd768
[UniversalHybridTest] Re-upload subscene cache for URP hybrid test
cinight Mar 17, 2020
c7cb727
[UniversalHybridTest] Increase framedelay for TestMBP scene, now loca…
cinight Mar 17, 2020
6e0b9b0
[UniversalHybridTest] adding build package so that Split build and Ru…
cinight Mar 17, 2020
9483af0
[UniversalHybridTest] OSX Metal subscene cache and test scene missing…
cinight Mar 18, 2020
741084e
[HDRP_HybridTests] Adding subscene cache for Win standalone test, fix…
cinight Mar 18, 2020
2921a70
[UniversalHybridTest] Fix missing script in TestMBPCompatibility scene
cinight Mar 18, 2020
c436c8f
[UniversalHybridTest] Disable Win Standalone Test
cinight Mar 18, 2020
41d3b15
[UniversalHybridTest] fix yamato
cinight Mar 18, 2020
958a7a6
[UniversalHybridTest] Fix yamato
cinight Mar 18, 2020
63f937c
[UniversalHybridTest] revert yamato changes and disable win standalon…
cinight Mar 18, 2020
af1bb54
[HDRP_HybridTests] Adding Win standalone test to yamato
cinight Mar 18, 2020
adcb973
[HDRP_HybridTests] fix missing script
cinight Mar 19, 2020
1eb01dd
Merge branch 'master' into hybrid/hybrid-samples-srp
cinight Mar 19, 2020
8c40dc1
Merge branch 'master' into hybrid/hybrid-samples-srp
cinight Mar 24, 2020
8f2bfd7
Merge branch 'master' into hybrid/hybrid-samples-srp
cinight Mar 24, 2020
4807246
Merge branch 'master' into hybrid/hybrid-samples-srp
cinight Mar 25, 2020
58a9452
[HDRP_HybridTests] update subscene cache for standalone test
cinight Mar 25, 2020
c13b614
Merge branch 'master' into hybrid/hybrid-samples-srp
cinight Mar 31, 2020
1245d79
using newer dots package and upgraded HDRP material
cinight Mar 31, 2020
efc233e
upgrade to new dots (fixed framework versions) and fix material impor…
cinight Apr 2, 2020
78ea50a
update package manifest
cinight Apr 2, 2020
106fe92
Merge branch 'master' into hybrid/hybrid-samples-srp
cinight Apr 2, 2020
3551b67
URP material upgrade
cinight Apr 2, 2020
a45e301
UniversalHybridTest subscene cache update
cinight Apr 2, 2020
b0080fa
Merge branch 'master' into hybrid/hybrid-samples-srp
cinight Apr 14, 2020
0fc0772
rename hybrid yamato to new repo name
cinight Apr 14, 2020
8e58dbc
upgrade hybrid packages
cinight Apr 14, 2020
28d71a6
update HDRP hybrid subscene and add platform package
cinight Apr 14, 2020
779dba9
adding platform package to OSX hybrid project
cinight Apr 14, 2020
ca4c4dc
updating URP hybrid project subscene cache for standalone test
cinight Apr 14, 2020
fd4a296
increasing frame delay in URP hybrid
cinight Apr 14, 2020
05f42f8
Adding URP & HDRP hybrid renderer CIs to ABV nightly job [skip ci]
cinight Apr 15, 2020
3e25c27
reorder scenelist to avoid race condition
cinight Apr 20, 2020
70b96a0
disable fast CIs because hybrid renderer need to stay on latest trunk…
cinight Apr 20, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .yamato/upm-ci-abv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ all_project_ci_nightly_{{ editor.version }}:
rerun: always
- path: .yamato/upm-ci-universal.yml#Universal_Android_Vulkan_{{ editor.version }}
rerun: always
- path: .yamato/upm-ci-hdrp_hybrid.yml#All_HDRP_Hybrid_{{ editor.version }}
rerun: always
- path: .yamato/upm-ci-universal_hybrid.yml#All_Universal_Hybrid_{{ editor.version }}
rerun: always
triggers:
recurring:
- branch: master
Expand Down
316 changes: 316 additions & 0 deletions .yamato/upm-ci-hdrp_hybrid.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,316 @@
editors:
- version: 2020.1
rerun_strategy: on-new-revision
# - version: fast-2020.1
# rerun_strategy: on-new-revision
- version: trunk
rerun_strategy: on-new-revision
# - version: fast-trunk
# rerun_strategy: on-new-revision
- version: CUSTOM-REVISION
rerun_strategy: always
platforms:
- name: Win
os: windows
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
flavor: b1.large
components:
- editor
- il2cpp
- name: OSX_Metal
os: macos
type: Unity::metal::macmini
image: slough-ops/macos-10.14-xcode
flavor: m1.mac
components:
- editor
- il2cpp
- name: Linux
os: linux
type: Unity::VM::GPU
image: cds-ops/ubuntu-18.04-base:stable
flavor: b1.large
components:
- editor
- il2cpp
testplatforms:
- name: playmode
args: --suite=playmode
- name: playmode XR
args: --suite=playmode --extra-editor-arg="-xr-tests"
- name: Standalone
args: --suite=playmode --platform=Standalone
# - name: editmode
# args: --suite=editor --platform=editmode
projects:
- name: HDRP_Hybrid
folder: HDRP_HybridTests
win_apis:
- name: DX11
cmd: -force-d3d11
- name: DX12
cmd: -force-d3d12
- name: Vulkan
cmd: -force-vulkan
mac_apis:
- name: metal
# - name: openglcore
linux_apis:
- name: OpenGLCore
cmd: -force-glcore
- name: Vulkan
cmd: -force-vulkan
---
{% for project in projects %}
{% for editor in editors %}
{% for platform in platforms %}

{% if platform.name == "Win" %}

{% for testplatform in testplatforms %}
{% for win_api in win_apis %}

{% if testplatform.name == "Standalone" %}
{{ project.name }}_Win_{{ win_api.name }}_{{ testplatform.name }}_{{ editor.version }}:
name : Test {{ project.name }} on Win_{{ win_api.name }}_{{ testplatform.name }} on version {{ editor.version }}
agent:
flavor: b1.large
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
skip_checkout: true
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple

- cd TestProjects/{{ project.folder }} && unity-downloader-cli --source-file ../../unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only

- cd TestProjects/{{ project.folder }} && utr\utr {{ testplatform.args }}Windows64 --artifacts_path=test-results --timeout=1200 --player-load-path=../../players --player-connection-ip=auto
artifacts:
logs:
paths:
- "**/test-results/**"
dependencies:
- path: .yamato/z_editor.yml#editor:priming:{{ editor.version }}:{{ platform.os }}
rerun: {{ editor.rerun_strategy }}
- path: .yamato/upm-ci-hdrp_hybrid.yml#Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}
rerun: {{ editor.rerun_strategy }}

Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}:
name : Build {{ project.name }} on Win_{{ win_api.name }}_Player on version {{ editor.version }}
agent:
flavor: b1.xlarge
type: Unity::VM
image: sdet/gamecode_win10:stable
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple

- cd TestProjects/{{ project.folder }} && unity-downloader-cli --source-file ../../unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only

- cd TestProjects/{{ project.folder }} && utr\utr {{ testplatform.args }}Windows64 --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildWindows{{ win_api.name }}Linear" --testproject=. --editor-location=.Editor --artifacts_path=test-results --timeout=1200 --player-save-path=../../players --build-only
dependencies:
- path: .yamato/z_editor.yml#editor:priming:{{ editor.version }}:{{ platform.os }}
rerun: {{ editor.rerun_strategy }}
artifacts:
logs:
paths:
- "**/test-results/**"
players:
paths:
- "players/**"

{% else %}

{{ project.name }}_Win_{{ win_api.name }}_{{ testplatform.name }}_{{ editor.version }}:
name : {{ project.name }} on Win_{{ win_api.name }}_{{ testplatform.name }} on version {{ editor.version }}
agent:
{% if testplatform.name == "editmode" %}
type: Unity::VM
{% else %}
type: {{ platform.type }}
#model: rtx2080
{% endif %}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple

- cd TestProjects/{{ project.folder }} && unity-downloader-cli --source-file ../../unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only

{% if testplatform.name == "Standalone" %}
- cd TestProjects/{{ project.folder }} && utr\utr {{ testplatform.args }}Windows64 --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildWindows{{ win_api.name }}Linear" --testproject=. --editor-location=.Editor --artifacts_path=upm-ci~/test-results --timeout=1200
{% else %}
- cd TestProjects/{{ project.folder }} && utr\utr {{ testplatform.args }} --extra-editor-arg="{{ win_api.cmd }}" --testproject=. --editor-location=.Editor --artifacts_path=upm-ci~/test-results
{% endif %}
dependencies:
- path: .yamato/z_editor.yml#editor:priming:{{ editor.version }}:{{ platform.os }}
rerun: {{ editor.rerun_strategy }}
artifacts:
logs:
paths:
- "**/test-results/**"
{% endif %}
{% endfor %}
{% endfor %}

{% elsif platform.name == "OSX_Metal" %}

{% for testplatform in testplatforms %}
{% if testplatform.name == "editmode" or testplatform.name == "Standalone" %}
#skip because we don't need a GPU to run editmode tests
#OSX standalone is disabled due to limitation of workaround for Subscene cache (we are running Win standalone test instead)
{% else %}
{{ project.name }}_OSX_Metal_{{ testplatform.name }}_{{ editor.version }}:
name : {{ project.name }} on OSX_Metal_{{ testplatform.name }} on version {{ editor.version }}
agent:
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple'"
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini

- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only'

{% if testplatform.name == "Standalone" %}
- |
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/{{ project.folder }} && ~/Graphics/TestProjects/{{ project.folder }}/utr/utr {{ testplatform.args }}OSX --testproject=/Users/bokken/Graphics/TestProjects/{{ project.folder }} --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/{{ project.folder }}/test-results --timeout=1200'
{% else %}
- |
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/{{ project.folder }} && ~/Graphics/TestProjects/{{ project.folder }}/utr/utr {{ testplatform.args }} --testproject=/Users/bokken/Graphics/TestProjects/{{ project.folder }} --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/{{ project.folder }}/test-results'
{% endif %}
UTR_RESULT=$?
mkdir -p TestProjects/{{ project.folder }}/test-results/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/{{ project.folder }}/test-results/ TestProjects/{{ project.folder }}/test-results/
exit $UTR_RESULT
dependencies:
- path: .yamato/z_editor.yml#editor:priming:{{ editor.version }}:{{ platform.os }}
rerun: {{ editor.rerun_strategy }}
artifacts:
logs:
paths:
- "**/test-results/**"
{% endif %}
{% endfor %}

{% elsif platform.name == "Linux" %}

{% for testplatform in testplatforms %}
{% if testplatform.name == "Standalone" %}
#skip because we don't need a GPU to run editmode tests
#Linux standalone is disabled due to limitation of workaround for Subscene cache (we are running Win standalone test instead)
{% else %}
{% for linux_api in linux_apis %}
# Separate block for linux, because the linux agents currently need extra configuration
{{ project.name }}_Linux_{{ linux_api.name }}_{{ testplatform.name }}_{{ editor.version }}:
name : {{ project.name }} on Linux_{{ linux_api.name }}_{{ testplatform.name }} on version {{ editor.version }}
agent:
{% if testplatform.name == "editmode" %}
type: Unity::VM
{% else %}
type: {{ platform.type }}
{% endif %}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
commands:
- sudo -H pip install --upgrade pip
- sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
- sudo npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr

- cd TestProjects/{{ project.folder }} && sudo unity-downloader-cli --source-file ../../unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only

{% if testplatform.name == "Standalone" %}
- cd TestProjects/{{ project.folder }} && DISPLAY=:0.0 utr/utr {{ testplatform.args }}Linux64 --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinux{{ linux_api.name }}Linear" --testproject=. --editor-location=.Editor --artifacts_path=upm-ci~/test-results
{% else %}
- cd TestProjects/{{ project.folder }} && DISPLAY=:0.0 utr/utr --extra-editor-arg="{{ linux_api.cmd }}" {{ testplatform.args }} --testproject=. --editor-location=.Editor --artifacts_path=upm-ci~/test-results
{% endif %}
dependencies:
- path: .yamato/z_editor.yml#editor:priming:{{ editor.version }}:{{ platform.os }}
rerun: {{ editor.rerun_strategy }}
artifacts:
logs:
paths:
- "**/upm-ci~/test-results/**/*"
{% endfor %}
{% endif %}
{% endfor %}


{% endif %}
{% endfor %}


All_{{ project.name }}_{{ editor.version }}:
name: All {{ project.name }} CI - {{ editor.version }}
agent:
type: Unity::VM
image: cds-ops/ubuntu-18.04-agent:stable
flavor: b1.small
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
commands:
- dir
dependencies:
{% for platform in platforms %}
{% for testplatform in testplatforms %}
{% if platform.name == "OSX_OpenGLCore" %}

{% if testplatform.name == "editmode" %}
- path: .yamato/upm-ci-{{ project.name | downcase }}.yml#{{ project.name }}_{{ platform.name }}_{{ testplatform.name }}_{{ editor.version }}
rerun: {{ editor.rerun_strategy }}
{% endif %}

{% elsif platform.name == "OSX_Metal" and testplatform.name == "editmode" %}

{% elsif platform.name == "OSX_Metal" %}
#skip
{% elsif platform.name == "Linux" %}
#skip

{% elsif platform.name == "Win" %}
{% for win_api in win_apis %}
{% if win_api.name == "Vulkan" %}
#skip
{% elsif win_api.name == "DX12" %}
#skip
{% else %}
- .yamato/upm-ci-{{ project.name | downcase }}.yml#{{ project.name }}_{{ platform.name }}_{{ win_api.name }}_{{ testplatform.name }}_{{ editor.version }}
{% endif %}
{% endfor %}

{% else %}
- path: .yamato/upm-ci-{{ project.name | downcase }}.yml#{{ project.name }}_{{ platform.name }}_{{ testplatform.name }}_{{ editor.version }}
rerun: {{ editor.rerun_strategy }}
{% endif %}

{% endfor %}
{% endfor %}
{% endfor %}
{% endfor %}
Loading