Skip to content

Redo metafiles with utr flags #2193

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.

Sign up for GitHub

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 148 commits into from
Nov 3, 2020
Merged

Redo metafiles with utr flags #2193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
ab4f137
changes for win and universal
Aug 27, 2020
2bce7fb
add back before deleted ymls
Aug 28, 2020
23f6ba4
osx opengl changes for universal
Aug 28, 2020
44cfd9f
linux extra args
Aug 28, 2020
3a37ea1
add iphone
Aug 28, 2020
420d39b
android
Aug 28, 2020
861efcf
internal cmds
Aug 28, 2020
c1b8bb6
rest of the projects
Aug 28, 2020
6a22dcf
metal
Sep 4, 2020
97bdeed
uncomment right platforms
Sep 4, 2020
a96ac10
Merge branch 'master' into yamato/extra-args
Sep 4, 2020
d1d7dca
smoke tests
Sep 4, 2020
daaea6f
metal standalone
Sep 4, 2020
2d858fa
hdrp hybrid
Sep 4, 2020
5beb12f
added comments
Sep 4, 2020
4423360
delete update_revisions
Sep 4, 2020
cd3ffa9
updated docs
Sep 4, 2020
3d0fcd7
remove commented code, change android build timeout
Sep 4, 2020
2eba567
add docs, allow android not standalones
Sep 11, 2020
9e4b751
add urp extra args example
Sep 11, 2020
41bb54a
add standalone build extra args
Sep 11, 2020
8465246
urp performance example
Sep 18, 2020
e2d10a4
rest of urp_performance
Sep 18, 2020
6b5487b
fix win standalone
Sep 18, 2020
bbc1c83
Merge branch 'yamato/extra-args-example' into performance/urp1
Sep 28, 2020
3ca8b8d
(WIP) missing build jobs
Sep 28, 2020
4aa4cab
fixed build jobs
Sep 28, 2020
1e5ab06
(WIP) add boat attack files back in
Sep 28, 2020
a7c49b2
add unity-config commands for windows
Sep 28, 2020
d99db13
rearrange windows commands
Sep 28, 2020
9240b9b
change lock-file command
Sep 28, 2020
a2ad255
update package versions
Sep 28, 2020
8d6aa15
add ios commands back in
Sep 28, 2020
571cc59
add unity-config commands to android jobs
Sep 28, 2020
caba615
fix excluded test platforms
Sep 28, 2020
dfca38e
updating unity-config commands a bit, updating addressable package too.
seanstolberg-unity Sep 28, 2020
037c4ff
ensure order of executeMethod args
seanstolberg-unity Sep 28, 2020
c873861
ensure executeMethod and method name stay together
seanstolberg-unity Sep 28, 2020
9e56475
try to pass testCategory to test runner
seanstolberg-unity Sep 28, 2020
02470b0
update project name
seanstolberg-unity Sep 28, 2020
1a1eab8
try to work around dir git error
seanstolberg-unity Sep 28, 2020
acb15f4
trying a different relative path
seanstolberg-unity Sep 29, 2020
19ed2fe
new path for performance-project-version
Sep 29, 2020
3d4bbad
(test) absolute path to project
Sep 29, 2020
d56229c
(test) change path
Sep 29, 2020
31fcac4
try not skipping checkout to see if this solves the git problem
seanstolberg-unity Sep 29, 2020
d2f0e63
revert checkout test, get package under test repo metadata during build
seanstolberg-unity Sep 29, 2020
2032079
trying out Android playmode, with some cleanup
seanstolberg-unity Sep 30, 2020
a685ac4
add manfiest update commands
seanstolberg-unity Sep 30, 2020
d3d2b97
issues finding UTR, try and different way
seanstolberg-unity Sep 30, 2020
fff122b
(WIP) add scripting_backend and color_space
Sep 30, 2020
13fb5e0
add scripting backend and color space to yml job definitions
Oct 1, 2020
1fe9d3b
make job names clearer
Oct 1, 2020
ce2c249
correct typo
Oct 1, 2020
f121424
(WIP) add platform-specific extra utr args
Oct 1, 2020
c9a2dfe
Revert "(WIP) add platform-specific extra utr args"
Oct 2, 2020
5cab1b7
change case of Linear
Oct 2, 2020
b248fd8
Revert "Revert "(WIP) add platform-specific extra utr args""
Oct 2, 2020
c471d68
(WIP) extra platform utr args
Oct 2, 2020
9218cf3
(WIP) add build args back in
Oct 2, 2020
39d00b0
(WIP) platform specific editor-args
Oct 2, 2020
c6c08f7
(WIP) build configs array
Oct 2, 2020
95f42c5
changed order of looping
Oct 2, 2020
b3447bf
add api compatibility level
Oct 2, 2020
d447b58
update perf params
Oct 2, 2020
246bb9f
fix iphone parse issue
Oct 2, 2020
e4196b4
fix openglcore parse issue
Oct 2, 2020
757ab33
fix iphone playmode
Oct 2, 2020
0b80877
add extra mono build config
Oct 2, 2020
bf4ecf8
remove skip checkout
Oct 2, 2020
270c92f
Merge branch 'master' into yamato/perf-redo-metafiles
Oct 5, 2020
46bece8
change utr cmd
Oct 5, 2020
aef2e9b
example metafiles
Oct 5, 2020
229f339
move apis from shared to project metafiles
Oct 5, 2020
a70cd01
add dependencies to android
Oct 6, 2020
9294851
fix typo
Oct 6, 2020
bc78d6e
edit mac and iphone commands
Oct 6, 2020
152cf50
use testframwwork 1.1.16
Oct 6, 2020
7cc39ed
Revert "use testframwwork 1.1.16"
Oct 6, 2020
b1f649d
Update urp_performance_boatattack-android-vulkan.yml
Oct 7, 2020
70c664b
Update android.py
Oct 7, 2020
a5b4335
build.py (remove setup arg for vulkan)
Oct 7, 2020
104da60
add extra args
Oct 7, 2020
fa1f121
more args
Oct 7, 2020
11f00f4
remove stripping args
Oct 7, 2020
2c1b8b5
windows-specific args
Oct 7, 2020
8325543
Update urp_performance_boatattack-android-vulkan.yml
Oct 8, 2020
2c712f4
add player graphics api to build command
Oct 8, 2020
cd8e41d
osx unity-config commands
Oct 8, 2020
c265802
change testplatform version, add android vulkan to CI
Oct 9, 2020
53e42bf
rearrange commands
Oct 9, 2020
dabab85
remove stripping commands from non-build jobs
Oct 9, 2020
8debed2
removing api compatibility level flag from utr command for now
Oct 9, 2020
9cad0d2
universal example
Oct 9, 2020
7df4758
remove boatattack jobs that we don't want yet
Oct 9, 2020
9b22759
remove URP_Performance (template project) jobs for now
Oct 9, 2020
b2c1e09
comment out boatattack build configs that we dont want yet
Oct 9, 2020
9d87f70
only linear jobs
Oct 9, 2020
1970c6c
setting test projects to mono .net 2.0
Oct 9, 2020
367ec0c
test framework to 1.2.1.-preview.1, fix abv
Oct 9, 2020
ed2c0f0
api compatibility level
Oct 12, 2020
3b58857
add all universal metafiles for win
Oct 12, 2020
458d457
Merge branch 'master' into performance/redo-metafiles
Oct 12, 2020
8bdc2c3
ran build.py
Oct 12, 2020
d79463e
add URP_Performance_BoatAttack to nightly
Oct 12, 2020
4148b80
fix linux build jobs
Oct 12, 2020
763f4c7
whitespace
Oct 12, 2020
a329bb0
remove unneeded test_platforms
Oct 12, 2020
9e2a632
added back the excludes to match master
Oct 12, 2020
a439e21
Update __shared.metafile
Oct 12, 2020
5eb286a
change test framework to 1.1.18 again (works locally with latest 2020.2)
Oct 12, 2020
9cb3a4a
increase build timeout
Oct 12, 2020
b83a9c6
let rest of platforms use flags
Oct 13, 2020
fc72ae0
Merge branch 'performance/redo-metafiles' into yamato/perf-redo-metaf…
Oct 13, 2020
e164624
clean all utr flags from python
Oct 13, 2020
5373df4
fix flags in shared file
Oct 13, 2020
08907bd
make ios and android paths match rest of the platforms
Oct 13, 2020
f5d6a1d
overwrite flags in project files
Oct 13, 2020
3c475db
fix windows and universal files
Oct 13, 2020
8ba6a12
clean up metafile parser
Oct 13, 2020
7648bbf
move build configs and color spaces under platforms
Oct 13, 2020
31751ef
rename extra_utr_flags to utr_flags
Oct 13, 2020
8752736
Revert "make ios and android paths match rest of the platforms"
Oct 13, 2020
519b852
added comments to utr utils
Oct 13, 2020
8b7343e
Merge branch 'master' into yamato/perf-redo-metafiles
Oct 19, 2020
15bc778
adjust universal according to master
Oct 21, 2020
bb31259
fix universal dependencies
Oct 21, 2020
8a874ab
add buildconfig and colorspace flags
Oct 21, 2020
7fba4a1
order flags alphabetically
Oct 21, 2020
074318f
Merge branch 'master' into yamato/perf-redo-metafiles
Oct 21, 2020
3888bf5
add playergraphicsapi flags
Oct 21, 2020
bdf4015
add metal paths
Oct 21, 2020
a488064
reorder jobs and fix some testplatforms
Oct 21, 2020
4d4a4c2
update more flags per apis
Oct 21, 2020
526d5e0
fix most project ymls besides performance
Oct 21, 2020
aba4169
overwrite nested flags
Oct 21, 2020
9aa72a2
add back nonrendergraph, reduce cmd files
Oct 21, 2020
aa9c0b5
Merge branch 'master' into yamato/perf-redo-metafiles
Oct 23, 2020
3b442f8
drop redundant iphone commands and fix the order of job generation
Oct 23, 2020
741ca4e
add mono_apiNet2 to performance android
Oct 23, 2020
c976ae1
add playergraphicsapi to iphone metal
Oct 23, 2020
2d9c616
add missing commands to urp performance boatattack win
Oct 23, 2020
28ddcfb
group shared flags
Oct 23, 2020
3b524cb
remove player-connection-ip from android,iphone,osx
Oct 23, 2020
4754f96
updated readme
Oct 23, 2020
d233931
split executemethod command
Oct 23, 2020
dd7749f
Merge branch 'master' into yamato/perf-redo-metafiles
Nov 3, 2020
b84eec8
add ./ to android
Nov 3, 2020
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
159 changes: 113 additions & 46 deletions .yamato/config/__shared.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,123 @@ build_configs:
- name: mono_apiNet4
scripting_backend: Mono2x
api_level: NET_4_6
color_spaces:
- Linear
- gamma
test_platforms:
- type: Standalone
utr_flags:
- [all]: --suite=playmode
- [all]: --timeout=1200
- [all]: --reruncount=2
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
- [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"

- [Win_DX11, Win_DX12, Win_Vulkan, Win_]: --platform=StandaloneWindows64
- [Linux_OpenGlCore, Linux_Vulkan]: --platform=StandaloneLinux64
- [OSX_OpenGlCore, OSX_Metal]: --platform=StandaloneOSX
- [iPhone_Metal]: --platform=iOS
- [Android_OpenGLES3, Android_Vulkan]: --platform=Android

- [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-load-path=../../players
- [Android_OpenGLES3, Android_Vulkan, iPhone_Metal]: --player-load-path=players

- [all]: --artifacts_path=test-results
- [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results

- [OSX_Metal]: --editor-location=/Users/bokken/.Editor

- [Android_OpenGLES3, Android_Vulkan]: --architecture=ARM64
- [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>
- [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-connection-ip=auto

utr_flags_build:
- [all]: --suite=playmode
- [all]: --build-only
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
- [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"

- [Win_DX11, Win_DX12, Win_Vulkan, Win_]: --platform=StandaloneWindows64
- [Linux_OpenGlCore, Linux_Vulkan]: --platform=StandaloneLinux64
- [OSX_OpenGlCore, OSX_Metal]: --platform=StandaloneOSX
- [iPhone_Metal]: --platform=iOS
- [Android_OpenGLES3, Android_Vulkan]: --platform=Android

- [all]: --testproject=.
- [Android_OpenGLES3, Android_Vulkan]: --testproject=./TestProjects/<PROJECT_FOLDER>
- [iPhone_Metal]: --testproject=TestProjects/<PROJECT_FOLDER>

- [all]: --editor-location=.Editor
- [Android_OpenGLES3, Android_Vulkan]: --editor-location=./WindowsEditor

- [all]: --artifacts_path=test-results
- [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results

- [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-save-path=../../players
- [Android_OpenGLES3, Android_Vulkan, iPhone_Metal]: --player-save-path=players

- [all]: --timeout=1200
- [Android_OpenGLES3, Android_Vulkan]: --timeout=2700
- [iPhone]: --timeout=1800

- [Linux_OpenGlCore]: --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxOpenGlCoreLinear"
- [Linux_Vulkan]: --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear"
- [Win_DX11]: --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildWindowsDX11Linear"
- [Win_DX12]: --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildWindowsDX12Linear"
- [Win_Vulkan]: --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildWindowsVulkanLinear"

- [Win_DX11]: --extra-editor-arg="-playergraphicsapi=Direct3D11"
- [Win_DX12]: --extra-editor-arg="-playergraphicsapi=Direct3D12"
- [Win_Vulkan, Linux_Vulkan, Android_Vulkan]: --extra-editor-arg="-playergraphicsapi=Vulkan"
- [Android_OpenGLES3]: --extra-editor-arg="-playergraphicsapi=OpenGLES3"
- [iPhone_Metal]: --extra-editor-arg="-playergraphicsapi=Metal"

- [Android_OpenGLES3, Android_Vulkan]: --architecture=ARM64

- type: playmode
utr_flags:
- [all]: --suite=playmode
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
- [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
- [all]: --reruncount=2

- [all]: --testproject=.
- [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>

- [all]: --editor-location=.Editor
- [OSX_Metal]: --editor-location=/Users/bokken/.Editor

- [all]: --artifacts_path=test-results
- [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results

- [Win_DX11]: --extra-editor-arg="-force-d3d11"
- [Win_DX12]: --extra-editor-arg="-force-d3d12"
- [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-force-vulkan"
- [Linux_OpenGlCore]: --extra-editor-arg="-force-glcore"

- type: editmode
utr_flags:
- [all]: --suite=editor
- [all]: --reruncount=2
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
- [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
- [all]: --platform=editmode

- [all]: --testproject=.
- [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>

- [all]: --editor-location=.Editor
- [OSX_Metal]: --editor-location=/Users/bokken/.Editor

- [all]: --artifacts_path=test-results
- [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results

- [Win_DX11]: --extra-editor-arg="-force-d3d11"
- [Win_DX12]: --extra-editor-arg="-force-d3d12"
- [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-force-vulkan"
- [Linux_OpenGlCore]: --extra-editor-arg="-force-glcore"

platforms:
Win:
name: Win
os: windows
apis:
- name: DX11
cmd: -force-d3d11
- name: DX12
cmd: -force-d3d12
- name: Vulkan
cmd: -force-vulkan
components:
- editor
- il2cpp
Expand All @@ -66,14 +169,6 @@ platforms:
OSX:
name: OSX
os: macos
apis:
- name: Metal
exclude_test_platforms:
- editmode
- name: OpenGLCore
exclude_test_platforms:
- playmode_XR
- Standalone
components:
- editor
- il2cpp
Expand All @@ -96,16 +191,6 @@ platforms:
Linux:
name: Linux
os: linux
apis:
- name: OpenGLCore
cmd: -force-glcore
exclude_test_platforms:
- Standalone
- playmode_XR
- name: Vulkan
cmd: -force-vulkan
exclude_test_platforms:
- playmode_XR
components:
- editor
- il2cpp
Expand All @@ -125,18 +210,6 @@ platforms:
Android:
name: Android
os: android
apis:
- name: OpenGLES3
exclude_test_platforms:
- editmode
- playmode
- playmode_XR
- name: Vulkan
- name: Vulkan
exclude_test_platforms:
- editmode
- playmode
- playmode_XR
components:
- editor
- il2cpp
Expand All @@ -153,12 +226,6 @@ platforms:
iPhone:
name: iPhone
os: ios
apis:
- name: Metal
exclude_test_platforms:
- editmode
- playmode
- playmode_XR
components:
- editor
- iOS
Expand Down
10 changes: 3 additions & 7 deletions .yamato/config/_abv.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@ abv: # specify the editor versions for which to create the expression trigger fo
- name: VFX_HDRP
- name: VFX_URP
build_configs:
- name: mono_apiNet2
scripting_backend: Mono2x
api_level: NET_2_0
- name: il2cpp_apiNet4
scripting_backend: IL2CPP
api_level: NET_4_6
color_spaces:
- mono_apiNet2
- il2cpp_apiNet4
color_spaces:
- Linear
weekly:
extra_dependencies: # additional project jobs to run weekly
Expand Down
95 changes: 47 additions & 48 deletions .yamato/config/hdrp.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,65 +6,64 @@ test_platforms:
- type: playmode
- type: playmode
name: playmode_XR
extra_utr_flags:
- --extra-editor-arg="-xr-tests"
utr_flags:
- [all]: --extra-editor-arg="-xr-tests"
- type: playmode
name: playmode_NonRenderGraph
extra_utr_flags:
- --extra-editor-arg="-non-rendergraph-tests"
utr_flags:
- [all]: --extra-editor-arg="-non-rendergraph-tests"
- type: editmode
- type: Standalone
timeout:
OSX_Metal: 2400
utr_flags:
- [OSX_Metal]: --timeout=2400
platforms:
- name: Win
apis:
- DX11
- DX12
- Vulkan
overrides:
agents_project:
# default: package_ci_mac
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: DX11
- name: DX12
- name: Vulkan
build_configs:
- name: mono_apiNet2
color_spaces:
- Linear
agents_project:
# default: package_ci_mac
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:
- Metal
- name: Metal
exclude_test_platforms:
- name: editmode
build_configs:
- name: mono_apiNet2
color_spaces:
- Linear
- name: Linux
apis:
- Vulkan
build_configs:
#- name: il2cpp_apiNet2
# scripting_backend: IL2CPP
# api_level: NET_2_0
#- name: il2cpp_apiNet4
# scripting_backend: IL2CPP
# api_level: NET_4_6
- name: mono_apiNet2
scripting_backend: Mono2x
api_level: NET_2_0
#- name: mono_apiNet4
# scripting_backend: Mono2x
# api_level: NET_4_6
color_spaces:
- Linear
# - gamma
- name: Vulkan
exclude_test_platforms:
- name: playmode_XR
build_configs:
- name: mono_apiNet2
color_spaces:
- Linear
all:
dependencies:
- platform: Win
Expand Down
43 changes: 15 additions & 28 deletions .yamato/config/hdrp_dxr.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,26 @@ test_platforms:
- type: playmode
- type: playmode
name: playmode_XR
extra_utr_flags:
- --extra-editor-arg="-xr-tests"
utr_flags:
- [all]: --extra-editor-arg="-xr-tests"
- type: playmode
name: playmode_NonRenderGraph
extra_utr_flags:
- --extra-editor-arg="-non-rendergraph-tests"
utr_flags:
- [all]: --extra-editor-arg="-non-rendergraph-tests"
platforms:
- name: Win
apis:
- DX12
overrides:
agents_project:
default:
type: Unity::VM::GPU
image: graphics-foundation/win10-dxr:stable
flavor: b1.large
model: rtx2080
build_configs:
#- name: il2cpp_apiNet2
# scripting_backend: IL2CPP
# api_level: NET_2_0
#- name: il2cpp_apiNet4
# scripting_backend: IL2CPP
# api_level: NET_4_6
- name: mono_apiNet2
scripting_backend: Mono2x
api_level: NET_2_0
#- name: mono_apiNet4
# scripting_backend: Mono2x
# api_level: NET_4_6
color_spaces:
- Linear
# - gamma
- name: DX12
build_configs:
- name: mono_apiNet2
color_spaces:
- Linear
agents_project:
default:
type: Unity::VM::GPU
image: graphics-foundation/win10-dxr:stable
flavor: b1.large
model: rtx2080
all:
dependencies:
- platform: Win
Expand Down
Loading