Skip to content

Commit 2de8496

Browse files
Revert "Add render graph specific pipeline to HDRP tests. (#728)"
This reverts commit 4bcb436.
1 parent 1a30576 commit 2de8496

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1912
-3958
lines changed

.yamato/all-hdrp.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ All_HDRP_trunk:
77
rerun: always
88
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_trunk
99
rerun: always
10-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_trunk
11-
rerun: always
1210
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_trunk
1311
rerun: always
1412
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_trunk
@@ -36,8 +34,6 @@ All_HDRP_fast-trunk:
3634
rerun: always
3735
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_fast-trunk
3836
rerun: always
39-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_fast-trunk
40-
rerun: always
4137
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_fast-trunk
4238
rerun: always
4339
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_fast-trunk
@@ -65,8 +61,6 @@ All_HDRP_CUSTOM-REVISION:
6561
rerun: always
6662
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION
6763
rerun: always
68-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_CUSTOM-REVISION
69-
rerun: always
7064
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_CUSTOM-REVISION
7165
rerun: always
7266
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_CUSTOM-REVISION

.yamato/hdrp-linux-vulkan.yml

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,6 @@ HDRP_Linux_Vulkan_playmode_XR_trunk:
4040
logs:
4141
paths:
4242
- "**/test-results/**"
43-
HDRP_Linux_Vulkan_playmode_RenderGraph_trunk:
44-
name: HDRP on Linux_Vulkan_playmode_RenderGraph on version trunk
45-
agent:
46-
type: Unity::VM::GPU
47-
image: cds-ops/ubuntu-18.04-base:stable
48-
flavor: b1.large
49-
variables:
50-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
51-
dependencies:
52-
- path: .yamato/_editor.yml#editor:priming:trunk:linux
53-
rerun: always
54-
commands:
55-
- sudo -H pip install --upgrade pip
56-
- sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
57-
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
58-
- cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
59-
- cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan"
60-
artifacts:
61-
logs:
62-
paths:
63-
- "**/test-results/**"
6443
HDRP_Linux_Vulkan_editmode_trunk:
6544
name: HDRP on Linux_Vulkan_editmode on version trunk
6645
agent:
@@ -145,27 +124,6 @@ HDRP_Linux_Vulkan_playmode_XR_fast-trunk:
145124
logs:
146125
paths:
147126
- "**/test-results/**"
148-
HDRP_Linux_Vulkan_playmode_RenderGraph_fast-trunk:
149-
name: HDRP on Linux_Vulkan_playmode_RenderGraph on version fast-trunk
150-
agent:
151-
type: Unity::VM::GPU
152-
image: cds-ops/ubuntu-18.04-base:stable
153-
flavor: b1.large
154-
variables:
155-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
156-
dependencies:
157-
- path: .yamato/_editor.yml#editor:priming:fast-trunk:linux
158-
rerun: always
159-
commands:
160-
- sudo -H pip install --upgrade pip
161-
- sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
162-
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
163-
- cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
164-
- cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan"
165-
artifacts:
166-
logs:
167-
paths:
168-
- "**/test-results/**"
169127
HDRP_Linux_Vulkan_editmode_fast-trunk:
170128
name: HDRP on Linux_Vulkan_editmode on version fast-trunk
171129
agent:
@@ -252,28 +210,6 @@ HDRP_Linux_Vulkan_playmode_XR_CUSTOM-REVISION:
252210
logs:
253211
paths:
254212
- "**/test-results/**"
255-
HDRP_Linux_Vulkan_playmode_RenderGraph_CUSTOM-REVISION:
256-
name: HDRP on Linux_Vulkan_playmode_RenderGraph on version CUSTOM-REVISION
257-
agent:
258-
type: Unity::VM::GPU
259-
image: cds-ops/ubuntu-18.04-base:stable
260-
flavor: b1.large
261-
variables:
262-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
263-
CUSTOM_REVISION: custom_revision_not_set
264-
dependencies:
265-
- path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux
266-
rerun: always
267-
commands:
268-
- sudo -H pip install --upgrade pip
269-
- sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
270-
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
271-
- cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
272-
- cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan"
273-
artifacts:
274-
logs:
275-
paths:
276-
- "**/test-results/**"
277213
HDRP_Linux_Vulkan_editmode_CUSTOM-REVISION:
278214
name: HDRP on Linux_Vulkan_editmode on version CUSTOM-REVISION
279215
agent:

