Skip to content

Commit 8b9fdb4

Browse files
sebastienlagardealelievrtheo-at-unity
authored
[Backport][HDRP] Fix linux vulkan tests #6086 (#6096)
* [HDRP] Fix linux vulkan tests (#6086) * Try to fix linux vulkan tests * Try fix linux config * Generate yamls Co-authored-by: Antoine Lelievre <antoinel@unity3d.com> Co-authored-by: Théo Penavaire <theo.penavaire@unity3d.com>
1 parent b85c189 commit 8b9fdb4

File tree

5 files changed

+30
-17
lines changed

5 files changed

+30
-17
lines changed

.yamato/config/hdrp.metafile

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ platforms:
4646
flavor: b1.xlarge
4747
model: rtx2080
4848
editmode:
49-
type: Unity::VM
49+
type: Unity::VM::GPU
5050
image: graphics-foundation/win10-dxr:stable
5151
flavor: b1.xlarge
5252
standalone:
@@ -77,6 +77,19 @@ platforms:
7777
- name: mono
7878
color_spaces:
7979
- Linear
80+
agents_project:
81+
default:
82+
type: Unity::VM::GPU
83+
image: package-ci/ubuntu:stable
84+
flavor: b1.large
85+
editmode:
86+
type: Unity::VM::GPU
87+
image: package-ci/ubuntu:stable
88+
flavor: b1.large
89+
standalone_build:
90+
type: Unity::VM::GPU
91+
image: package-ci/ubuntu:stable
92+
flavor: b1.large
8093

8194
jobs:
8295
- name: PR <PROJECT_NAME>

.yamato/hdrp-linux-vulkan.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ HDRP_Linux_Vulkan_playmode_XR_mono_Linear_2021.2:
8282
HDRP_Linux_Vulkan_editmode_mono_Linear_2021.2:
8383
name: HDRP on Linux_Vulkan_editmode_mono_Linear on version 2021.2
8484
agent:
85-
type: Unity::VM
85+
type: Unity::VM::GPU
8686
image: package-ci/ubuntu:stable
8787
flavor: b1.large
8888
variables:
@@ -184,9 +184,9 @@ HDRP_Linux_Vulkan_Standalone_mono_Linear_2021.2:
184184
Build_HDRP_Linux_Vulkan_Standalone_mono_Linear_2021.2:
185185
name: Build HDRP on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2
186186
agent:
187-
type: Unity::VM
187+
type: Unity::VM::GPU
188188
image: package-ci/ubuntu:stable
189-
flavor: b1.xlarge
189+
flavor: b1.large
190190
variables:
191191
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
192192
CUSTOM_REVISION: '{{2021_2.changeset.id}}'
@@ -253,9 +253,9 @@ HDRP_Linux_Vulkan_Standalone_XR_mono_Linear_2021.2:
253253
Build_HDRP_Linux_Vulkan_Standalone_XR_mono_Linear_2021.2:
254254
name: Build HDRP on Linux_Vulkan_mono_Linear_Standalone_XR_build_Player on version 2021.2
255255
agent:
256-
type: Unity::VM
256+
type: Unity::VM::GPU
257257
image: package-ci/ubuntu:stable
258-
flavor: b1.xlarge
258+
flavor: b1.large
259259
variables:
260260
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
261261
CUSTOM_REVISION: '{{2021_2.changeset.id}}'
@@ -364,7 +364,7 @@ HDRP_Linux_Vulkan_playmode_XR_mono_Linear_CUSTOM-REVISION:
364364
HDRP_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION:
365365
name: HDRP on Linux_Vulkan_editmode_mono_Linear on version CUSTOM-REVISION
366366
agent:
367-
type: Unity::VM
367+
type: Unity::VM::GPU
368368
image: package-ci/ubuntu:stable
369369
flavor: b1.large
370370
variables:
@@ -466,9 +466,9 @@ HDRP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION:
466466
Build_HDRP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION:
467467
name: Build HDRP on Linux_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION
468468
agent:
469-
type: Unity::VM
469+
type: Unity::VM::GPU
470470
image: package-ci/ubuntu:stable
471-
flavor: b1.xlarge
471+
flavor: b1.large
472472
variables:
473473
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
474474
CUSTOM_REVISION: custom_revision_not_set
@@ -535,9 +535,9 @@ HDRP_Linux_Vulkan_Standalone_XR_mono_Linear_CUSTOM-REVISION:
535535
Build_HDRP_Linux_Vulkan_Standalone_XR_mono_Linear_CUSTOM-REVISION:
536536
name: Build HDRP on Linux_Vulkan_mono_Linear_Standalone_XR_build_Player on version CUSTOM-REVISION
537537
agent:
538-
type: Unity::VM
538+
type: Unity::VM::GPU
539539
image: package-ci/ubuntu:stable
540-
flavor: b1.xlarge
540+
flavor: b1.large
541541
variables:
542542
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
543543
CUSTOM_REVISION: custom_revision_not_set

.yamato/hdrp-win-dx11.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ HDRP_Win_DX11_playmode_XR_mono_Linear_2021.2:
8080
HDRP_Win_DX11_editmode_mono_Linear_2021.2:
8181
name: HDRP on Win_DX11_editmode_mono_Linear on version 2021.2
8282
agent:
83-
type: Unity::VM
83+
type: Unity::VM::GPU
8484
image: graphics-foundation/win10-dxr:stable
8585
flavor: b1.xlarge
8686
variables:
@@ -360,7 +360,7 @@ HDRP_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION:
360360
HDRP_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION:
361361
name: HDRP on Win_DX11_editmode_mono_Linear on version CUSTOM-REVISION
362362
agent:
363-
type: Unity::VM
363+
type: Unity::VM::GPU
364364
image: graphics-foundation/win10-dxr:stable
365365
flavor: b1.xlarge
366366
variables:

.yamato/hdrp-win-dx12.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ HDRP_Win_DX12_playmode_XR_mono_Linear_2021.2:
8080
HDRP_Win_DX12_editmode_mono_Linear_2021.2:
8181
name: HDRP on Win_DX12_editmode_mono_Linear on version 2021.2
8282
agent:
83-
type: Unity::VM
83+
type: Unity::VM::GPU
8484
image: graphics-foundation/win10-dxr:stable
8585
flavor: b1.xlarge
8686
variables:
@@ -360,7 +360,7 @@ HDRP_Win_DX12_playmode_XR_mono_Linear_CUSTOM-REVISION:
360360
HDRP_Win_DX12_editmode_mono_Linear_CUSTOM-REVISION:
361361
name: HDRP on Win_DX12_editmode_mono_Linear on version CUSTOM-REVISION
362362
agent:
363-
type: Unity::VM
363+
type: Unity::VM::GPU
364364
image: graphics-foundation/win10-dxr:stable
365365
flavor: b1.xlarge
366366
variables:

.yamato/hdrp-win-vulkan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ HDRP_Win_Vulkan_playmode_XR_mono_Linear_2021.2:
8080
HDRP_Win_Vulkan_editmode_mono_Linear_2021.2:
8181
name: HDRP on Win_Vulkan_editmode_mono_Linear on version 2021.2
8282
agent:
83-
type: Unity::VM
83+
type: Unity::VM::GPU
8484
image: graphics-foundation/win10-dxr:stable
8585
flavor: b1.xlarge
8686
variables:
@@ -360,7 +360,7 @@ HDRP_Win_Vulkan_playmode_XR_mono_Linear_CUSTOM-REVISION:
360360
HDRP_Win_Vulkan_editmode_mono_Linear_CUSTOM-REVISION:
361361
name: HDRP on Win_Vulkan_editmode_mono_Linear on version CUSTOM-REVISION
362362
agent:
363-
type: Unity::VM
363+
type: Unity::VM::GPU
364364
image: graphics-foundation/win10-dxr:stable
365365
flavor: b1.xlarge
366366
variables:

0 commit comments

Comments
 (0)