Skip to content

Commit cb50320

Browse files
sainarayan-csesainarayan-cse
committed
Merge branch '9.x.x/release' into sg/inspector-bugfixes
# Conflicts: # .yamato/upm-ci-abv.yml # .yamato/upm-ci-hdrp.yml # .yamato/upm-ci-hdrp_dxr.yml # .yamato/upm-ci-hdrp_hybrid.yml # .yamato/upm-ci-hdrp_standalone.yml # .yamato/upm-ci-packages.yml # .yamato/upm-ci-shadergraph.yml # .yamato/upm-ci-shadergraph_stereo.yml # .yamato/upm-ci-templates.yml # .yamato/upm-ci-universal.yml # .yamato/upm-ci-universal_hybrid.yml # .yamato/upm-ci-universal_stereo.yml # .yamato/upm-ci-vfx_lwrp.yml # .yamato/upm-ci-vfxmain.yml # .yamato/z_editor.yml # com.unity.render-pipelines.core/package.json # com.unity.render-pipelines.high-definition-config/package.json # com.unity.render-pipelines.high-definition/package.json # com.unity.render-pipelines.lightweight/package.json # com.unity.render-pipelines.universal/package.json # com.unity.shadergraph/package.json # com.unity.visualeffectgraph/package.json
2 parents bf235b5 + 2eaed19 commit cb50320

File tree

22 files changed

+158
-171
lines changed

22 files changed

+158
-171
lines changed

‎.yamato/upm-ci-abv.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
editors:
2-
- version: trunk
3-
- version: fast-trunk
2+
- version: 2020.1
3+
- version: fast-2020.1
44
- version: CUSTOM-REVISION
55
projects:
66
- name: Universal
@@ -51,17 +51,17 @@ all_project_ci_{{ editor.version }}:
5151
logs:
5252
paths:
5353
- "**/test-results/**"
54-
{% if editor.version == "fast-trunk" %}
54+
{% if editor.version == "fast-2020.1" %}
5555
# run abv for non-draft PRs that are not docs
5656
triggers:
57-
expression: pull_request.target eq "master" AND NOT pull_request.draft AND NOT pull_request.push.changes.all match ["**/*.md", "doc/**/*", "**/Documentation*/**/*"]
57+
expression: pull_request.target eq "9.x.x/release" AND NOT pull_request.draft AND NOT pull_request.push.changes.all match ["**/*.md", "doc/**/*", "**/Documentation*/**/*"]
5858
{% endif %}
5959
{% endfor %}
6060

6161

62-
# a separate job so that only trunk is run nightly, not fast-trunk
62+
# a separate job so that only 2020.1 is run nightly, not fast-2020.1
6363
{% for editor in editors %}
64-
{% if editor.version == 'trunk' %}
64+
{% if editor.version == '2020.1' %}
6565
all_project_ci_nightly_{{ editor.version }}:
6666
name: _Nightly ABV against {{ editor.version }}
6767
dependencies:
@@ -79,15 +79,13 @@ all_project_ci_nightly_{{ editor.version }}:
7979
rerun: always
8080
- path: .yamato/upm-ci-universal.yml#Universal_Android_Vulkan_{{ editor.version }}
8181
rerun: always
82-
- path: .yamato/upm-ci-universal.yml#Universal_iPhone_Metal_{{ editor.version }}
83-
rerun: always
8482
- path: .yamato/upm-ci-hdrp_hybrid.yml#All_HDRP_Hybrid_{{ editor.version }}
8583
rerun: always
8684
- path: .yamato/upm-ci-universal_hybrid.yml#All_Universal_Hybrid_{{ editor.version }}
8785
rerun: always
8886
triggers:
8987
recurring:
90-
- branch: master
88+
- branch: 9.x.x/release
9189
frequency: 0 * * ?
9290
{% endif %}
9391
{% endfor %}
@@ -149,7 +147,8 @@ all_smoke_tests_{{ editor.version }}:
149147
rerun: on-new-revision
150148
{% endfor %}
151149
{% endfor %}
152-
150+
151+
# "trunk" here just refers to unity source
153152
{% for editor in editors %}
154153
trunk_verification_{{ editor.version }}:
155154
name: Trunk verification - {{ editor.version }}

‎.yamato/upm-ci-hdrp.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
editors:
2-
- version: trunk
2+
- version: 2020.1
33
rerun_strategy: on-new-revision
4-
- version: fast-trunk
4+
- version: fast-2020.1
55
rerun_strategy: on-new-revision
66
- version: CUSTOM-REVISION
77
rerun_strategy: always
@@ -232,7 +232,12 @@ All_{{ project.name }}_{{ editor.version }}:
232232
{% elsif win_api.name == "DX12" and testplatform.name == "editmode" %}
233233
#skip - not needed, cover by dx11
234234
{% else %}
235-
- .yamato/upm-ci-{{ project.name | downcase }}.yml#{{ project.name }}_{{ platform.name }}_{{ win_api.name }}_{{ testplatform.name }}_{{ editor.version }}
235+
- path: .yamato/upm-ci-{{ project.name | downcase }}.yml#{{ project.name }}_{{ platform.name }}_{{ win_api.name }}_{{ testplatform.name }}_{{ editor.version }}
236+
rerun: {{ editor.rerun_strategy }}
237+
{% if win_api.name == "DX12" and testplatform.name == "playmode" %}
238+
- path: .yamato/upm-ci-hdrp_dxr.yml#HDRP_DXR_Win_DX12_playmode_{{ editor.version }}
239+
rerun: {{ editor.rerun_strategy }}
240+
{% endif %}
236241
{% endif %}
237242
{% endfor %}
238243

