Skip to content

Commit e4b0ab1

Browse files
theo-at-unityGitHub Enterprise
authored andcommitted
Enforce true isolation testing for upm ci (#2999)
* Add upmNoDefaultPackages argument to upm-ci test calls * Add explicit reference to com.unity.physics in the core package * Update to use preview package * Add physics module instead of package * Add video module to hdrp * Add animation & imageconversion modules
1 parent 7d5b400 commit e4b0ab1

File tree

5 files changed

+23
-21
lines changed

5 files changed

+23
-21
lines changed

.yamato/_projectcontext.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ test_all_project_windows_trunk:
270270
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
271271
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
272272
- unity-downloader-cli -u {{editor_versions.trunk_latest_internal.windows.revision}} -c editor --wait --published-only
273-
- upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests
273+
- upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages"
274274
artifacts:
275275
logs:
276276
paths:
@@ -287,7 +287,7 @@ test_all_project_macos_trunk:
287287
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
288288
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
289289
- unity-downloader-cli -u {{editor_versions.trunk_latest_internal.macos.revision}} -c editor --wait --published-only
290-
- upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests
290+
- upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages"
291291
artifacts:
292292
logs:
293293
paths:
@@ -305,7 +305,7 @@ test_all_project_windows_CUSTOM-REVISION:
305305
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
306306
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
307307
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
308-
- upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests
308+
- upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages"
309309
artifacts:
310310
logs:
311311
paths:
@@ -325,7 +325,7 @@ test_all_project_macos_CUSTOM-REVISION:
325325
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
326326
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
327327
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
328-
- upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests
328+
- upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages"
329329
artifacts:
330330
logs:
331331
paths:
@@ -345,7 +345,7 @@ test_all_project_windows_min_editor:
345345
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
346346
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
347347
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
348-
- upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests
348+
- upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages"
349349
artifacts:
350350
logs:
351351
paths:
@@ -363,7 +363,7 @@ test_all_project_macos_min_editor:
363363
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
364364
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
365365
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
366-
- upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests
366+
- upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages"
367367
artifacts:
368368
logs:
369369
paths:

.yamato/ruamel/jobs/packages/project_test.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
from ..shared.yml_job import YMLJob
55

66
class Project_TestJob():
7-
7+
88
def __init__(self, platform, editor):
99
self.job_id = projectcontext_job_id_test(platform["os"],editor["name"])
1010
self.yml = self.get_job_definition(platform, editor).get_yml()
1111

12-
12+
1313
def get_job_definition(self, platform, editor):
1414

1515
# define dependencies
1616
dependencies = [f'{projectcontext_filepath()}#{projectcontext_job_id_pack()}']
1717
if not editor['editor_pinning']:
1818
dependencies.extend([f'{editor_priming_filepath()}#{editor_job_id(editor["name"], platform["os"]) }'])
19-
19+
2020
# define commands
2121
commands = [
2222
f'npm install upm-ci-utils@stable -g --registry {NPM_UPMCI_INSTALL_URL}',
2323
f'pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade',
2424
f'unity-downloader-cli {get_unity_downloader_cli_cmd(editor,platform["os"])} -c editor --wait --published-only']
25-
commands.append(f'upm-ci project test -u {platform["editorpath"]} --project-path TestProjects/SRP_SmokeTest --type vetting-tests')
25+
commands.append(f'upm-ci project test -u {platform["editorpath"]} --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages"')
2626

2727

2828
# construct job
@@ -36,6 +36,5 @@ def get_job_definition(self, platform, editor):
3636
return job
3737

3838

39-
40-
41-
39+
40+

.yamato/ruamel/jobs/packages/project_test_min_editor.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44
from ..shared.yml_job import YMLJob
55

66
class Project_TestMinEditorJob():
7-
7+
88
def __init__(self, platform):
99
self.job_id = projectcontext_job_id_test_min_editor(platform["os"])
1010
self.yml = self.get_job_definition(platform).get_yml()
1111

12-
12+
1313
def get_job_definition(self, platform):
1414

1515
# define dependencies
1616
dependencies = [f'{projectcontext_filepath()}#{projectcontext_job_id_pack()}']
1717
dependencies.extend([f'{editor_priming_filepath()}#{editor_job_id_test_min_editor(platform["os"]) }'])
18-
18+
1919
# define commands
2020
commands = [
2121
f'npm install upm-ci-utils@stable -g --registry {NPM_UPMCI_INSTALL_URL}',
2222
f'pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade',
2323
f'unity-downloader-cli --source-file {PATH_UNITY_REVISION} -c editor --wait --published-only']
24-
commands.append(f'upm-ci project test -u {platform["editorpath"]} --project-path TestProjects/SRP_SmokeTest --type vetting-tests')
24+
commands.append(f'upm-ci project test -u {platform["editorpath"]} --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages"')
2525

2626
# construct job
2727
job = YMLJob()
@@ -33,6 +33,5 @@ def get_job_definition(self, platform):
3333
return job
3434

3535

36-
37-
38-
36+
37+

com.unity.render-pipelines.core/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"unityRelease": "0a8",
77
"displayName": "Core RP Library",
88
"dependencies": {
9-
"com.unity.ugui": "1.0.0"
9+
"com.unity.ugui": "1.0.0",
10+
"com.unity.modules.physics": "1.0.0"
1011
}
1112
}

com.unity.render-pipelines.high-definition/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"unityRelease": "0a8",
77
"displayName": "High Definition RP",
88
"dependencies": {
9+
"com.unity.modules.video": "1.0.0",
10+
"com.unity.modules.animation": "1.0.0",
11+
"com.unity.modules.imageconversion": "1.0.0",
912
"com.unity.render-pipelines.core": "11.0.0",
1013
"com.unity.shadergraph": "11.0.0",
1114
"com.unity.visualeffectgraph": "11.0.0",

0 commit comments

Comments
 (0)