.yamato/hdrp-osx-metal.yml

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -54,34 +54,6 @@ HDRP_OSX_Metal_playmode_XR_trunk:
5454
logs:
5555
paths:
5656
- "**/test-results/**"
57-
HDRP_OSX_Metal_playmode_RenderGraph_trunk:
58-
name: HDRP on OSX_Metal_playmode_RenderGraph on version trunk
59-
agent:
60-
type: Unity::metal::macmini
61-
image: slough-ops/macos-10.14-xcode:stable
62-
flavor: m1.mac
63-
variables:
64-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
65-
dependencies:
66-
- path: .yamato/_editor.yml#editor:priming:trunk:macos
67-
rerun: always
68-
commands:
69-
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
70-
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'"
71-
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics
72-
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
73-
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
74-
- |5-
75-
76-
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results'
77-
UTR_RESULT=$?
78-
mkdir -p TestProjects/HDRP_Tests/test-results/
79-
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/
80-
exit $UTR_RESULT
81-
artifacts:
82-
logs:
83-
paths:
84-
- "**/test-results/**"
8557
HDRP_OSX_Metal_editmode_trunk:
8658
name: HDRP on OSX_Metal_editmode on version trunk
8759
agent:
@@ -194,34 +166,6 @@ HDRP_OSX_Metal_playmode_XR_fast-trunk:
194166
logs:
195167
paths:
196168
- "**/test-results/**"
197-
HDRP_OSX_Metal_playmode_RenderGraph_fast-trunk:
198-
name: HDRP on OSX_Metal_playmode_RenderGraph on version fast-trunk
199-
agent:
200-
type: Unity::metal::macmini
201-
image: slough-ops/macos-10.14-xcode:stable
202-
flavor: m1.mac
203-
variables:
204-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
205-
dependencies:
206-
- path: .yamato/_editor.yml#editor:priming:fast-trunk:macos
207-
rerun: always
208-
commands:
209-
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
210-
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'"
211-
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics
212-
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
213-
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
214-
- |5-
215-
216-
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results'
217-
UTR_RESULT=$?
218-
mkdir -p TestProjects/HDRP_Tests/test-results/
219-
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/
220-
exit $UTR_RESULT
221-
artifacts:
222-
logs:
223-
paths:
224-
- "**/test-results/**"
225169
HDRP_OSX_Metal_editmode_fast-trunk:
226170
name: HDRP on OSX_Metal_editmode on version fast-trunk
227171
agent:
@@ -336,35 +280,6 @@ HDRP_OSX_Metal_playmode_XR_CUSTOM-REVISION:
336280
logs:
337281
paths:
338282
- "**/test-results/**"
339-
HDRP_OSX_Metal_playmode_RenderGraph_CUSTOM-REVISION:
340-
name: HDRP on OSX_Metal_playmode_RenderGraph on version CUSTOM-REVISION
341-
agent:
342-
type: Unity::metal::macmini
343-
image: slough-ops/macos-10.14-xcode:stable
344-
flavor: m1.mac
345-
variables:
346-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
347-
CUSTOM_REVISION: custom_revision_not_set
348-
dependencies:
349-
- path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos
350-
rerun: always
351-
commands:
352-
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
353-
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'"
354-
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics
355-
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
356-
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
357-
- |5-
358-
359-
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results'
360-
UTR_RESULT=$?
361-
mkdir -p TestProjects/HDRP_Tests/test-results/
362-
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/
363-
exit $UTR_RESULT
364-
artifacts:
365-
logs:
366-
paths:
367-
- "**/test-results/**"
368283
HDRP_OSX_Metal_editmode_CUSTOM-REVISION:
369284
name: HDRP on OSX_Metal_editmode on version CUSTOM-REVISION
370285
agent:

.yamato/hdrp-win-dx11.yml

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,6 @@ HDRP_Win_DX11_playmode_XR_trunk:
3838
logs:
3939
paths:
4040
- "**/test-results/**"
41-
HDRP_Win_DX11_playmode_RenderGraph_trunk:
42-
name: HDRP on Win_DX11_playmode_RenderGraph on version trunk
43-
agent:
44-
type: Unity::VM::GPU
45-
image: sdet/gamecode_win10:stable
46-
flavor: b1.large
47-
variables:
48-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
49-
dependencies:
50-
- path: .yamato/_editor.yml#editor:priming:trunk:windows
51-
rerun: always
52-
commands:
53-
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
54-
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
55-
- cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
56-
- cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11"
57-
artifacts:
58-
logs:
59-
paths:
60-
- "**/test-results/**"
6141
HDRP_Win_DX11_editmode_trunk:
6242
name: HDRP on Win_DX11_editmode on version trunk
6343
agent:
@@ -164,26 +144,6 @@ HDRP_Win_DX11_playmode_XR_fast-trunk:
164144
logs:
165145
paths:
166146
- "**/test-results/**"
167-
HDRP_Win_DX11_playmode_RenderGraph_fast-trunk:
168-
name: HDRP on Win_DX11_playmode_RenderGraph on version fast-trunk
169-
agent:
170-
type: Unity::VM::GPU
171-
image: sdet/gamecode_win10:stable
172-
flavor: b1.large
173-
variables:
174-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
175-
dependencies:
176-
- path: .yamato/_editor.yml#editor:priming:fast-trunk:windows
177-
rerun: always
178-
commands:
179-
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
180-
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
181-
- cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
182-
- cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11"
183-
artifacts:
184-
logs:
185-
paths:
186-
- "**/test-results/**"
187147
HDRP_Win_DX11_editmode_fast-trunk:
188148
name: HDRP on Win_DX11_editmode on version fast-trunk
189149
agent:
@@ -292,27 +252,6 @@ HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION:
292252
logs:
293253
paths:
294254
- "**/test-results/**"
295-
HDRP_Win_DX11_playmode_RenderGraph_CUSTOM-REVISION:
296-
name: HDRP on Win_DX11_playmode_RenderGraph on version CUSTOM-REVISION
297-
agent:
298-
type: Unity::VM::GPU
299-
image: sdet/gamecode_win10:stable
300-
flavor: b1.large
301-
variables:
302-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
303-
CUSTOM_REVISION: custom_revision_not_set
304-
dependencies:
305-
- path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows
306-
rerun: always
307-
commands:
308-
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
309-
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
310-
- cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
311-
- cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11"
312-
artifacts:
313-
logs:
314-
paths:
315-
- "**/test-results/**"
316255
HDRP_Win_DX11_editmode_CUSTOM-REVISION:
317256
name: HDRP on Win_DX11_editmode on version CUSTOM-REVISION
318257
agent:

0 commit comments

Comments
 (0)