[7xx] Testing improvements [skip ci]

.yamato/_abv.yml

@@ -3,75 +3,6 @@
 # Introduce any changes under .yamato/config/*.metafile files (for most cases) or under .yamato/ruamel/* within Python (more elaborate cases), and rerun build.py to regenerate all .yml files. 
 # Read more under .yamato/docs/readme.md 
 
-smoke_test_Standalone_2019.4:
-    name: SRP Smoke Test - Standalone_2019.4
-    agent:
-        type: Unity::VM::GPU
-        image: sdet/gamecode_win10:stable
-        flavor: b1.large
-    variables:
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
-    commands:
-      -  curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
-      -  pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-      -  cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
-      -  cd TestProjects/SRP_SmokeTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --timeout=1200
-    dependencies:
-      -  path: .yamato/_editor.yml#editor:priming:2019.4:windows
-         rerun: on-new-revision
-    artifacts:
-        logs:
-            paths:
-              -  "**/test-results/**"
-smoke_test_playmode_2019.4:
-    name: SRP Smoke Test - playmode_2019.4
-    agent:
-        type: Unity::VM::GPU
-        image: sdet/gamecode_win10:stable
-        flavor: b1.large
-    variables:
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
-    commands:
-      -  curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
-      -  pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-      -  cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
-      -  cd TestProjects/SRP_SmokeTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
-    dependencies:
-      -  path: .yamato/_editor.yml#editor:priming:2019.4:windows
-         rerun: on-new-revision
-    artifacts:
-        logs:
-            paths:
-              -  "**/test-results/**"
-smoke_test_editmode_2019.4:
-    name: SRP Smoke Test - editmode_2019.4
-    agent:
-        type: Unity::VM
-        image: sdet/gamecode_win10:stable
-        flavor: b1.large
-    variables:
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
-    commands:
-      -  curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
-      -  pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-      -  cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
-      -  cd TestProjects/SRP_SmokeTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
-    dependencies:
-      -  path: .yamato/_editor.yml#editor:priming:2019.4:windows
-         rerun: on-new-revision
-    artifacts:
-        logs:
-            paths:
-              -  "**/test-results/**"
-all_smoke_tests_2019.4:
-    name: All Smoke Tests - 2019.4
-    dependencies:
-      -  path: .yamato/_abv.yml#smoke_test_Standalone_2019.4
-         rerun: on-new-revision
-      -  path: .yamato/_abv.yml#smoke_test_playmode_2019.4
-         rerun: on-new-revision
-      -  path: .yamato/_abv.yml#smoke_test_editmode_2019.4
-         rerun: on-new-revision
 all_project_ci_2019.4:
     name: _ABV for SRP repository - 2019.4
     dependencies:
@@ -92,11 +23,11 @@ all_project_ci_nightly_2019.4:
     dependencies:
       -  path: .yamato/_abv.yml#all_project_ci_2019.4
          rerun: on-new-revision
-      -  path: .yamato/_abv.yml#smoke_test_Standalone_2019.4
+      -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_2019.4
          rerun: on-new-revision
-      -  path: .yamato/_abv.yml#smoke_test_playmode_2019.4
+      -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_editmode_2019.4
          rerun: on-new-revision
-      -  path: .yamato/_abv.yml#smoke_test_editmode_2019.4
+      -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_2019.4
          rerun: on-new-revision
     triggers:
         recurring:
@@ -123,75 +54,6 @@ trunk_verification_2019.4:
          rerun: on-new-revision
       -  path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_2019.4
          rerun: on-new-revision
-smoke_test_Standalone_fast-2019.4:
-    name: SRP Smoke Test - Standalone_fast-2019.4
-    agent:
-        type: Unity::VM::GPU
-        image: sdet/gamecode_win10:stable
-        flavor: b1.large
-    variables:
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
-    commands:
-      -  curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
-      -  pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-      -  cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
-      -  cd TestProjects/SRP_SmokeTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --timeout=1200
-    dependencies:
-      -  path: .yamato/_editor.yml#editor:priming:fast-2019.4:windows
-         rerun: on-new-revision
-    artifacts:
-        logs:
-            paths:
-              -  "**/test-results/**"
-smoke_test_playmode_fast-2019.4:
-    name: SRP Smoke Test - playmode_fast-2019.4
-    agent:
-        type: Unity::VM::GPU
-        image: sdet/gamecode_win10:stable
-        flavor: b1.large
-    variables:
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
-    commands:
-      -  curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
-      -  pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-      -  cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
-      -  cd TestProjects/SRP_SmokeTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
-    dependencies:
-      -  path: .yamato/_editor.yml#editor:priming:fast-2019.4:windows
-         rerun: on-new-revision
-    artifacts:
-        logs:
-            paths:
-              -  "**/test-results/**"
-smoke_test_editmode_fast-2019.4:
-    name: SRP Smoke Test - editmode_fast-2019.4
-    agent:
-        type: Unity::VM
-        image: sdet/gamecode_win10:stable
-        flavor: b1.large
-    variables:
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
-    commands:
-      -  curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
-      -  pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-      -  cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
-      -  cd TestProjects/SRP_SmokeTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
-    dependencies:
-      -  path: .yamato/_editor.yml#editor:priming:fast-2019.4:windows
-         rerun: on-new-revision
-    artifacts:
-        logs:
-            paths:
-              -  "**/test-results/**"
-all_smoke_tests_fast-2019.4:
-    name: All Smoke Tests - fast-2019.4
-    dependencies:
-      -  path: .yamato/_abv.yml#smoke_test_Standalone_fast-2019.4
-         rerun: on-new-revision
-      -  path: .yamato/_abv.yml#smoke_test_playmode_fast-2019.4
-         rerun: on-new-revision
-      -  path: .yamato/_abv.yml#smoke_test_editmode_fast-2019.4
-         rerun: on-new-revision
 all_project_ci_fast-2019.4:
     name: _ABV for SRP repository - fast-2019.4
     dependencies:
