Skip to content

[7xx] SDET Backports #5217

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 3 commits into from
Jul 28, 2021
Merged

[7xx] SDET Backports #5217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddad5c3
Backport #5198
theo-at-unity Jul 26, 2021
28fcf8e
Backport #5186
theo-at-unity Jul 26, 2021
13e1ee5
Remove dependency on pre-pack step for templates
theo-at-unity Jul 26, 2021
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
84 changes: 48 additions & 36 deletions .yamato/_templates.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pre_pack_hdrp_template_Win_2019.4:
commands:
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit
- .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:2019.4:Win
artifacts:
Expand All @@ -24,6 +24,9 @@ pre_pack_hdrp_template_Win_2019.4:
- "com.unity.template-hd/Library/Artifacts/**"
- "com.unity.template-hd/Library/ArtifactDB"
- "com.unity.template-hd/Library/SourceAssetDB"
logs:
paths:
- "Editor.log"
pack_hdrp_template_Win_2019.4:
name: Pack HDRP Template Win 2019.4
agent:
Expand All @@ -33,8 +36,6 @@ pack_hdrp_template_Win_2019.4:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template pack --project-path com.unity.template-hd
dependencies:
- .yamato/_templates.yml#pre_pack_hdrp_template_Win_2019.4
artifacts:
packages:
paths:
Expand Down Expand Up @@ -66,7 +67,7 @@ pre_pack_hdrp_template_OSX_2019.4:
flavor: m1.mac
commands:
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:2019.4:OSX
artifacts:
Expand All @@ -75,6 +76,9 @@ pre_pack_hdrp_template_OSX_2019.4:
- "com.unity.template-hd/Library/Artifacts/**"
- "com.unity.template-hd/Library/ArtifactDB"
- "com.unity.template-hd/Library/SourceAssetDB"
logs:
paths:
- "Editor.log"
pack_hdrp_template_OSX_2019.4:
name: Pack HDRP Template OSX 2019.4
agent:
Expand All @@ -84,8 +88,6 @@ pack_hdrp_template_OSX_2019.4:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template pack --project-path com.unity.template-hd
dependencies:
- .yamato/_templates.yml#pre_pack_hdrp_template_OSX_2019.4
artifacts:
packages:
paths:
Expand Down Expand Up @@ -155,7 +157,7 @@ pre_pack_hdrp_template_Win_fast-2019.4:
commands:
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit
- .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:fast-2019.4:Win
artifacts:
Expand All @@ -164,6 +166,9 @@ pre_pack_hdrp_template_Win_fast-2019.4:
- "com.unity.template-hd/Library/Artifacts/**"
- "com.unity.template-hd/Library/ArtifactDB"
- "com.unity.template-hd/Library/SourceAssetDB"
logs:
paths:
- "Editor.log"
pack_hdrp_template_Win_fast-2019.4:
name: Pack HDRP Template Win fast-2019.4
agent:
Expand All @@ -173,8 +178,6 @@ pack_hdrp_template_Win_fast-2019.4:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template pack --project-path com.unity.template-hd
dependencies:
- .yamato/_templates.yml#pre_pack_hdrp_template_Win_fast-2019.4
artifacts:
packages:
paths:
Expand Down Expand Up @@ -206,7 +209,7 @@ pre_pack_hdrp_template_OSX_fast-2019.4:
flavor: m1.mac
commands:
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:fast-2019.4:OSX
artifacts:
Expand All @@ -215,6 +218,9 @@ pre_pack_hdrp_template_OSX_fast-2019.4:
- "com.unity.template-hd/Library/Artifacts/**"
- "com.unity.template-hd/Library/ArtifactDB"
- "com.unity.template-hd/Library/SourceAssetDB"
logs:
paths:
- "Editor.log"
pack_hdrp_template_OSX_fast-2019.4:
name: Pack HDRP Template OSX fast-2019.4
agent:
Expand All @@ -224,8 +230,6 @@ pack_hdrp_template_OSX_fast-2019.4:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template pack --project-path com.unity.template-hd
dependencies:
- .yamato/_templates.yml#pre_pack_hdrp_template_OSX_fast-2019.4
artifacts:
packages:
paths:
Expand Down Expand Up @@ -295,7 +299,7 @@ pre_pack_hdrp_template_Win_CUSTOM-REVISION:
commands:
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit
- .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Win
artifacts:
Expand All @@ -304,6 +308,9 @@ pre_pack_hdrp_template_Win_CUSTOM-REVISION:
- "com.unity.template-hd/Library/Artifacts/**"
- "com.unity.template-hd/Library/ArtifactDB"
- "com.unity.template-hd/Library/SourceAssetDB"
logs:
paths:
- "Editor.log"
pack_hdrp_template_Win_CUSTOM-REVISION:
name: Pack HDRP Template Win CUSTOM-REVISION
agent:
Expand All @@ -313,8 +320,6 @@ pack_hdrp_template_Win_CUSTOM-REVISION:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template pack --project-path com.unity.template-hd
dependencies:
- .yamato/_templates.yml#pre_pack_hdrp_template_Win_CUSTOM-REVISION
artifacts:
packages:
paths:
Expand Down Expand Up @@ -346,7 +351,7 @@ pre_pack_hdrp_template_OSX_CUSTOM-REVISION:
flavor: m1.mac
commands:
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX
artifacts:
Expand All @@ -355,6 +360,9 @@ pre_pack_hdrp_template_OSX_CUSTOM-REVISION:
- "com.unity.template-hd/Library/Artifacts/**"
- "com.unity.template-hd/Library/ArtifactDB"
- "com.unity.template-hd/Library/SourceAssetDB"
logs:
paths:
- "Editor.log"
pack_hdrp_template_OSX_CUSTOM-REVISION:
name: Pack HDRP Template OSX CUSTOM-REVISION
agent:
Expand All @@ -364,8 +372,6 @@ pack_hdrp_template_OSX_CUSTOM-REVISION:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template pack --project-path com.unity.template-hd
dependencies:
- .yamato/_templates.yml#pre_pack_hdrp_template_OSX_CUSTOM-REVISION
artifacts:
packages:
paths:
Expand Down Expand Up @@ -435,7 +441,7 @@ pre_pack_universal_template_Win_2019.4:
commands:
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit
- .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:2019.4:Win
artifacts:
Expand All @@ -444,6 +450,9 @@ pre_pack_universal_template_Win_2019.4:
- "com.unity.template-universal/Library/Artifacts/**"
- "com.unity.template-universal/Library/ArtifactDB"
- "com.unity.template-universal/Library/SourceAssetDB"
logs:
paths:
- "Editor.log"
pack_universal_template_Win_2019.4:
name: Pack Universal Template Win 2019.4
agent:
Expand All @@ -453,8 +462,6 @@ pack_universal_template_Win_2019.4:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template pack --project-path com.unity.template-universal
dependencies:
- .yamato/_templates.yml#pre_pack_universal_template_Win_2019.4
artifacts:
packages:
paths:
Expand Down Expand Up @@ -486,7 +493,7 @@ pre_pack_universal_template_OSX_2019.4:
flavor: m1.mac
commands:
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:2019.4:OSX
artifacts:
Expand All @@ -495,6 +502,9 @@ pre_pack_universal_template_OSX_2019.4:
- "com.unity.template-universal/Library/Artifacts/**"
- "com.unity.template-universal/Library/ArtifactDB"
- "com.unity.template-universal/Library/SourceAssetDB"
logs:
paths:
- "Editor.log"
pack_universal_template_OSX_2019.4:
name: Pack Universal Template OSX 2019.4
agent:
Expand All @@ -504,8 +514,6 @@ pack_universal_template_OSX_2019.4:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template pack --project-path com.unity.template-universal
dependencies:
- .yamato/_templates.yml#pre_pack_universal_template_OSX_2019.4
artifacts:
packages:
paths:
Expand Down Expand Up @@ -575,7 +583,7 @@ pre_pack_universal_template_Win_fast-2019.4:
commands:
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit
- .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:fast-2019.4:Win
artifacts:
Expand All @@ -584,6 +592,9 @@ pre_pack_universal_template_Win_fast-2019.4:
- "com.unity.template-universal/Library/Artifacts/**"
- "com.unity.template-universal/Library/ArtifactDB"
- "com.unity.template-universal/Library/SourceAssetDB"
logs:
paths:
- "Editor.log"
pack_universal_template_Win_fast-2019.4:
name: Pack Universal Template Win fast-2019.4
agent:
Expand All @@ -593,8 +604,6 @@ pack_universal_template_Win_fast-2019.4:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template pack --project-path com.unity.template-universal
dependencies:
- .yamato/_templates.yml#pre_pack_universal_template_Win_fast-2019.4
artifacts:
packages:
paths:
Expand Down Expand Up @@ -626,7 +635,7 @@ pre_pack_universal_template_OSX_fast-2019.4:
flavor: m1.mac
commands:
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:fast-2019.4:OSX
artifacts:
Expand All @@ -635,6 +644,9 @@ pre_pack_universal_template_OSX_fast-2019.4:
- "com.unity.template-universal/Library/Artifacts/**"
- "com.unity.template-universal/Library/ArtifactDB"
- "com.unity.template-universal/Library/SourceAssetDB"
logs:
paths:
- "Editor.log"
pack_universal_template_OSX_fast-2019.4:
name: Pack Universal Template OSX fast-2019.4
agent:
Expand All @@ -644,8 +656,6 @@ pack_universal_template_OSX_fast-2019.4:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template pack --project-path com.unity.template-universal
dependencies:
- .yamato/_templates.yml#pre_pack_universal_template_OSX_fast-2019.4
artifacts:
packages:
paths:
Expand Down Expand Up @@ -715,7 +725,7 @@ pre_pack_universal_template_Win_CUSTOM-REVISION:
commands:
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit
- .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Win
artifacts:
Expand All @@ -724,6 +734,9 @@ pre_pack_universal_template_Win_CUSTOM-REVISION:
- "com.unity.template-universal/Library/Artifacts/**"
- "com.unity.template-universal/Library/ArtifactDB"
- "com.unity.template-universal/Library/SourceAssetDB"
logs:
paths:
- "Editor.log"
pack_universal_template_Win_CUSTOM-REVISION:
name: Pack Universal Template Win CUSTOM-REVISION
agent:
Expand All @@ -733,8 +746,6 @@ pack_universal_template_Win_CUSTOM-REVISION:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template pack --project-path com.unity.template-universal
dependencies:
- .yamato/_templates.yml#pre_pack_universal_template_Win_CUSTOM-REVISION
artifacts:
packages:
paths:
Expand Down Expand Up @@ -766,7 +777,7 @@ pre_pack_universal_template_OSX_CUSTOM-REVISION:
flavor: m1.mac
commands:
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX
artifacts:
Expand All @@ -775,6 +786,9 @@ pre_pack_universal_template_OSX_CUSTOM-REVISION:
- "com.unity.template-universal/Library/Artifacts/**"
- "com.unity.template-universal/Library/ArtifactDB"
- "com.unity.template-universal/Library/SourceAssetDB"
logs:
paths:
- "Editor.log"
pack_universal_template_OSX_CUSTOM-REVISION:
name: Pack Universal Template OSX CUSTOM-REVISION
agent:
Expand All @@ -784,8 +798,6 @@ pack_universal_template_OSX_CUSTOM-REVISION:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template pack --project-path com.unity.template-universal
dependencies:
- .yamato/_templates.yml#pre_pack_universal_template_OSX_CUSTOM-REVISION
artifacts:
packages:
paths:
Expand Down
4 changes: 2 additions & 2 deletions .yamato/config/_templates.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ templates:
- vfx
- config
- hdrp
hascodependencies: 1
include_prepack_step: False
- name: Universal Template
id: universal_template
packagename: com.unity.template-universal
dependencies:
- core
- shadergraph
- universal
hascodependencies: 1
include_prepack_step: False
platforms:
- name: Win
- name: OSX
Expand Down
Loading