[10.x.x] SDET Backports

.yamato/_templates.yml

@@ -17,7 +17,7 @@ pre_pack_hdrp_template_Win_2020.3:
     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:2020.3:Win
     artifacts:
@@ -26,6 +26,9 @@ pre_pack_hdrp_template_Win_2020.3:
               -  "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_2020.3:
     name: Pack HDRP Template Win 2020.3
     agent:
@@ -35,8 +38,6 @@ pack_hdrp_template_Win_2020.3:
     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_2020.3
     artifacts:
         packages:
             paths:
@@ -68,7 +69,7 @@ pre_pack_hdrp_template_OSX_2020.3:
         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:2020.3:OSX
     artifacts:
@@ -77,6 +78,9 @@ pre_pack_hdrp_template_OSX_2020.3:
               -  "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_2020.3:
     name: Pack HDRP Template OSX 2020.3
     agent:
@@ -86,8 +90,6 @@ pack_hdrp_template_OSX_2020.3:
     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_2020.3
     artifacts:
         packages:
             paths:
@@ -157,7 +159,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 +168,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:
@@ -175,8 +180,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:
@@ -208,7 +211,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 +220,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:
@@ -226,8 +232,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:
@@ -297,7 +301,7 @@ pre_pack_universal_template_Win_2020.3:
     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:2020.3:Win
     artifacts:
@@ -306,6 +310,9 @@ pre_pack_universal_template_Win_2020.3:
               -  "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_2020.3:
     name: Pack Universal Template Win 2020.3
     agent:
@@ -315,8 +322,6 @@ pack_universal_template_Win_2020.3:
     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_2020.3
     artifacts:
         packages:
             paths:
@@ -348,7 +353,7 @@ pre_pack_universal_template_OSX_2020.3:
         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:2020.3:OSX
     artifacts:
@@ -357,6 +362,9 @@ pre_pack_universal_template_OSX_2020.3:
               -  "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_2020.3:
     name: Pack Universal Template OSX 2020.3
     agent:
@@ -366,8 +374,6 @@ pack_universal_template_OSX_2020.3:
     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_2020.3
     artifacts:
         packages:
             paths:
@@ -437,7 +443,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 +452,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:
@@ -455,8 +464,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:
@@ -488,7 +495,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 +504,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:
@@ -506,8 +516,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:

.yamato/config/__shared.metafile

@@ -13,8 +13,6 @@ editors: # applied for all yml files
     ono_branch_var: ONO_BRANCH_2020_3
     editor_pinning:
       enabled: True
-      green_abv_required: False
-      store_green_revisions: False
       nr_commits_to_retrieve: 1
     allow_triggers: True
     variables:
@@ -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:

.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
-- 2020.3
-
 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
@@ -42,30 +33,3 @@ platforms: # Components to have unity-downloader-cli to trigger.
       - editor
       - il2cpp
       - 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_2020.3
-green_revision_jobs:
-  - _Nightly ABV against 2020.3
-
-  - Nightly Universal - 2020.3
-  - Universal PR Job - 2020.3
-
-  - Nightly HDRP - 2020.3
-  - HDRP PR Job - 2020.3
-
-  - Nightly ShaderGraph - 2020.3
-  - ShaderGraph PR Job - 2020.3
-
-  - Nightly VFX_HDRP - 2020.3
-  - VFX_HDRP PR Job - 2020.3
-
-  - Nightly VFX_URP - 2020.3
-  - VFX_URP PR Job - 2020.3

.yamato/config/_templates.metafile

@@ -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