@@ -230,80 +92,6 @@ trunk_verification_fast-2019.4:
          rerun: on-new-revision
       -  path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_fast-2019.4
          rerun: on-new-revision
-smoke_test_Standalone_CUSTOM-REVISION:
-    name: SRP Smoke Test - Standalone_CUSTOM-REVISION
-    agent:
-        type: Unity::VM::GPU
-        image: sdet/gamecode_win10:stable
-        flavor: b1.large
-    variables:
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
-        CUSTOM_REVISION: custom_revision_not_set
-    commands:
-      -  curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
-      -  pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-      -  cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
-      -  cd TestProjects/SRP_SmokeTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --timeout=1200
-    dependencies:
-      -  path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows
-         rerun: always
-    artifacts:
-        logs:
-            paths:
-              -  "**/test-results/**"
-smoke_test_playmode_CUSTOM-REVISION:
-    name: SRP Smoke Test - playmode_CUSTOM-REVISION
-    agent:
-        type: Unity::VM::GPU
-        image: sdet/gamecode_win10:stable
-        flavor: b1.large
-    variables:
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
-        CUSTOM_REVISION: custom_revision_not_set
-    commands:
-      -  curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
-      -  pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-      -  cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
-      -  cd TestProjects/SRP_SmokeTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
-    dependencies:
-      -  path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows
-         rerun: always
-    artifacts:
-        logs:
-            paths:
-              -  "**/test-results/**"
-smoke_test_editmode_CUSTOM-REVISION:
-    name: SRP Smoke Test - editmode_CUSTOM-REVISION
-    agent:
-        type: Unity::VM
-        image: sdet/gamecode_win10:stable
-        flavor: b1.large
-    variables:
-        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
-        CUSTOM_REVISION: custom_revision_not_set
-    commands:
-      -  curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
-      -  pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-      -  cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
-      -  cd TestProjects/SRP_SmokeTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
-    dependencies:
-      -  path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows
-         rerun: always
-    artifacts:
-        logs:
-            paths:
-              -  "**/test-results/**"
-all_smoke_tests_CUSTOM-REVISION:
-    name: All Smoke Tests - CUSTOM-REVISION
-    dependencies:
-      -  path: .yamato/_abv.yml#smoke_test_Standalone_CUSTOM-REVISION
-         rerun: always
-      -  path: .yamato/_abv.yml#smoke_test_playmode_CUSTOM-REVISION
-         rerun: always
-      -  path: .yamato/_abv.yml#smoke_test_editmode_CUSTOM-REVISION
-         rerun: always
-    variables:
-        CUSTOM_REVISION: custom_revision_not_set
 all_project_ci_CUSTOM-REVISION:
     name: _ABV for SRP repository - CUSTOM-REVISION
     dependencies:

.yamato/all-smoke_test.yml

@@ -0,0 +1,34 @@
+
+# This file is generated by .yamato/ruamel/build.py. Don't edit this file manually. 
+# Introduce any changes under .yamato/config/*.metafile files (for most cases) or under .yamato/ruamel/* within Python (more elaborate cases), and rerun build.py to regenerate all .yml files. 
+# Read more under .yamato/docs/readme.md 
+
+All_Smoke_Test_2019.4:
+    name: All Smoke_Test CI - 2019.4
+    dependencies:
+      -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_2019.4
+         rerun: on-new-revision
+      -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_editmode_2019.4
+         rerun: on-new-revision
+      -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_2019.4
+         rerun: on-new-revision
+All_Smoke_Test_fast-2019.4:
+    name: All Smoke_Test CI - fast-2019.4
+    dependencies:
+      -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_fast-2019.4
+         rerun: on-new-revision
+      -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_editmode_fast-2019.4
+         rerun: on-new-revision
+      -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_fast-2019.4
+         rerun: on-new-revision
+All_Smoke_Test_CUSTOM-REVISION:
+    name: All Smoke_Test CI - CUSTOM-REVISION
+    dependencies:
+      -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_CUSTOM-REVISION
+         rerun: always
+      -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_editmode_CUSTOM-REVISION
+         rerun: always
+      -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_CUSTOM-REVISION
+         rerun: always
+    variables:
+        CUSTOM_REVISION: custom_revision_not_set

.yamato/config/_abv.metafile

@@ -10,14 +10,14 @@ abv: # specify the editor versions for which to create the expression trigger fo
 nightly:
   allowed_editors: # specify the editor versions for which to create nightly jobs
     - 2019.4
-smoke_test: # specifications for smoke tests
-  folder: SRP_SmokeTest
-  agent: sdet_win_large # used for editmode
-  agent_gpu: sdet_win_large_gpu  # used for non-editmode
-  test_platforms:
-    - type: Standalone
-    - type: playmode
-    - type: editmode
+  extra_dependencies:
+    - project: Smoke_Test
+      platform: Win
+      api: DX11
+      test_platforms: 
+        - playmode
+        - editmode
+        - Standalone
 trunk_verification: # jobs to include in trunk verification job
   dependencies:
     - project: Universal

.yamato/config/smoke_test.metafile

@@ -0,0 +1,19 @@
+project:
+  name: Smoke_Test
+  folder: SRP_SmokeTest
+test_platforms:
+  - type: playmode
+  - type: editmode
+  - type: Standalone
+platforms:
+  - name: Win
+    apis:
+      - DX11
+all:
+  dependencies:
+    - platform: Win
+      api: DX11
+      test_platforms:
+        - playmode
+        - editmode
+        - Standalone