Skip to content

Replace cds ops image by package/ci (ubuntu) #3129

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 1 commit into from
Jan 15, 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
20 changes: 10 additions & 10 deletions .yamato/_editor_priming.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ editor:priming:CUSTOM-REVISION:macos:
name: '[CUSTOM-REVISION,macos] Editor priming'
agent:
type: Unity::VM
image: cds-ops/ubuntu-16.04-base:stable
image: package-ci/ubuntu:stable
flavor: b1.small
skip_checkout: true
variables:
Expand All @@ -30,7 +30,7 @@ editor:priming:test_min_editor:macos:
name: '[Min_Editor,macos] Editor priming'
agent:
type: Unity::VM
image: cds-ops/ubuntu-16.04-base:stable
image: package-ci/ubuntu:stable
flavor: b1.small
variables:
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
Expand All @@ -49,7 +49,7 @@ editor:priming:CUSTOM-REVISION:android:
name: '[CUSTOM-REVISION,android] Editor priming'
agent:
type: Unity::VM
image: cds-ops/ubuntu-16.04-base:stable
image: package-ci/ubuntu:stable
flavor: b1.small
skip_checkout: true
variables:
Expand All @@ -68,7 +68,7 @@ editor:priming:test_min_editor:android:
name: '[Min_Editor,android] Editor priming'
agent:
type: Unity::VM
image: cds-ops/ubuntu-16.04-base:stable
image: package-ci/ubuntu:stable
flavor: b1.small
variables:
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
Expand All @@ -87,7 +87,7 @@ editor:priming:CUSTOM-REVISION:windows:
name: '[CUSTOM-REVISION,windows] Editor priming'
agent:
type: Unity::VM
image: cds-ops/ubuntu-16.04-base:stable
image: package-ci/ubuntu:stable
flavor: b1.small
skip_checkout: true
variables:
Expand All @@ -106,7 +106,7 @@ editor:priming:test_min_editor:windows:
name: '[Min_Editor,windows] Editor priming'
agent:
type: Unity::VM
image: cds-ops/ubuntu-16.04-base:stable
image: package-ci/ubuntu:stable
flavor: b1.small
variables:
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
Expand All @@ -125,7 +125,7 @@ editor:priming:CUSTOM-REVISION:linux:
name: '[CUSTOM-REVISION,linux] Editor priming'
agent:
type: Unity::VM
image: cds-ops/ubuntu-16.04-base:stable
image: package-ci/ubuntu:stable
flavor: b1.small
skip_checkout: true
variables:
Expand All @@ -144,7 +144,7 @@ editor:priming:test_min_editor:linux:
name: '[Min_Editor,linux] Editor priming'
agent:
type: Unity::VM
image: cds-ops/ubuntu-16.04-base:stable
image: package-ci/ubuntu:stable
flavor: b1.small
variables:
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
Expand All @@ -163,7 +163,7 @@ editor:priming:CUSTOM-REVISION:ios:
name: '[CUSTOM-REVISION,ios] Editor priming'
agent:
type: Unity::VM
image: cds-ops/ubuntu-16.04-base:stable
image: package-ci/ubuntu:stable
flavor: b1.small
skip_checkout: true
variables:
Expand All @@ -182,7 +182,7 @@ editor:priming:test_min_editor:ios:
name: '[Min_Editor,ios] Editor priming'
agent:
type: Unity::VM
image: cds-ops/ubuntu-16.04-base:stable
image: package-ci/ubuntu:stable
flavor: b1.small
variables:
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
Expand Down
2 changes: 1 addition & 1 deletion .yamato/_formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ formatting:
name: Formatting
agent:
type: Unity::VM
image: cds-ops/ubuntu-16.04-base:stable
image: package-ci/ubuntu:stable
flavor: b1.small
commands:
- "echo -e \"[extensions]\nlargefiles=\n\" > ~/.hgrc"
Expand Down
68 changes: 34 additions & 34 deletions .yamato/config/__shared.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -50,47 +50,47 @@ test_platforms:
- [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

- [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=.Editor

- [OSX_Metal]: --scripting-backend=<SCRIPTING_BACKEND>
- [OSX_Metal]: --testfilter=%TEST_FILTER%
- [OSX_Metal]: --testfilter=%TEST_FILTER%

- [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
- [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-connection-ip=auto

utr_flags_build:
- [all]: --testfilter=%TEST_FILTER%
- [all]: --testfilter=%TEST_FILTER%
- [all]: --suite=playmode
- [all]: --build-only
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
- [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
- [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, 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

- [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
Expand All @@ -101,63 +101,63 @@ test_platforms:
- [Win_Vulkan, Linux_Vulkan, Android_Vulkan]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="<COLORSPACE>"
- [Android_OpenGLES3]: ---extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="gles3" --extra-editor-arg="<COLORSPACE>"
- [iPhone_Metal]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="metal" --extra-editor-arg="<COLORSPACE>"

- [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]: --testfilter=%TEST_FILTER%
- [all]: --testfilter=%TEST_FILTER%
- [all]: --zero-tests-are-ok=1
- [all]: --suite=playmode
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
- [all]: --reruncount=2
- [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"

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

- [all]: --editor-location=.Editor
- [Android_OpenGLES3, Android_Vulkan]: --editor-location=./WindowsEditor
- [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]: --testfilter=%TEST_FILTER%
- [all]: --testfilter=%TEST_FILTER%
- [all]: --zero-tests-are-ok=1
- [all]: --suite=editor
- [all]: --reruncount=2
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
- [all]: --platform=editmode
- [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
- [Android_OpenGLES3, Android_Vulkan]: --platform=Android
- [iPhone_Metal]: --platform=iOS

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

- [all]: --editor-location=.Editor
- [Android_OpenGLES3, Android_Vulkan]: --editor-location=./WindowsEditor
- [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"
Expand All @@ -168,7 +168,7 @@ test_platforms:
- [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"

platforms:
Win:
name: Win
Expand Down Expand Up @@ -271,7 +271,7 @@ platforms:
non_project_agents:
cds_ops_ubuntu_small:
type: Unity::VM
image: cds-ops/ubuntu-16.04-base:stable
image: package-ci/ubuntu:stable
flavor: b1.small
package_ci_ubuntu_large:
type: Unity::VM
Expand Down