Skip to content

Commit 95a3bba

Browse files
sophiaaarThéo PenavaireLiis Kivistik
authored
[2021.1][Yamato] Misc backports (#3175)
* backport #3034 * backport #3168 * backport 650775a * remove win dx12 playmode editor from ci due to 1308059 * Fix urp udate custom revision jobs (#3107) * backport #3129 * fix nightlies * backport #2954 Co-authored-by: Théo Penavaire <theo-pnv@users.noreply.github.com> Co-authored-by: Liis Kivistik <liis.kivistik@unity3d.com>
1 parent 7305892 commit 95a3bba

File tree

122 files changed

+5999
-1226
lines changed

Some content is hidden

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

122 files changed

+5999
-1226
lines changed

‎.yamato/_abv.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ all_project_ci_2021.1:
2727
all_project_ci_nightly_2021.1:
2828
name: _Nightly ABV against 2021.1
2929
dependencies:
30+
- path: .yamato/all-urp_performance_boatattack.yml#PR_URP_Performance_BoatAttack_2021.1
31+
rerun: on-new-revision
32+
- path: .yamato/all-urp_performance_lostcrypt.yml#PR_URP_Performance_LostCrypt_2021.1
33+
rerun: on-new-revision
34+
- path: .yamato/all-urpupdate.yml#PR_URPUpdate_2021.1
35+
rerun: on-new-revision
3036
- path: .yamato/_projectcontext.yml#all_package_ci_project_2021.1
3137
rerun: on-new-revision
3238
- path: .yamato/all-universal.yml#Nightly_Universal_2021.1

‎.yamato/_editor_priming.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ editor:priming:CUSTOM-REVISION:macos:
1111
name: '[CUSTOM-REVISION,macos] Editor priming'
1212
agent:
1313
type: Unity::VM
14-
image: cds-ops/ubuntu-16.04-base:stable
14+
image: package-ci/ubuntu:stable
1515
flavor: b1.small
1616
skip_checkout: true
1717
variables:
@@ -30,7 +30,7 @@ editor:priming:test_min_editor:macos:
3030
name: '[Min_Editor,macos] Editor priming'
3131
agent:
3232
type: Unity::VM
33-
image: cds-ops/ubuntu-16.04-base:stable
33+
image: package-ci/ubuntu:stable
3434
flavor: b1.small
3535
variables:
3636
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
@@ -49,7 +49,7 @@ editor:priming:CUSTOM-REVISION:android:
4949
name: '[CUSTOM-REVISION,android] Editor priming'
5050
agent:
5151
type: Unity::VM
52-
image: cds-ops/ubuntu-16.04-base:stable
52+
image: package-ci/ubuntu:stable
5353
flavor: b1.small
5454
skip_checkout: true
5555
variables:
@@ -68,7 +68,7 @@ editor:priming:test_min_editor:android:
6868
name: '[Min_Editor,android] Editor priming'
6969
agent:
7070
type: Unity::VM
71-
image: cds-ops/ubuntu-16.04-base:stable
71+
image: package-ci/ubuntu:stable
7272
flavor: b1.small
7373
variables:
7474
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
@@ -87,7 +87,7 @@ editor:priming:CUSTOM-REVISION:windows:
8787
name: '[CUSTOM-REVISION,windows] Editor priming'
8888
agent:
8989
type: Unity::VM
90-
image: cds-ops/ubuntu-16.04-base:stable
90+
image: package-ci/ubuntu:stable
9191
flavor: b1.small
9292
skip_checkout: true
9393
variables:
@@ -106,7 +106,7 @@ editor:priming:test_min_editor:windows:
106106
name: '[Min_Editor,windows] Editor priming'
107107
agent:
108108
type: Unity::VM
109-
image: cds-ops/ubuntu-16.04-base:stable
109+
image: package-ci/ubuntu:stable
110110
flavor: b1.small
111111
variables:
112112
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
@@ -125,7 +125,7 @@ editor:priming:CUSTOM-REVISION:linux:
125125
name: '[CUSTOM-REVISION,linux] Editor priming'
126126
agent:
127127
type: Unity::VM
128-
image: cds-ops/ubuntu-16.04-base:stable
128+
image: package-ci/ubuntu:stable
129129
flavor: b1.small
130130
skip_checkout: true
131131
variables:
@@ -144,7 +144,7 @@ editor:priming:test_min_editor:linux:
144144
name: '[Min_Editor,linux] Editor priming'
145145
agent:
146146
type: Unity::VM
147-
image: cds-ops/ubuntu-16.04-base:stable
147+
image: package-ci/ubuntu:stable
148148
flavor: b1.small
149149
variables:
150150
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
@@ -163,7 +163,7 @@ editor:priming:CUSTOM-REVISION:ios:
163163
name: '[CUSTOM-REVISION,ios] Editor priming'
164164
agent:
165165
type: Unity::VM
166-
image: cds-ops/ubuntu-16.04-base:stable
166+
image: package-ci/ubuntu:stable
167167
flavor: b1.small
168168
skip_checkout: true
169169
variables:
@@ -182,7 +182,7 @@ editor:priming:test_min_editor:ios:
182182
name: '[Min_Editor,ios] Editor priming'
183183
agent:
184184
type: Unity::VM
185-
image: cds-ops/ubuntu-16.04-base:stable
185+
image: package-ci/ubuntu:stable
186186
flavor: b1.small
187187
variables:
188188
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin

‎.yamato/_formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ formatting:
1111
name: Formatting
1212
agent:
1313
type: Unity::VM
14-
image: cds-ops/ubuntu-16.04-base:stable
14+
image: package-ci/ubuntu:stable
1515
flavor: b1.small
1616
commands:
1717
- "echo -e \"[extensions]\nlargefiles=\n\" > ~/.hgrc"

‎.yamato/all-hdrp.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ PR_HDRP_2021.1:
1414
rerun: on-new-revision
1515
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_cache_mono_Linear_2021.1
1616
rerun: on-new-revision
17-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_mono_Linear_2021.1
17+
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_cache_mono_Linear_2021.1
1818
rerun: on-new-revision
1919
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_2021.1
2020
rerun: on-new-revision
@@ -54,22 +54,25 @@ Nightly_HDRP_2021.1:
5454
rerun: on-new-revision
5555
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_cache_mono_Linear_2021.1
5656
rerun: on-new-revision
57-
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_mono_Linear_2021.1
57+
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_cache_mono_Linear_2021.1
5858
rerun: on-new-revision
5959
- path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_cache_mono_Linear_2021.1
6060
rerun: on-new-revision
61-
- path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_mono_Linear_2021.1
61+
- path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_cache_mono_Linear_2021.1
6262
rerun: on-new-revision
6363
- path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_editmode_mono_Linear_2021.1
6464
rerun: on-new-revision
65+
variables:
66+
UTR_VERSION: "current"
67+
TEST_FILTER: .*
6568
PR_HDRP_CUSTOM-REVISION:
6669
name: HDRP PR Job - CUSTOM-REVISION
6770
dependencies:
6871
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_cache_mono_Linear_CUSTOM-REVISION
6972
rerun: always
7073
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_cache_mono_Linear_CUSTOM-REVISION
7174
rerun: always
72-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION
75+
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_cache_mono_Linear_CUSTOM-REVISION
7376
rerun: always
7477
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
7578
rerun: always
@@ -108,13 +111,15 @@ Nightly_HDRP_CUSTOM-REVISION:
108111
rerun: always
109112
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_cache_mono_Linear_CUSTOM-REVISION
110113
rerun: always
111-
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_mono_Linear_CUSTOM-REVISION
114+
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_cache_mono_Linear_CUSTOM-REVISION
112115
rerun: always
113116
- path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION
114117
rerun: always
115-
- path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_mono_Linear_CUSTOM-REVISION
118+
- path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_cache_mono_Linear_CUSTOM-REVISION
116119
rerun: always
117120
- path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION
118121
rerun: always
119122
variables:
120123
CUSTOM_REVISION: custom_revision_not_set
124+
UTR_VERSION: "current"
125+
TEST_FILTER: .*

‎.yamato/all-hdrp_dxr.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ Nightly_HDRP_DXR_2021.1:
2020
dependencies:
2121
- path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_2021.1
2222
rerun: on-new-revision
23-
- path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_mono_Linear_2021.1
23+
- path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_cache_mono_Linear_2021.1
2424
rerun: on-new-revision
25+
variables:
26+
UTR_VERSION: "current"
27+
TEST_FILTER: .*
2528
PR_HDRP_DXR_CUSTOM-REVISION:
2629
name: HDRP_DXR PR Job - CUSTOM-REVISION
2730
dependencies:
@@ -36,7 +39,9 @@ Nightly_HDRP_DXR_CUSTOM-REVISION:
3639
dependencies:
3740
- path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_CUSTOM-REVISION
3841
rerun: always
39-
- path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_mono_Linear_CUSTOM-REVISION
42+
- path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_cache_mono_Linear_CUSTOM-REVISION
4043
rerun: always
4144
variables:
4245
CUSTOM_REVISION: custom_revision_not_set
46+
UTR_VERSION: "current"
47+
TEST_FILTER: .*

‎.yamato/all-hdrp_hybrid.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@ PR_HDRP_Hybrid_2021.1:
1818
Nightly_HDRP_Hybrid_2021.1:
1919
name: Nightly HDRP_Hybrid - 2021.1
2020
dependencies:
21-
- path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_XR_mono_Linear_2021.1
21+
- path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_XR_cache_mono_Linear_2021.1
2222
rerun: on-new-revision
2323
- path: .yamato/all-hdrp_hybrid.yml#PR_HDRP_Hybrid_2021.1
2424
rerun: on-new-revision
25+
variables:
26+
UTR_VERSION: "current"
27+
TEST_FILTER: .*
2528
PR_HDRP_Hybrid_CUSTOM-REVISION:
2629
name: HDRP_Hybrid PR Job - CUSTOM-REVISION
2730
dependencies:
@@ -34,9 +37,11 @@ PR_HDRP_Hybrid_CUSTOM-REVISION:
3437
Nightly_HDRP_Hybrid_CUSTOM-REVISION:
3538
name: Nightly HDRP_Hybrid - CUSTOM-REVISION
3639
dependencies:
37-
- path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION
40+
- path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_XR_cache_mono_Linear_CUSTOM-REVISION
3841
rerun: always
3942
- path: .yamato/all-hdrp_hybrid.yml#PR_HDRP_Hybrid_CUSTOM-REVISION
4043
rerun: always
4144
variables:
4245
CUSTOM_REVISION: custom_revision_not_set
46+
UTR_VERSION: "current"
47+
TEST_FILTER: .*

‎.yamato/all-shadergraph.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ Nightly_ShaderGraph_2021.1:
4444
rerun: on-new-revision
4545
- path: .yamato/shadergraph-android-vulkan.yml#ShaderGraph_Android_Vulkan_Standalone_cache_il2cpp_Linear_2021.1
4646
rerun: on-new-revision
47+
variables:
48+
UTR_VERSION: "current"
49+
TEST_FILTER: .*
4750
PR_ShaderGraph_CUSTOM-REVISION:
4851
name: ShaderGraph PR Job - CUSTOM-REVISION
4952
dependencies:
@@ -82,3 +85,5 @@ Nightly_ShaderGraph_CUSTOM-REVISION:
8285
rerun: always
8386
variables:
8487
CUSTOM_REVISION: custom_revision_not_set
88+
UTR_VERSION: "current"
89+
TEST_FILTER: .*

‎.yamato/all-shadergraph_stereo.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ Nightly_ShaderGraph_Stereo_2021.1:
2222
dependencies:
2323
- path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_2021.1
2424
rerun: on-new-revision
25+
variables:
26+
UTR_VERSION: "current"
27+
TEST_FILTER: .*
2528
PR_ShaderGraph_Stereo_CUSTOM-REVISION:
2629
name: ShaderGraph_Stereo PR Job - CUSTOM-REVISION
2730
dependencies:
@@ -40,3 +43,5 @@ Nightly_ShaderGraph_Stereo_CUSTOM-REVISION:
4043
rerun: always
4144
variables:
4245
CUSTOM_REVISION: custom_revision_not_set
46+
UTR_VERSION: "current"
47+
TEST_FILTER: .*

‎.yamato/all-smoke_test.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ Nightly_Smoke_Test_2021.1:
2424
dependencies:
2525
- path: .yamato/all-smoke_test.yml#PR_Smoke_Test_2021.1
2626
rerun: on-new-revision
27+
variables:
28+
UTR_VERSION: "current"
29+
TEST_FILTER: .*
2730
PR_Smoke_Test_CUSTOM-REVISION:
2831
name: Smoke_Test PR Job - CUSTOM-REVISION
2932
dependencies:
@@ -44,3 +47,5 @@ Nightly_Smoke_Test_CUSTOM-REVISION:
4447
rerun: always
4548
variables:
4649
CUSTOM_REVISION: custom_revision_not_set
50+
UTR_VERSION: "current"
51+
TEST_FILTER: .*

‎.yamato/all-universal.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PR_Universal_2021.1:
1212
dependencies:
1313
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_Standalone_cache_mono_Linear_2021.1
1414
rerun: on-new-revision
15-
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_XR_mono_Linear_2021.1
15+
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_XR_cache_mono_Linear_2021.1
1616
rerun: on-new-revision
1717
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_Linear_2021.1
1818
rerun: on-new-revision
@@ -74,12 +74,15 @@ Nightly_Universal_2021.1:
7474
rerun: on-new-revision
7575
- path: .yamato/universal-linux-vulkan.yml#Universal_Linux_Vulkan_playmode_cache_mono_Linear_2021.1
7676
rerun: on-new-revision
77+
variables:
78+
UTR_VERSION: "current"
79+
TEST_FILTER: .*
7780
PR_Universal_CUSTOM-REVISION:
7881
name: Universal PR Job - CUSTOM-REVISION
7982
dependencies:
8083
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_Standalone_cache_mono_Linear_CUSTOM-REVISION
8184
rerun: always
82-
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION
85+
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_XR_cache_mono_Linear_CUSTOM-REVISION
8386
rerun: always
8487
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
8588
rerun: always
@@ -142,3 +145,5 @@ Nightly_Universal_CUSTOM-REVISION:
142145
rerun: always
143146
variables:
144147
CUSTOM_REVISION: custom_revision_not_set
148+
UTR_VERSION: "current"
149+
TEST_FILTER: .*

0 commit comments

Comments
 (0)