‎.yamato/upm-ci-hdrp_dxr.yml‎

Lines changed: 79 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
editors:
2-
- version: trunk
3-
- version: fast-trunk
2+
- version: 2020.1
3+
rerun_strategy: on-new-revision
4+
- version: fast- 2020.1
5+
rerun_strategy: on-new-revision
6+
- version: CUSTOM-REVISION
7+
rerun_strategy: always
48
platforms:
59
- name: Win
610
os: windows
711
type: Unity::VM::GPU
8-
image: sdet/gamecode_win10:stable
12+
image: graphics-foundation/win10-dxr:latest
913
flavor: b1.large
1014
components:
1115
- editor
1216
- il2cpp
13-
# - name: Linux
14-
# type: Unity::VM::GPU
15-
# image: cds-ops/ubuntu-18.04-base:stable
16-
# flavor: b1.large
17-
# Not sure if Linux supports DXR
1817
testplatforms:
1918
- name: Standalone
2019
args: --suite=playmode --platform=Standalone
@@ -26,20 +25,73 @@ projects:
2625
win_apis:
2726
- name: DX12
2827
cmd: -force-d3d12
29-
#linux_apis:
30-
# - name: OpenGLCore
31-
# cmd: -force-glcore
32-
# - name: Vulkan
33-
# cmd: -force-vulkan
3428
---
3529
{% for project in projects %}
3630
{% for editor in editors %}
3731
{% for platform in platforms %}
3832

39-
{% if platform.name == "Win" %}
40-
4133
{% for testplatform in testplatforms %}
4234
{% for win_api in win_apis %}
35+
36+
{% if testplatform.name == "Standalone" %}
37+
{{ project.name }}_Win_{{ win_api.name }}_{{ testplatform.name }}_{{ editor.version }}:
38+
name : Test {{ project.name }} on Win_{{ win_api.name }}_{{ testplatform.name }} on version {{ editor.version }}
39+
agent:
40+
flavor: b1.large
41+
type: Unity::VM::GPU
42+
model: rtx2080
43+
image: graphics-foundation/win10-dxr:latest
44+
skip_checkout: true
45+
variables:
46+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
47+
{% if editor.version == 'CUSTOM-REVISION' %}
48+
CUSTOM_REVISION: custom_revision_not_set
49+
{% endif %}
50+
commands:
51+
- git clone [email protected]:unity/utr.git TestProjects/{{ project.folder }}/utr
52+
53+
- cd TestProjects/{{ project.folder }} && utr\utr {{ testplatform.args }}Windows64 --artifacts_path=test-results --timeout=1200 --player-load-path=../../players --player-connection-ip=auto
54+
artifacts:
55+
logs:
56+
paths:
57+
- "**/test-results/**"
58+
dependencies:
59+
- path: .yamato/z_editor.yml#editor:priming:{{ editor.version }}:{{ platform.os }}
60+
rerun: {{ editor.rerun_strategy }}
61+
- path: .yamato/upm-ci-{{ project.name | downcase }}.yml#Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}
62+
rerun: {{ editor.rerun_strategy }}
63+
64+
Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}:
65+
name : Build {{ project.name }} on Win_{{ win_api.name }}_Player on version {{ editor.version }}
66+
agent:
67+
flavor: b1.xlarge
68+
type: Unity::VM
69+
image: graphics-foundation/win10-dxr:latest
70+
variables:
71+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
72+
{% if editor.version == 'CUSTOM-REVISION' %}
73+
CUSTOM_REVISION: custom_revision_not_set
74+
{% endif %}
75+
commands:
76+
- git clone [email protected]:unity/utr.git TestProjects/{{ project.folder }}/utr
77+
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
78+
79+
- cd TestProjects/{{ project.folder }} && unity-downloader-cli --source-file ../../unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only
80+
81+
- 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
82+
dependencies:
83+
- path: .yamato/z_editor.yml#editor:priming:{{ editor.version }}:{{ platform.os }}
84+
rerun: {{ editor.rerun_strategy }}
85+
artifacts:
86+
logs:
87+
paths:
88+
- "**/test-results/**"
89+
players:
90+
paths:
91+
- "players/**"
92+
93+
{% else %}
94+
4395
{{ project.name }}_Win_{{ win_api.name }}_{{ testplatform.name }}_{{ editor.version }}:
4496
name : {{ project.name }} on Win_{{ testplatform.name }}_{{ win_api.name }} on version {{ editor.version }}
4597
agent:
@@ -49,32 +101,30 @@ win_apis:
49101
flavor: {{ platform.flavor}}
50102
variables:
51103
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
104+
{% if editor.version == 'CUSTOM-REVISION' %}
105+
CUSTOM_REVISION: custom_revision_not_set
106+
{% endif %}
52107
commands:
53108
- git clone [email protected]:unity/utr.git TestProjects/{{ project.folder }}/utr
54109
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
55110
- cd TestProjects/{{ project.folder }} && unity-downloader-cli --source-file ../../unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only
56111

