Skip to content

[Yamato] yml backports #3264

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 2 commits into from
Jan 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .yamato/_abv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ all_project_ci_2021.1:
- path: .yamato/all-vfx_urp.yml#PR_VFX_URP_2021.1
rerun: on-new-revision
triggers:
expression: pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.core/**/*"]
expression: pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.core/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
all_project_ci_nightly_2021.1:
name: _Nightly ABV against 2021.1
dependencies:
Expand Down
4 changes: 1 addition & 3 deletions .yamato/_projectcontext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ all_package_ci_project_2021.1:
- .yamato/_projectcontext.yml#test_all_project_windows_2021.1
- .yamato/_projectcontext.yml#test_all_project_macos_2021.1
triggers:
expression: push.branch eq "2021.1/staging" AND NOT pull_request.draft
expression: pull_request.target eq "2021.1/staging" AND NOT pull_request.draft
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package izon -t
Expand All @@ -394,8 +394,6 @@ all_package_ci_project_CUSTOM-REVISION:
- .yamato/_projectcontext.yml#test_all_project_macos_CUSTOM-REVISION
variables:
CUSTOM_REVISION: custom_revision_not_set
triggers:
expression: push.branch eq "2021.1/staging" AND NOT pull_request.draft
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package izon -t
Expand Down
2 changes: 1 addition & 1 deletion .yamato/all-hdrp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ PR_HDRP_2021.1:
- path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_2021.1
rerun: on-new-revision
triggers:
expression: pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.high-definition/**/*", "com.unity.render-pipelines.high-definition-config/**/*", "TestProjects/HDRP_Tests/**/*"]
expression: pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.high-definition/**/*", "com.unity.render-pipelines.high-definition-config/**/*", "TestProjects/HDRP_Tests/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
variables:
UTR_VERSION: "current"
TEST_FILTER: .*
Expand Down
2 changes: 1 addition & 1 deletion .yamato/all-shadergraph.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ PR_ShaderGraph_2021.1:
- path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_2021.1
rerun: on-new-revision
triggers:
expression: pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"]
expression: pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
variables:
UTR_VERSION: "current"
TEST_FILTER: .*
Expand Down
2 changes: 1 addition & 1 deletion .yamato/all-universal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ PR_Universal_2021.1:
- path: .yamato/all-shadergraph.yml#PR_ShaderGraph_2021.1
rerun: on-new-revision
triggers:
expression: pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"]
expression: pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
variables:
UTR_VERSION: "current"
TEST_FILTER: .*
Expand Down
2 changes: 1 addition & 1 deletion .yamato/all-vfx_hdrp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ PR_VFX_HDRP_2021.1:
- path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_Standalone_mono_Linear_2021.1
rerun: on-new-revision
triggers:
expression: pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_HDRP/**/*"]
expression: pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_HDRP/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
variables:
UTR_VERSION: "current"
TEST_FILTER: .*
Expand Down
2 changes: 1 addition & 1 deletion .yamato/all-vfx_urp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PR_VFX_URP_2021.1:
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_cache_mono_Linear_2021.1
rerun: on-new-revision
triggers:
expression: pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_URP/**/*"]
expression: pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_URP/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
variables:
UTR_VERSION: "current"
TEST_FILTER: .*
Expand Down
4 changes: 2 additions & 2 deletions .yamato/config/_abv.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ abv: # specify the editor versions for which to create the expression trigger fo
- name: HDRP
- name: VFX_HDRP
- name: VFX_URP
expression_trigger:
expression: 'pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.core/**/*"]'
expression_trigger:
expression: 'pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.core/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
build_configs:
- mono
- il2cpp
Expand Down
3 changes: 1 addition & 2 deletions .yamato/config/hdrp.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ test_platforms:
- [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true"
- [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
expression_trigger:
expression: 'pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.high-definition/**/*", "com.unity.render-pipelines.high-definition-config/**/*", "TestProjects/HDRP_Tests/**/*"]'
expression: 'pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.high-definition/**/*", "com.unity.render-pipelines.high-definition-config/**/*", "TestProjects/HDRP_Tests/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
platforms:
- name: Win
apis:
Expand All @@ -61,7 +61,6 @@ platforms:
color_spaces:
- Linear
agents_project:
# default: package_ci_mac
default:
type: Unity::VM::GPU
image: graphics-foundation/win10-dxr:stable
Expand Down
19 changes: 19 additions & 0 deletions .yamato/config/hdrp_hybrid.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,25 @@ platforms:
- name: mono
color_spaces:
- Linear
agents_project:
default:
type: Unity::VM::GPU
image: graphics-foundation/win10-dxr:stable
flavor: b1.xlarge
model: rtx2080
editmode:
type: Unity::VM
image: graphics-foundation/win10-dxr:stable
flavor: b1.xlarge
standalone:
type: Unity::VM::GPU
image: graphics-foundation/win10-dxr:stable
flavor: b1.xlarge
model: rtx2080
standalone_build:
type: Unity::VM
image: graphics-foundation/win10-dxr:stable
flavor: b1.xlarge
- name: OSX
apis:
- name: Metal
Expand Down
24 changes: 23 additions & 1 deletion .yamato/config/shadergraph.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ test_platforms:
- [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true"
- [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
expression_trigger:
expression: 'pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"]'
expression: 'pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
platforms:
- name: Win
apis:
Expand All @@ -44,6 +44,28 @@ platforms:
- name: mono
color_spaces:
- Linear
agents_project:
default:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
flavor: b1.xlarge
model: rtx2080
editmode:
type: Unity::VM
image: sdet/gamecode_win10:stable
flavor: b1.large
standalone:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
flavor: b1.large
standalone_cache:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
flavor: b1.large
standalone_build:
type: Unity::VM
image: sdet/gamecode_win10:stable
flavor: b1.xlarge
- name: OSX
apis:
- name: Metal
Expand Down
24 changes: 23 additions & 1 deletion .yamato/config/universal.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ test_platforms:
- [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true"
- [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
expression_trigger:
expression: 'pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"]'
expression: 'pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
platforms:
- name: Win
apis:
Expand All @@ -64,6 +64,28 @@ platforms:
- name: mono
color_spaces:
- Linear
agents_project:
default:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
flavor: b1.xlarge
model: rtx2080
editmode:
type: Unity::VM
image: sdet/gamecode_win10:stable
flavor: b1.large
standalone:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
flavor: b1.large
standalone_cache:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
flavor: b1.large
standalone_build:
type: Unity::VM
image: sdet/gamecode_win10:stable
flavor: b1.xlarge
- name: OSX
apis:
- name: Metal
Expand Down
10 changes: 2 additions & 8 deletions .yamato/config/vfx_hdrp.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ test_platforms:
- [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP"
- [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true"
- [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
expression_trigger:
expression: 'pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_HDRP/**/*"]'
expression_trigger:
expression: 'pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_HDRP/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
platforms:
- name: Win
apis:
Expand All @@ -60,7 +60,6 @@ platforms:
color_spaces:
- Linear
agents_project:
# default: package_ci_mac
default:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
Expand All @@ -70,11 +69,6 @@ platforms:
type: Unity::VM
image: sdet/gamecode_win10:stable
flavor: b1.large
standalone:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
flavor: b1.xlarge
model: rtx2080
standalone_build:
type: Unity::VM
image: sdet/gamecode_win10:stable
Expand Down
37 changes: 34 additions & 3 deletions .yamato/config/vfx_urp.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ test_platforms:
- [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true"
- [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
# - type: editmode
expression_trigger:
expression: 'pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_URP/**/*"]'
expression_trigger:
expression: 'pull_request.target eq "2021.1/staging" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_URP/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
platforms:
- name: Win
apis:
Expand All @@ -45,7 +45,38 @@ platforms:
- name: mono
color_spaces:
- Linear
- name: OSX
agents_project:
default:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
flavor: b1.large
editmode:
type: Unity::VM
image: sdet/gamecode_win10:stable
flavor: b1.large
playmode:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
flavor: b1.xlarge
model: rtx2080
playmode_cache:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
flavor: b1.xlarge
model: rtx2080
standalone:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
flavor: b1.large
standalone_cache:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
flavor: b1.large
standalone_build:
type: Unity::VM
image: sdet/gamecode_win10:stable
flavor: b1.xlarge
- name: OSX
apis:
- name: Metal
exclude_test_platforms:
Expand Down
Loading