diff --git a/.yamato/_green_job_revisions_2021.1.metafile b/.yamato/_green_job_revisions_2021.1.metafile deleted file mode 100644 index d5894f97407..00000000000 --- a/.yamato/_green_job_revisions_2021.1.metafile +++ /dev/null @@ -1,391 +0,0 @@ -nightly_shadergraph_-_2021_1: - updated_at: '2020-12-14 07:39:14.846805' - last_green_revisions: - android: - revision: 0bc2480b1b38b79716fe2ab0af8235e077f348fc - updated_at: '2020-12-13 23:55:49.726027' - version: '' - ios: - revision: 0bc2480b1b38b79716fe2ab0af8235e077f348fc - updated_at: '2020-12-13 23:55:49.726027' - version: '' - linux: - revision: 0bc2480b1b38b79716fe2ab0af8235e077f348fc - updated_at: '2020-12-13 23:55:49.726027' - version: '' - macos: - revision: 0bc2480b1b38b79716fe2ab0af8235e077f348fc - updated_at: '2020-12-13 23:55:49.726027' - version: '' - windows: - revision: ed1e382e88f9005d540a6121306a6e048c1847c9 - updated_at: '2020-12-09 23:30:57.365726' - version: '' -shadergraph_pr_job_-_2021_1: - updated_at: '2020-12-14 07:39:14.846805' - last_green_revisions: - android: - revision: 0bc2480b1b38b79716fe2ab0af8235e077f348fc - updated_at: '2020-12-13 23:55:49.726027' - version: '' - ios: - revision: 0bc2480b1b38b79716fe2ab0af8235e077f348fc - updated_at: '2020-12-13 23:55:49.726027' - version: '' - linux: - revision: 0bc2480b1b38b79716fe2ab0af8235e077f348fc - updated_at: '2020-12-13 23:55:49.726027' - version: '' - macos: - revision: 0bc2480b1b38b79716fe2ab0af8235e077f348fc - updated_at: '2020-12-13 23:55:49.726027' - version: '' - windows: - revision: ed1e382e88f9005d540a6121306a6e048c1847c9 - updated_at: '2020-12-09 23:30:57.365726' - version: '' -vfx_urp_pr_job_-_2021_1: - updated_at: '2020-12-16 08:07:29.316962' - last_green_revisions: - android: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' - ios: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' - linux: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' - macos: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' - windows: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' -vfx_hdrp_pr_job_-_2021_1: - updated_at: '2020-12-16 08:07:29.316962' - last_green_revisions: - android: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' - ios: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' - linux: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' - macos: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' - windows: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' -nightly_vfx_urp_-_2021_1: - updated_at: '2020-12-15 07:40:01.422809' - last_green_revisions: - android: - revision: 3fda0592066d357f87680392f2a2e970a65a73bb - updated_at: '2020-12-14 11:21:31.608519' - version: '' - ios: - revision: 3fda0592066d357f87680392f2a2e970a65a73bb - updated_at: '2020-12-14 11:21:31.608519' - version: '' - linux: - revision: 3fda0592066d357f87680392f2a2e970a65a73bb - updated_at: '2020-12-15 00:06:30.570579' - version: '' - macos: - revision: 3fda0592066d357f87680392f2a2e970a65a73bb - updated_at: '2020-12-14 11:21:31.608519' - version: '' - windows: - revision: 3fda0592066d357f87680392f2a2e970a65a73bb - updated_at: '2020-12-14 11:21:31.608519' - version: '' -nightly_vfx_hdrp_-_2021_1: - updated_at: '2020-12-16 08:07:29.316962' - last_green_revisions: - android: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' - ios: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' - linux: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' - macos: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' - windows: - revision: d4338e57aa6fada8065a8edf39cd128d3d7d803f - updated_at: '2020-12-16 00:05:36.049181' - version: '' -nightly_vfx_hdrp_-_2021.1: - updated_at: '2021-06-22 07:47:20.596088' - last_green_revisions: - Android: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - Linux: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-20 23:36:50.923151' - version: '' - OSX: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-18 23:26:06.645223' - version: '' - Win: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - iPhone: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' -vfx_hdrp_pr_job_-_2021.1: - updated_at: '2021-06-22 07:47:20.596088' - last_green_revisions: - Android: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - Linux: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-20 23:36:50.923151' - version: '' - OSX: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-18 23:26:06.645223' - version: '' - Win: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - iPhone: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' -nightly_vfx_urp_-_2021.1: - updated_at: '2021-06-22 07:47:20.596088' - last_green_revisions: - Android: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - Linux: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-20 23:36:50.923151' - version: '' - OSX: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-18 23:26:06.645223' - version: '' - Win: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - iPhone: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' -vfx_urp_pr_job_-_2021.1: - updated_at: '2021-06-22 07:47:20.596088' - last_green_revisions: - Android: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - Linux: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-20 23:36:50.923151' - version: '' - OSX: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-18 23:26:06.645223' - version: '' - Win: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - iPhone: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' -shadergraph_pr_job_-_2021.1: - updated_at: '2021-06-22 07:47:20.596088' - last_green_revisions: - Android: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - Linux: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-20 23:36:50.923151' - version: '' - OSX: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-18 23:26:06.645223' - version: '' - Win: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - iPhone: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' -nightly_shadergraph_-_2021.1: - updated_at: '2021-06-22 07:47:20.596088' - last_green_revisions: - Android: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - Linux: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-20 23:36:50.923151' - version: '' - OSX: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-18 23:26:06.645223' - version: '' - Win: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - iPhone: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' -nightly_universal_-_2021.1: - updated_at: '2021-03-01 07:18:00.340742' - last_green_revisions: - Android: - revision: 5ed91de3f8a90cc3e8464d37429d73d98dc968c9 - updated_at: '2021-02-26 23:19:41.217621' - version: '' - Linux: - revision: 5ed91de3f8a90cc3e8464d37429d73d98dc968c9 - updated_at: '2021-02-26 00:03:57.005494' - version: '' - OSX: - revision: 5ed91de3f8a90cc3e8464d37429d73d98dc968c9 - updated_at: '2021-02-26 00:03:57.005494' - version: '' - Win: - revision: 5ed91de3f8a90cc3e8464d37429d73d98dc968c9 - updated_at: '2021-02-26 23:19:41.217621' - version: '' - iPhone: - revision: 5ed91de3f8a90cc3e8464d37429d73d98dc968c9 - updated_at: '2021-02-26 00:03:57.005494' - version: '' -universal_pr_job_-_2021.1: - updated_at: '2021-03-01 07:18:00.340742' - last_green_revisions: - Android: - revision: 5ed91de3f8a90cc3e8464d37429d73d98dc968c9 - updated_at: '2021-02-26 23:19:41.217621' - version: '' - Linux: - revision: 5ed91de3f8a90cc3e8464d37429d73d98dc968c9 - updated_at: '2021-02-26 00:03:57.005494' - version: '' - OSX: - revision: 5ed91de3f8a90cc3e8464d37429d73d98dc968c9 - updated_at: '2021-02-26 00:03:57.005494' - version: '' - Win: - revision: 5ed91de3f8a90cc3e8464d37429d73d98dc968c9 - updated_at: '2021-02-26 23:19:41.217621' - version: '' - iPhone: - revision: 5ed91de3f8a90cc3e8464d37429d73d98dc968c9 - updated_at: '2021-02-26 00:03:57.005494' - version: '' -hdrp_pr_job_-_2021.1: - updated_at: '2021-06-22 07:47:20.596088' - last_green_revisions: - Android: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - Linux: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-20 23:36:50.923151' - version: '' - OSX: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-18 23:26:06.645223' - version: '' - Win: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - iPhone: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' -nightly_hdrp_-_2021.1: - updated_at: '2021-06-22 07:47:20.596088' - last_green_revisions: - Android: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - Linux: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-20 23:36:50.923151' - version: '' - OSX: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-18 23:26:06.645223' - version: '' - Win: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - iPhone: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' -_nightly_abv_against_2021.1: - updated_at: '2021-06-22 07:47:20.596088' - last_green_revisions: - Android: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - Linux: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-20 23:36:50.923151' - version: '' - OSX: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-18 23:26:06.645223' - version: '' - Win: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' - iPhone: - revision: 4aac278b4a43689d7813437d28b72f3c2f33ae93 - updated_at: '2021-06-17 23:26:19.440129' - version: '' diff --git a/.yamato/_templates.yml b/.yamato/_templates.yml index ad9a3c7777c..b78b74d63fb 100644 --- a/.yamato/_templates.yml +++ b/.yamato/_templates.yml @@ -17,7 +17,7 @@ pre_pack_hdrp_template_Win_2021.1: 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:2021.1:Win artifacts: @@ -26,6 +26,9 @@ pre_pack_hdrp_template_Win_2021.1: - "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_2021.1: name: Pack HDRP Template Win 2021.1 agent: @@ -68,7 +71,7 @@ pre_pack_hdrp_template_OSX_2021.1: 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:2021.1:OSX artifacts: @@ -77,6 +80,9 @@ pre_pack_hdrp_template_OSX_2021.1: - "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_2021.1: name: Pack HDRP Template OSX 2021.1 agent: @@ -157,7 +163,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: @@ -166,6 +172,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: @@ -208,7 +217,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: @@ -217,6 +226,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: @@ -297,7 +309,7 @@ pre_pack_universal_template_Win_2021.1: 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:2021.1:Win artifacts: @@ -306,6 +318,9 @@ pre_pack_universal_template_Win_2021.1: - "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_2021.1: name: Pack Universal Template Win 2021.1 agent: @@ -348,7 +363,7 @@ pre_pack_universal_template_OSX_2021.1: 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:2021.1:OSX artifacts: @@ -357,6 +372,9 @@ pre_pack_universal_template_OSX_2021.1: - "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_2021.1: name: Pack Universal Template OSX 2021.1 agent: @@ -437,7 +455,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: @@ -446,6 +464,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: @@ -488,7 +509,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: @@ -497,6 +518,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: diff --git a/.yamato/config/__shared.metafile b/.yamato/config/__shared.metafile index 9750d251d60..258d35e5bd5 100644 --- a/.yamato/config/__shared.metafile +++ b/.yamato/config/__shared.metafile @@ -13,9 +13,7 @@ editors: # applied for all yml files ono_branch_var: ONO_BRANCH_2021_1 editor_pinning: enabled: True - green_abv_required: False nr_commits_to_retrieve: 1 - store_green_revisions: False allow_triggers: True variables: CACHE_ARGS: '{{cache.flags}}' @@ -24,7 +22,6 @@ editors: # applied for all yml files rerun_strategy: on_new_revision editor_pinning: enabled: False - green_abv_required: False fast: False allow_triggers: False variables: diff --git a/.yamato/config/_editor.metafile b/.yamato/config/_editor.metafile index 8cc26f6ec08..390d2e84dd5 100644 --- a/.yamato/config/_editor.metafile +++ b/.yamato/config/_editor.metafile @@ -3,16 +3,7 @@ editor_pin_agent: package_ci_ubuntu_small # EDITOR PINNING -# remove the following once editor pinning is done. these values will be picked up from __shared -# target_branch_editor_ci: yamato/update-unity-versions-ep-ci -# target_branch: yamato/update-unity-versions - -trunk_track: '2021.2' # track running on trunk: this must match across all release branches -editor_tracks: # specifies tracks which go in _latest_editor_versions: this must differ per release branches -- 2021.1 - editor_versions_file: .yamato/_latest_editor_versions_TRACK.metafile -green_revisions_file: .yamato/_green_job_revisions_TRACK.metafile platforms: # Components to have unity-downloader-cli to trigger. - name: Win @@ -41,30 +32,3 @@ platforms: # Components to have unity-downloader-cli to trigger. components: - editor - ios - -versions_file_header: | - # WARNING: This file is automatically generated. - # To add new Unity Editor tracks, the script needs to be updated. - - - -# STORING GREEN REVISIONS -yamato_project_id: 902 -nightly_job_definition: .yamato%252F_abv.yml%2523all_project_ci_nightly_2021.1 -green_revision_jobs: - - _Nightly ABV against 2021.1 - - - Nightly Universal - 2021.1 - - Universal PR Job - 2021.1 - - - Nightly HDRP - 2021.1 - - HDRP PR Job - 2021.1 - - - Nightly ShaderGraph - 2021.1 - - ShaderGraph PR Job - 2021.1 - - - Nightly VFX_HDRP - 2021.1 - - VFX_HDRP PR Job - 2021.1 - - - Nightly VFX_URP - 2021.1 - - VFX_URP PR Job - 2021.1 diff --git a/.yamato/config/_templates.metafile b/.yamato/config/_templates.metafile index 43b5deb20c5..3450931b344 100644 --- a/.yamato/config/_templates.metafile +++ b/.yamato/config/_templates.metafile @@ -8,7 +8,7 @@ templates: - vfx - config - hdrp - hascodependencies: 1 + include_prepack_step: True - name: Universal Template id: universal_template packagename: com.unity.template-universal @@ -16,7 +16,7 @@ templates: - core - shadergraph - universal - hascodependencies: 1 + include_prepack_step: True platforms: - name: Win - name: OSX diff --git a/.yamato/script/editor_scripts/store_green_revisions.py b/.yamato/script/editor_scripts/store_green_revisions.py deleted file mode 100644 index 417fb687dfe..00000000000 --- a/.yamato/script/editor_scripts/store_green_revisions.py +++ /dev/null @@ -1,172 +0,0 @@ -# Taken from https://github.com/Unity-Technologies/dots/blob/master/Tools/CI/editor_pinning/merge_revisions_file.py - -"""Merges the latest editor version file to a target branch.""" -import argparse -import logging -import os -import subprocess -import sys -import requests -import datetime -import ruamel.yaml -from collections import OrderedDict -from update_revisions import DEFAULT_CONFIG_FILE, DEFAULT_SHARED_FILE -from util.subprocess_helpers import git_cmd, run_cmd - -yaml = ruamel.yaml.YAML() - - -def load_yml(filepath): - with open(filepath) as f: - return yaml.load(f) - -def ordereddict_to_dict(d): - return {k: ordereddict_to_dict(v) for k, v in d.items()} if isinstance(d, OrderedDict) else d - - -def checkout_and_pull_branch(branch, working_dir, development_mode=False): - if not development_mode: - git_cmd(f'checkout {branch}', working_dir) - git_cmd('pull', working_dir) - -def commit_and_push(commit_msg, working_dir, development_mode=False): - if not development_mode: - git_cmd(['commit', '-m', commit_msg], working_dir) - git_cmd('pull', working_dir) - git_cmd('push', working_dir) - -def get_last_nightly_id(api_key, yamato_project_id, yamato_branch, yamato_nightly_job_definition): - try: - current_date = str(datetime.date.today()) - url = f"http://yamato-api.cds.internal.unity3d.com/jobs?filter=project eq {yamato_project_id} and branch eq '{yamato_branch}' and filename eq '{yamato_nightly_job_definition}' and submitted gt '{current_date}'" - print(f'Calling [{url}]') - headers={"Authorization":f"ApiKey {api_key}"} - response = requests.get(url=url, headers=headers) - if response.status_code != 200: - raise Exception() - - jobs = response.json()["items"] - if len(jobs) == 0: - print(f"!! WARNING: No jobs found on {current_date}") - return None - - for job in jobs: - if job["links"]["triggeredBy"] == "/users/0": - return job["id"] - print(f"!! WARNING: No jobs submitted by CI found on {current_date}") - return None - - except: - print(f"!! ERROR: Failed to call Yamato API. Got {response.json()}") - return None - - -def get_yamato_dependency_tree(job_id, api_key): - """Calls Yamato API (GET/jobid/tree)for given job id. Returns JSON dependency tree if success, and None if fails.""" - try: - url = f'http://yamato-api.cds.internal.unity3d.com/jobs/{job_id}/tree' - headers={"Authorization":f"ApiKey {api_key}"} - response = requests.get(url=url, headers=headers) - dependency_tree = response.json() - if response.status_code != 200: - raise Exception() - return dependency_tree - except: - print(f"!! ERROR: Failed to call Yamato API. Got {response.json()}") - return None - -def update_green_project_revisions(editor_versions_file, project_versions_file, track, green_revision_jobs, job_id, api_key, working_dir): - """Updates green project revisions file for given track. If any updates present, adds to git and returns True. If not, returns False.""" - - # get the revisions used for the job, the last green project revisions, and Yamato dependency tree - updated_at = str(datetime.datetime.utcnow()) - revisions_key = f"{track}_latest_internal" if track=="trunk" else f"{track}_staging" - revisions_key = revisions_key.replace('.','_') - revisions = load_yml(editor_versions_file)["editor_versions"][revisions_key] - last_green_job_revisions = load_yml(project_versions_file) - dependency_tree = get_yamato_dependency_tree(job_id, api_key) - if not dependency_tree: - return False - - # update revisions for each project - is_updated = False - for job_name in green_revision_jobs: - jobs = [node for node in dependency_tree["nodes"] if node["name"].lower()==job_name.lower()] - if len(jobs) == 0: - print(f'Skipped "{job_name}" [not found in dependency tree]') - continue - - job = jobs[0] - if job["status"] == 'success': - print(f'Updating "{job_name}" [job status: {job["status"]}]') - - job_name = job_name.replace(' ', '_').lower() - if not last_green_job_revisions.get(job_name): - last_green_job_revisions[job_name] = {} - last_green_job_revisions[job_name]["updated_at"] = updated_at - last_green_job_revisions[job_name]["last_green_revisions"] = ordereddict_to_dict(revisions) - is_updated = True - else: - print(f'Skipped "{job_name}" [job status: {job["status"]}]') - - if is_updated: # at least one project got updated - last_green_job_revisions = ordereddict_to_dict(last_green_job_revisions) - with open(project_versions_file, 'w') as f: - yaml.dump(last_green_job_revisions, f) - - git_cmd(f'add {project_versions_file}', working_dir) - return True - - return False - - -def parse_args(flags): - parser = argparse.ArgumentParser() - parser.add_argument('--local', action='store_true', - help='For local development (doesn\'t switch branches, pull or push)') - parser.add_argument("--track", required=True) - parser.add_argument("--apikey", required=True, - help='Needed for Yamato auth if jobid arg is specified.') - parser.add_argument("--target-branch", required=True, - help='The Git branch to merge the changes in the file into.') - args = parser.parse_args(flags) - return args - - -def main(argv): - logging.basicConfig(level=logging.INFO, format='[%(levelname)s] %(message)s') - args = parse_args(argv) - config = load_yml(DEFAULT_CONFIG_FILE) - shared = load_yml(DEFAULT_SHARED_FILE) - - editor_versions_file = config['editor_versions_file'].replace('TRACK',str(args.track)) - green_revisions_file = config['green_revisions_file'].replace('TRACK',str(args.track)) - yamato_branch = shared['target_branch'] - yamato_project_id = config['yamato_project_id'] - yamato_nightly_job_definition = config['nightly_job_definition'] - - try: - working_dir = os.path.abspath(git_cmd('rev-parse --show-toplevel', cwd='.').strip()) - print(f'Working directory: {working_dir}') - - if args.local: - logging.warning('\n\n!! DEVELOPMENT MODE: will not switch branch, pull or push !!\n') - else: - checkout_and_pull_branch(args.target_branch, working_dir, args.local) - - nightly_job_id = get_last_nightly_id(args.apikey, yamato_project_id, yamato_branch, yamato_nightly_job_definition) - print(f'Updating green project revisions according to job {nightly_job_id}.') - if nightly_job_id: - if update_green_project_revisions(editor_versions_file, green_revisions_file, str(args.track), config['green_revision_jobs'], nightly_job_id, args.apikey, working_dir): - commit_and_push(f'[CI] [{str(args.track)}] Updated green project revisions', working_dir, args.local) - else: - print('No projects to update. Exiting successfully without any commit/push.') - - return 0 - except subprocess.CalledProcessError as err: - logging.error(f"Failed to run '{err.cmd}'\nStdout:\n{err.stdout}\nStderr:\n{err.stderr}") - return 1 - - -if __name__ == '__main__': - sys.exit(main(sys.argv[1:])) \ No newline at end of file diff --git a/.yamato/script/generate_ymls.py b/.yamato/script/generate_ymls.py index b4ae92d8805..07bdf8f47a8 100644 --- a/.yamato/script/generate_ymls.py +++ b/.yamato/script/generate_ymls.py @@ -1,14 +1,15 @@ import os import subprocess import ruamel.yaml as yml +import sys # This script calls the ruamel build.py script, with an argument pointing to current GIT repo -# i.e. when this is called within Graphics repo, then build.py will edit the files in Graphics repo +# i.e. when this is called within Graphics repo, then build.py will edit the files in Graphics repo # # 1) create path.config file (yml format) in the same directory with this script, with the following content (this file is ignored by git) # gfx_sdet_tools_path: "[your path to repo checkout using forward slashes]/gfx-sdet-tools" -# -# 2) call +# +# 2) call # python generate_ymls.py # # 3) new .ymls should be now present in your repo @@ -16,31 +17,36 @@ # !! REMEMBER to keep the gfx-sdet-tools repo up-to-date -root_dir = os.path.dirname(os.path.dirname(os.path.abspath(os.path.dirname(__file__)))) +root_dir = os.path.dirname(os.path.dirname( + os.path.abspath(os.path.dirname(__file__)))) -if __name__== "__main__": +if __name__ == "__main__": yaml = yml.YAML() - + current_yamato_dir = os.path.join(root_dir, '.yamato') config_file = os.path.join(current_yamato_dir, 'script', 'path.config') - gfx_sdet_tools_rev_file = os.path.join(current_yamato_dir, 'script', 'gfx_sdet_tools_revision.txt') - + gfx_sdet_tools_rev_file = os.path.join( + current_yamato_dir, 'script', 'gfx_sdet_tools_revision.txt') + with open(config_file) as f: config = yaml.load(f) gfx_sdet_tools_dir = config["gfx_sdet_tools_path"] - build_py = os.path.join(gfx_sdet_tools_dir,'yml-generator','ruamel','build.py') + build_py = os.path.join( + gfx_sdet_tools_dir, 'yml-generator', 'ruamel', 'build.py') - cmd = f'python "{build_py}" --yamato-dir "{current_yamato_dir}"' - print(f'Calling [{cmd}]') - - process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) + cmd = [sys.executable, build_py, '--yamato-dir', current_yamato_dir] + print(f'Calling {cmd}') + + process = subprocess.Popen( + cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) for stdout_line in iter(process.stdout.readline, ""): print(stdout_line.strip()) process.stdout.close() process.wait() - gfx_sdet_tools_rev = subprocess.check_output('git rev-parse HEAD', stderr=subprocess.STDOUT, universal_newlines=True, cwd=gfx_sdet_tools_dir) + gfx_sdet_tools_rev = subprocess.check_output( + ['git', 'rev-parse', 'HEAD'], stderr=subprocess.STDOUT, universal_newlines=True, cwd=gfx_sdet_tools_dir) with open(gfx_sdet_tools_rev_file, 'w') as f: f.write(gfx_sdet_tools_rev) - - print(f'Used gfx-sdet-tools at revision {gfx_sdet_tools_rev}') \ No newline at end of file + + print(f'Used gfx-sdet-tools at revision {gfx_sdet_tools_rev}') diff --git a/.yamato/script/gfx_sdet_tools_revision.txt b/.yamato/script/gfx_sdet_tools_revision.txt index 8dc50f9cb6b..ba34966e111 100644 --- a/.yamato/script/gfx_sdet_tools_revision.txt +++ b/.yamato/script/gfx_sdet_tools_revision.txt @@ -1 +1 @@ -0443302efc7cbcd00689731e6020eb8a3a443579 +7400a05da0e28a1212a70b4e15a6f752f4f7bb09