57-
{% if testplatform.name == "Standalone" %}
58-
- 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
59-
{% else %}
60112
- cd TestProjects/{{ project.folder }} && utr\utr {{ testplatform.args }} --extra-editor-arg="{{ win_api.cmd }}" --testproject=. --editor-location=.Editor --artifacts_path=upm-ci~/test-results
61-
{% endif %}
62113
dependencies:
63114
- .yamato/z_editor.yml#editor:priming:{{ editor.version }}:{{ platform.os }}
64115
artifacts:
65116
logs:
66117
paths:
67118
- "**/test-results/**"
68-
{% endfor %}
69-
{% endfor %}
70119

71-
{% endif %}
120+
{% endif %} # standalone
121+
{% endfor %} # win api
122+
{% endfor %} # testplatform
72123

73-
{% endfor %}
74-
{% endfor %}
124+
{% endfor %} # platform
75125

76-
All_{{ project.name }}:
77-
name: All {{ project.name }} CI
126+
All_{{ project.name }}_{{ editor.version }}:
127+
name: All {{ project.name }} CI - {{ editor.version }}
78128
agent:
79129
type: Unity::VM
80130
image: cds-ops/ubuntu-18.04-agent:stable
@@ -89,9 +139,10 @@ All_{{ project.name }}:
89139
{% for platform in platforms %}
90140
{% for testplatform in testplatforms %}
91141
{% for win_api in win_apis %}
92-
- .yamato/upm-ci-{{ project.name | downcase }}.yml#{{ project.name }}_Win_{{ win_api.name }}_{{ testplatform.name }}_trunk
142+
- .yamato/upm-ci-{{ project.name | downcase }}.yml#{{ project.name }}_Win_{{ win_api.name }}_{{ testplatform.name }}_{{ editor.version }}
93143
{% endfor %}
94144
{% endfor %}
95145
{% endfor %}
96146

97-
{% endfor %}
147+
{% endfor %} #project
148+
{% endfor %} # editor

‎.yamato/upm-ci-hdrp_hybrid.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
editors:
2-
- version: trunk
2+
- version: 2020.1
33
rerun_strategy: on-new-revision
4-
- version: fast-trunk
4+
- version: fast-2020.1
55
rerun_strategy: on-new-revision
66
- version: CUSTOM-REVISION
77
rerun_strategy: always

‎.yamato/upm-ci-hdrp_standalone.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
editors:
2-
- version: trunk
2+
- version: 2020.1
33
rerun_strategy: on-new-revision
4-
- version: fast-trunk
4+
- version: fast-2020.1
55
rerun_strategy: on-new-revision
66
- version: CUSTOM-REVISION
77
rerun_strategy: always

‎.yamato/upm-ci-packages.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
editors:
2-
- version: trunk
3-
- version: fast-trunk
2+
- version: 2020.1
3+
- version: fast-2020.1
44
- version: CUSTOM-REVISION
55
packages:
66
- name: Core
@@ -196,8 +196,8 @@ publish_{{ package.id }}:
196196
dependencies:
197197
- .yamato/upm-ci-packages.yml#pack_{{ package.id }}
198198
{% for platform in platforms %}
199-
# just using trunk for if a publish is happening
200-
- .yamato/upm-ci-packages.yml#test_{{ package.id}}_{{ platform.name }}_trunk
199+
# just using non-fast for if a publish is happening
200+
- .yamato/upm-ci-packages.yml#test_{{ package.id}}_{{ platform.name }}_2020.1
201201
{% endfor %}
202202
{% endfor %}
203203

‎.yamato/upm-ci-shadergraph.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
editors:
2-
- version: trunk
2+
- version: 2020.1
33
rerun_strategy: on-new-revision
4-
- version: fast-trunk
4+
- version: fast-2020.1
55
rerun_strategy: on-new-revision
66
- version: CUSTOM-REVISION
77
rerun_strategy: always

‎.yamato/upm-ci-shadergraph_stereo.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
editors:
2-
- version: trunk
2+
- version: 2020.1
33
rerun_strategy: on-new-revision
4-
- version: fast-trunk
4+
- version: fast-2020.1
55
rerun_strategy: on-new-revision
66
- version: CUSTOM-REVISION
77
rerun_strategy: always

‎.yamato/upm-ci-templates.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
editors:
2-
- version: trunk
3-
- version: fast-trunk
2+
- version: 2020.1
3+
- version: fast-2020.1
44
templates:
55
- name: HDRP Template
66
id: hdrp_template

0 commit comments

Comments
 (0)