From ec536e0fabe18e41680160b4e8cc83410d0aeeda Mon Sep 17 00:00:00 2001 From: Liis Kivistik Date: Wed, 10 Jun 2020 14:10:02 +0200 Subject: [PATCH 1/2] updated hdrp agents --- .yamato/config/hdrp.metafile | 28 +++++++++++++++++++--- .yamato/hdrp-win-dx11.yml | 45 +++++++++++++++++++++--------------- .yamato/hdrp-win-dx12.yml | 45 +++++++++++++++++++++--------------- .yamato/hdrp-win-vulkan.yml | 45 +++++++++++++++++++++--------------- 4 files changed, 106 insertions(+), 57 deletions(-) diff --git a/.yamato/config/hdrp.metafile b/.yamato/config/hdrp.metafile index f9f364ec47a..6d171978e84 100644 --- a/.yamato/config/hdrp.metafile +++ b/.yamato/config/hdrp.metafile @@ -9,10 +9,32 @@ test_platforms: - Standalone platforms: - name: Win + os: windows apis: - - DX11 - - DX12 - - Vulkan + DX11: -force-d3d11 + DX12: -force-d3d12 + Vulkan: -force-vulkan + agent_default: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 + agent_editmode: + type: Unity::VM + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 + agent_standalone: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + agent_standalone_build: + type: Unity::VM + image: sdet/gamecode_win10:stable + flavor: b1.xlarge + components: + - editor + - il2cpp - name: OSX apis: - Metal diff --git a/.yamato/hdrp-win-dx11.yml b/.yamato/hdrp-win-dx11.yml index a6b042861e0..90ca19519e2 100644 --- a/.yamato/hdrp-win-dx11.yml +++ b/.yamato/hdrp-win-dx11.yml @@ -7,8 +7,9 @@ HDRP_Win_DX11_playmode_trunk: name: HDRP on Win_DX11_playmode on version trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -27,8 +28,9 @@ HDRP_Win_DX11_playmode_XR_trunk: name: HDRP on Win_DX11_playmode_XR on version trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -47,8 +49,9 @@ HDRP_Win_DX11_editmode_trunk: name: HDRP on Win_DX11_editmode on version trunk agent: type: Unity::VM - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -113,8 +116,9 @@ HDRP_Win_DX11_playmode_fast-trunk: name: HDRP on Win_DX11_playmode on version fast-trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -133,8 +137,9 @@ HDRP_Win_DX11_playmode_XR_fast-trunk: name: HDRP on Win_DX11_playmode_XR on version fast-trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -153,8 +158,9 @@ HDRP_Win_DX11_editmode_fast-trunk: name: HDRP on Win_DX11_editmode on version fast-trunk agent: type: Unity::VM - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -219,8 +225,9 @@ HDRP_Win_DX11_playmode_CUSTOM-REVISION: name: HDRP on Win_DX11_playmode on version CUSTOM-REVISION agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -240,8 +247,9 @@ HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION: name: HDRP on Win_DX11_playmode_XR on version CUSTOM-REVISION agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -261,8 +269,9 @@ HDRP_Win_DX11_editmode_CUSTOM-REVISION: name: HDRP on Win_DX11_editmode on version CUSTOM-REVISION agent: type: Unity::VM - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/hdrp-win-dx12.yml b/.yamato/hdrp-win-dx12.yml index c24fbb0623e..d825528fed8 100644 --- a/.yamato/hdrp-win-dx12.yml +++ b/.yamato/hdrp-win-dx12.yml @@ -7,8 +7,9 @@ HDRP_Win_DX12_playmode_trunk: name: HDRP on Win_DX12_playmode on version trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -27,8 +28,9 @@ HDRP_Win_DX12_playmode_XR_trunk: name: HDRP on Win_DX12_playmode_XR on version trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -47,8 +49,9 @@ HDRP_Win_DX12_editmode_trunk: name: HDRP on Win_DX12_editmode on version trunk agent: type: Unity::VM - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -113,8 +116,9 @@ HDRP_Win_DX12_playmode_fast-trunk: name: HDRP on Win_DX12_playmode on version fast-trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -133,8 +137,9 @@ HDRP_Win_DX12_playmode_XR_fast-trunk: name: HDRP on Win_DX12_playmode_XR on version fast-trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -153,8 +158,9 @@ HDRP_Win_DX12_editmode_fast-trunk: name: HDRP on Win_DX12_editmode on version fast-trunk agent: type: Unity::VM - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -219,8 +225,9 @@ HDRP_Win_DX12_playmode_CUSTOM-REVISION: name: HDRP on Win_DX12_playmode on version CUSTOM-REVISION agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -240,8 +247,9 @@ HDRP_Win_DX12_playmode_XR_CUSTOM-REVISION: name: HDRP on Win_DX12_playmode_XR on version CUSTOM-REVISION agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -261,8 +269,9 @@ HDRP_Win_DX12_editmode_CUSTOM-REVISION: name: HDRP on Win_DX12_editmode on version CUSTOM-REVISION agent: type: Unity::VM - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/hdrp-win-vulkan.yml b/.yamato/hdrp-win-vulkan.yml index 1e94b75064a..e2482614038 100644 --- a/.yamato/hdrp-win-vulkan.yml +++ b/.yamato/hdrp-win-vulkan.yml @@ -7,8 +7,9 @@ HDRP_Win_Vulkan_playmode_trunk: name: HDRP on Win_Vulkan_playmode on version trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -27,8 +28,9 @@ HDRP_Win_Vulkan_playmode_XR_trunk: name: HDRP on Win_Vulkan_playmode_XR on version trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -47,8 +49,9 @@ HDRP_Win_Vulkan_editmode_trunk: name: HDRP on Win_Vulkan_editmode on version trunk agent: type: Unity::VM - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -113,8 +116,9 @@ HDRP_Win_Vulkan_playmode_fast-trunk: name: HDRP on Win_Vulkan_playmode on version fast-trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -133,8 +137,9 @@ HDRP_Win_Vulkan_playmode_XR_fast-trunk: name: HDRP on Win_Vulkan_playmode_XR on version fast-trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -153,8 +158,9 @@ HDRP_Win_Vulkan_editmode_fast-trunk: name: HDRP on Win_Vulkan_editmode on version fast-trunk agent: type: Unity::VM - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -219,8 +225,9 @@ HDRP_Win_Vulkan_playmode_CUSTOM-REVISION: name: HDRP on Win_Vulkan_playmode on version CUSTOM-REVISION agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -240,8 +247,9 @@ HDRP_Win_Vulkan_playmode_XR_CUSTOM-REVISION: name: HDRP on Win_Vulkan_playmode_XR on version CUSTOM-REVISION agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -261,8 +269,9 @@ HDRP_Win_Vulkan_editmode_CUSTOM-REVISION: name: HDRP on Win_Vulkan_editmode on version CUSTOM-REVISION agent: type: Unity::VM - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set From 8bd0a23bee8cb7a34545ae8022f85921176af92d Mon Sep 17 00:00:00 2001 From: Sophia Date: Wed, 10 Jun 2020 16:07:52 +0200 Subject: [PATCH 2/2] update image for standalone and editmode tests [skip ci] --- .yamato/config/hdrp.metafile | 9 +++++---- .yamato/hdrp-win-dx11.yml | 27 +++++++++++++++------------ .yamato/hdrp-win-dx12.yml | 27 +++++++++++++++------------ .yamato/hdrp-win-vulkan.yml | 27 +++++++++++++++------------ 4 files changed, 50 insertions(+), 40 deletions(-) diff --git a/.yamato/config/hdrp.metafile b/.yamato/config/hdrp.metafile index 6d171978e84..13c191ece71 100644 --- a/.yamato/config/hdrp.metafile +++ b/.yamato/config/hdrp.metafile @@ -23,15 +23,16 @@ platforms: type: Unity::VM image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge - model: rtx2080 agent_standalone: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 agent_standalone_build: type: Unity::VM - image: sdet/gamecode_win10:stable + image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge + model: rtx2080 components: - editor - il2cpp diff --git a/.yamato/hdrp-win-dx11.yml b/.yamato/hdrp-win-dx11.yml index 90ca19519e2..c35ca9709ab 100644 --- a/.yamato/hdrp-win-dx11.yml +++ b/.yamato/hdrp-win-dx11.yml @@ -51,7 +51,6 @@ HDRP_Win_DX11_editmode_trunk: type: Unity::VM image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge - model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -70,8 +69,9 @@ HDRP_Win_DX11_Standalone_trunk: name: HDRP on Win_DX11_Standalone on version trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -93,8 +93,9 @@ Build_HDRP_Win_DX11_Player_trunk: name: Build HDRP on Win_DX11_Player on version trunk agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -160,7 +161,6 @@ HDRP_Win_DX11_editmode_fast-trunk: type: Unity::VM image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge - model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -179,8 +179,9 @@ HDRP_Win_DX11_Standalone_fast-trunk: name: HDRP on Win_DX11_Standalone on version fast-trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -202,8 +203,9 @@ Build_HDRP_Win_DX11_Player_fast-trunk: name: Build HDRP on Win_DX11_Player on version fast-trunk agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -271,7 +273,6 @@ HDRP_Win_DX11_editmode_CUSTOM-REVISION: type: Unity::VM image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge - model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -291,8 +292,9 @@ HDRP_Win_DX11_Standalone_CUSTOM-REVISION: name: HDRP on Win_DX11_Standalone on version CUSTOM-REVISION agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -315,8 +317,9 @@ Build_HDRP_Win_DX11_Player_CUSTOM-REVISION: name: Build HDRP on Win_DX11_Player on version CUSTOM-REVISION agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/hdrp-win-dx12.yml b/.yamato/hdrp-win-dx12.yml index d825528fed8..5cb2a742f27 100644 --- a/.yamato/hdrp-win-dx12.yml +++ b/.yamato/hdrp-win-dx12.yml @@ -51,7 +51,6 @@ HDRP_Win_DX12_editmode_trunk: type: Unity::VM image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge - model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -70,8 +69,9 @@ HDRP_Win_DX12_Standalone_trunk: name: HDRP on Win_DX12_Standalone on version trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -93,8 +93,9 @@ Build_HDRP_Win_DX12_Player_trunk: name: Build HDRP on Win_DX12_Player on version trunk agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -160,7 +161,6 @@ HDRP_Win_DX12_editmode_fast-trunk: type: Unity::VM image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge - model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -179,8 +179,9 @@ HDRP_Win_DX12_Standalone_fast-trunk: name: HDRP on Win_DX12_Standalone on version fast-trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -202,8 +203,9 @@ Build_HDRP_Win_DX12_Player_fast-trunk: name: Build HDRP on Win_DX12_Player on version fast-trunk agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -271,7 +273,6 @@ HDRP_Win_DX12_editmode_CUSTOM-REVISION: type: Unity::VM image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge - model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -291,8 +292,9 @@ HDRP_Win_DX12_Standalone_CUSTOM-REVISION: name: HDRP on Win_DX12_Standalone on version CUSTOM-REVISION agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -315,8 +317,9 @@ Build_HDRP_Win_DX12_Player_CUSTOM-REVISION: name: Build HDRP on Win_DX12_Player on version CUSTOM-REVISION agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/hdrp-win-vulkan.yml b/.yamato/hdrp-win-vulkan.yml index e2482614038..110397da470 100644 --- a/.yamato/hdrp-win-vulkan.yml +++ b/.yamato/hdrp-win-vulkan.yml @@ -51,7 +51,6 @@ HDRP_Win_Vulkan_editmode_trunk: type: Unity::VM image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge - model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -70,8 +69,9 @@ HDRP_Win_Vulkan_Standalone_trunk: name: HDRP on Win_Vulkan_Standalone on version trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -93,8 +93,9 @@ Build_HDRP_Win_Vulkan_Player_trunk: name: Build HDRP on Win_Vulkan_Player on version trunk agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -160,7 +161,6 @@ HDRP_Win_Vulkan_editmode_fast-trunk: type: Unity::VM image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge - model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -179,8 +179,9 @@ HDRP_Win_Vulkan_Standalone_fast-trunk: name: HDRP on Win_Vulkan_Standalone on version fast-trunk agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -202,8 +203,9 @@ Build_HDRP_Win_Vulkan_Player_fast-trunk: name: Build HDRP on Win_Vulkan_Player on version fast-trunk agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates dependencies: @@ -271,7 +273,6 @@ HDRP_Win_Vulkan_editmode_CUSTOM-REVISION: type: Unity::VM image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge - model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -291,8 +292,9 @@ HDRP_Win_Vulkan_Standalone_CUSTOM-REVISION: name: HDRP on Win_Vulkan_Standalone on version CUSTOM-REVISION agent: type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large + image: graphics-foundation/win10-dxr:latest + flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -315,8 +317,9 @@ Build_HDRP_Win_Vulkan_Player_CUSTOM-REVISION: name: Build HDRP on Win_Vulkan_Player on version CUSTOM-REVISION agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: graphics-foundation/win10-dxr:latest flavor: b1.xlarge + model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set