Skip to content

Commit 23c2fde

Browse files
author
Théo Penavaire
authored
Replace cds ops image by package/ci one (#3129)
1 parent 5b49154 commit 23c2fde

File tree

3 files changed

+45
-45
lines changed

3 files changed

+45
-45
lines changed

.yamato/_editor_priming.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ editor:priming:CUSTOM-REVISION:macos:
1111
name: '[CUSTOM-REVISION,macos] Editor priming'
1212
agent:
1313
type: Unity::VM
14-
image: cds-ops/ubuntu-16.04-base:stable
14+
image: package-ci/ubuntu:stable
1515
flavor: b1.small
1616
skip_checkout: true
1717
variables:
@@ -30,7 +30,7 @@ editor:priming:test_min_editor:macos:
3030
name: '[Min_Editor,macos] Editor priming'
3131
agent:
3232
type: Unity::VM
33-
image: cds-ops/ubuntu-16.04-base:stable
33+
image: package-ci/ubuntu:stable
3434
flavor: b1.small
3535
variables:
3636
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
@@ -49,7 +49,7 @@ editor:priming:CUSTOM-REVISION:android:
4949
name: '[CUSTOM-REVISION,android] Editor priming'
5050
agent:
5151
type: Unity::VM
52-
image: cds-ops/ubuntu-16.04-base:stable
52+
image: package-ci/ubuntu:stable
5353
flavor: b1.small
5454
skip_checkout: true
5555
variables:
@@ -68,7 +68,7 @@ editor:priming:test_min_editor:android:
6868
name: '[Min_Editor,android] Editor priming'
6969
agent:
7070
type: Unity::VM
71-
image: cds-ops/ubuntu-16.04-base:stable
71+
image: package-ci/ubuntu:stable
7272
flavor: b1.small
7373
variables:
7474
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
@@ -87,7 +87,7 @@ editor:priming:CUSTOM-REVISION:windows:
8787
name: '[CUSTOM-REVISION,windows] Editor priming'
8888
agent:
8989
type: Unity::VM
90-
image: cds-ops/ubuntu-16.04-base:stable
90+
image: package-ci/ubuntu:stable
9191
flavor: b1.small
9292
skip_checkout: true
9393
variables:
@@ -106,7 +106,7 @@ editor:priming:test_min_editor:windows:
106106
name: '[Min_Editor,windows] Editor priming'
107107
agent:
108108
type: Unity::VM
109-
image: cds-ops/ubuntu-16.04-base:stable
109+
image: package-ci/ubuntu:stable
110110
flavor: b1.small
111111
variables:
112112
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
@@ -125,7 +125,7 @@ editor:priming:CUSTOM-REVISION:linux:
125125
name: '[CUSTOM-REVISION,linux] Editor priming'
126126
agent:
127127
type: Unity::VM
128-
image: cds-ops/ubuntu-16.04-base:stable
128+
image: package-ci/ubuntu:stable
129129
flavor: b1.small
130130
skip_checkout: true
131131
variables:
@@ -144,7 +144,7 @@ editor:priming:test_min_editor:linux:
144144
name: '[Min_Editor,linux] Editor priming'
145145
agent:
146146
type: Unity::VM
147-
image: cds-ops/ubuntu-16.04-base:stable
147+
image: package-ci/ubuntu:stable
148148
flavor: b1.small
149149
variables:
150150
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
@@ -163,7 +163,7 @@ editor:priming:CUSTOM-REVISION:ios:
163163
name: '[CUSTOM-REVISION,ios] Editor priming'
164164
agent:
165165
type: Unity::VM
166-
image: cds-ops/ubuntu-16.04-base:stable
166+
image: package-ci/ubuntu:stable
167167
flavor: b1.small
168168
skip_checkout: true
169169
variables:
@@ -182,7 +182,7 @@ editor:priming:test_min_editor:ios:
182182
name: '[Min_Editor,ios] Editor priming'
183183
agent:
184184
type: Unity::VM
185-
image: cds-ops/ubuntu-16.04-base:stable
185+
image: package-ci/ubuntu:stable
186186
flavor: b1.small
187187
variables:
188188
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

.yamato/_formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ formatting:
1111
name: Formatting
1212
agent:
1313
type: Unity::VM
14-
image: cds-ops/ubuntu-16.04-base:stable
14+
image: package-ci/ubuntu:stable
1515
flavor: b1.small
1616
commands:
1717
- "echo -e \"[extensions]\nlargefiles=\n\" > ~/.hgrc"

.yamato/config/__shared.metafile

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -50,47 +50,47 @@ test_platforms:
5050
- [OSX_OpenGlCore, OSX_Metal]: --platform=StandaloneOSX
5151
- [iPhone_Metal]: --platform=iOS
5252
- [Android_OpenGLES3, Android_Vulkan]: --platform=Android
53-
54-
- [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-load-path=../../players
53+
54+
- [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-load-path=../../players
5555
- [Android_OpenGLES3, Android_Vulkan, iPhone_Metal]: --player-load-path=players
56-
56+
5757
- [all]: --artifacts_path=test-results
5858
- [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results
59-
59+
6060
- [OSX_Metal]: --editor-location=.Editor
6161

6262
- [OSX_Metal]: --scripting-backend=<SCRIPTING_BACKEND>
63-
- [OSX_Metal]: --testfilter=%TEST_FILTER%
64-
63+
- [OSX_Metal]: --testfilter=%TEST_FILTER%
64+
6565
- [Android_OpenGLES3, Android_Vulkan]: --architecture=ARM64
6666
- [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>
67-
- [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-connection-ip=auto
67+
- [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-connection-ip=auto
6868

6969
utr_flags_build:
70-
- [all]: --testfilter=%TEST_FILTER%
70+
- [all]: --testfilter=%TEST_FILTER%
7171
- [all]: --suite=playmode
7272
- [all]: --build-only
7373
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
74-
- [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
75-
74+
- [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
75+
7676
- [Win_DX11, Win_DX12, Win_Vulkan, Win_]: --platform=StandaloneWindows64
7777
- [Linux_OpenGlCore, Linux_Vulkan]: --platform=StandaloneLinux64
7878
- [OSX_OpenGlCore, OSX_Metal]: --platform=StandaloneOSX
7979
- [iPhone_Metal]: --platform=iOS
8080
- [Android_OpenGLES3, Android_Vulkan]: --platform=Android
81-
81+
8282
- [all]: --testproject=.
8383
- [Android_OpenGLES3, Android_Vulkan, iPhone_Metal]: --testproject=./TestProjects/<PROJECT_FOLDER>
84-
84+
8585
- [all]: --editor-location=.Editor
8686
- [Android_OpenGLES3, Android_Vulkan]: --editor-location=./WindowsEditor
87-
87+
8888
- [all]: --artifacts_path=test-results
8989
- [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results
90-
91-
- [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-save-path=../../players
90+
91+
- [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-save-path=../../players
9292
- [Android_OpenGLES3, Android_Vulkan, iPhone_Metal]: --player-save-path=players
93-
93+
9494
- [all]: --timeout=1200
9595
- [Android_OpenGLES3, Android_Vulkan]: --timeout=2700
9696
- [iPhone]: --timeout=1800
@@ -101,63 +101,63 @@ test_platforms:
101101
- [Win_Vulkan, Linux_Vulkan, Android_Vulkan]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="<COLORSPACE>"
102102
- [Android_OpenGLES3]: ---extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="gles3" --extra-editor-arg="<COLORSPACE>"
103103
- [iPhone_Metal]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="metal" --extra-editor-arg="<COLORSPACE>"
104-
104+
105105
- [Win_DX11]: --extra-editor-arg="-playergraphicsapi=Direct3D11"
106106
- [Win_DX12]: --extra-editor-arg="-playergraphicsapi=Direct3D12"
107107
- [Win_Vulkan, Linux_Vulkan, Android_Vulkan]: --extra-editor-arg="-playergraphicsapi=Vulkan"
108108
- [Android_OpenGLES3]: --extra-editor-arg="-playergraphicsapi=OpenGLES3"
109109
- [iPhone_Metal]: --extra-editor-arg="-playergraphicsapi=Metal"
110-
110+
111111
- [Android_OpenGLES3, Android_Vulkan]: --architecture=ARM64
112-
112+
113113
- type: playmode
114114
utr_flags:
115-
- [all]: --testfilter=%TEST_FILTER%
115+
- [all]: --testfilter=%TEST_FILTER%
116116
- [all]: --zero-tests-are-ok=1
117117
- [all]: --suite=playmode
118-
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
118+
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
119119
- [all]: --reruncount=2
120120
- [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
121-
121+
122122
- [all]: --testproject=.
123123
- [Android_OpenGLES3, Android_Vulkan, iPhone_Metal]: --testproject=./TestProjects/<PROJECT_FOLDER>
124124
- [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>
125-
125+
126126
- [all]: --editor-location=.Editor
127127
- [Android_OpenGLES3, Android_Vulkan]: --editor-location=./WindowsEditor
128128
- [OSX_Metal]: --editor-location=/Users/bokken/.Editor
129-
129+
130130
- [all]: --artifacts_path=test-results
131131
- [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results
132-
132+
133133
- [Win_DX11]: --extra-editor-arg="-force-d3d11"
134134
- [Win_DX12]: --extra-editor-arg="-force-d3d12"
135135
- [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-force-vulkan"
136136
- [Linux_OpenGlCore]: --extra-editor-arg="-force-glcore"
137-
137+
138138
- type: editmode
139139
utr_flags:
140-
- [all]: --testfilter=%TEST_FILTER%
140+
- [all]: --testfilter=%TEST_FILTER%
141141
- [all]: --zero-tests-are-ok=1
142142
- [all]: --suite=editor
143143
- [all]: --reruncount=2
144-
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
144+
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
145145
- [all]: --platform=editmode
146146
- [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
147147
- [Android_OpenGLES3, Android_Vulkan]: --platform=Android
148148
- [iPhone_Metal]: --platform=iOS
149-
149+
150150
- [all]: --testproject=.
151151
- [Android_OpenGLES3, Android_Vulkan, iPhone_Metal]: --testproject=./TestProjects/<PROJECT_FOLDER>
152152
- [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>
153-
153+
154154
- [all]: --editor-location=.Editor
155155
- [Android_OpenGLES3, Android_Vulkan]: --editor-location=./WindowsEditor
156156
- [OSX_Metal]: --editor-location=/Users/bokken/.Editor
157-
157+
158158
- [all]: --artifacts_path=test-results
159159
- [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results
160-
160+
161161
- [Win_DX11]: --extra-editor-arg="-force-d3d11"
162162
- [Win_DX12]: --extra-editor-arg="-force-d3d12"
163163
- [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-force-vulkan"
@@ -168,7 +168,7 @@ test_platforms:
168168
- [Win_Vulkan, Linux_Vulkan, Android_Vulkan]: --extra-editor-arg="-playergraphicsapi=Vulkan"
169169
- [Android_OpenGLES3]: --extra-editor-arg="-playergraphicsapi=OpenGLES3"
170170
- [iPhone_Metal]: --extra-editor-arg="-playergraphicsapi=Metal"
171-
171+
172172
platforms:
173173
Win:
174174
name: Win
@@ -271,7 +271,7 @@ platforms:
271271
non_project_agents:
272272
cds_ops_ubuntu_small:
273273
type: Unity::VM
274-
image: cds-ops/ubuntu-16.04-base:stable
274+
image: package-ci/ubuntu:stable
275275
flavor: b1.small
276276
package_ci_ubuntu_large:
277277
type: Unity::VM

0 commit comments

Comments
 (0)