Fix win dx11 smoke test (#3635)

* Bump testframework.build in smoke project's manifest to preview.13

* Duplicate utr call in build smoke test dx11 standalone

* Add auto trigger on smoke test project

Author: Théo Penavaire

.yamato/_editor_priming.yml

@@ -39,7 +39,7 @@ editor:priming:test_min_editor:Win:
     commands:
       -  pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
       -  python3 .yamato/script/editor_scripts/get_minimum_editor_version.py tmp_unity_revision.txt
-      -  unity-downloader-cli --source-file tmp_unity_revision.txt -c windows --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+      -  unity-downloader-cli --source-file tmp_unity_revision.txt -o windows --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
       -  rm tmp_unity_revision.txt
     artifacts:
         unity_revision.zip:
@@ -77,7 +77,7 @@ editor:priming:test_min_editor:OSX:
     commands:
       -  pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
       -  python3 .yamato/script/editor_scripts/get_minimum_editor_version.py tmp_unity_revision.txt
-      -  unity-downloader-cli --source-file tmp_unity_revision.txt -c macos --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+      -  unity-downloader-cli --source-file tmp_unity_revision.txt -o macos --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
       -  rm tmp_unity_revision.txt
     artifacts:
         unity_revision.zip:
@@ -115,7 +115,7 @@ editor:priming:test_min_editor:Linux:
     commands:
       -  pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
       -  python3 .yamato/script/editor_scripts/get_minimum_editor_version.py tmp_unity_revision.txt
-      -  unity-downloader-cli --source-file tmp_unity_revision.txt -c linux --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+      -  unity-downloader-cli --source-file tmp_unity_revision.txt -o linux --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
       -  rm tmp_unity_revision.txt
     artifacts:
         unity_revision.zip:
@@ -153,7 +153,7 @@ editor:priming:test_min_editor:Android:
     commands:
       -  pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
       -  python3 .yamato/script/editor_scripts/get_minimum_editor_version.py tmp_unity_revision.txt
-      -  unity-downloader-cli --source-file tmp_unity_revision.txt -c windows --wait --skip-download -c editor -c il2cpp -c android  > unity_revision.txt
+      -  unity-downloader-cli --source-file tmp_unity_revision.txt -o windows --wait --skip-download -c editor -c il2cpp -c android  > unity_revision.txt
       -  rm tmp_unity_revision.txt
     artifacts:
         unity_revision.zip:
@@ -191,7 +191,7 @@ editor:priming:test_min_editor:iPhone:
     commands:
       -  pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
       -  python3 .yamato/script/editor_scripts/get_minimum_editor_version.py tmp_unity_revision.txt
-      -  unity-downloader-cli --source-file tmp_unity_revision.txt -c macos --wait --skip-download -c editor -c il2cpp -c ios  > unity_revision.txt
+      -  unity-downloader-cli --source-file tmp_unity_revision.txt -o macos --wait --skip-download -c editor -c il2cpp -c ios  > unity_revision.txt
       -  rm tmp_unity_revision.txt
     artifacts:
         unity_revision.zip:

.yamato/all-smoke_test.yml

@@ -16,6 +16,8 @@ PR_Smoke_Test_trunk:
          rerun: on-new-revision
       -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_mono_Linear_trunk
          rerun: on-new-revision
+    triggers:
+        expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["TestProjects/SRP_SmokeTest/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
     variables:
         UTR_VERSION: "current"
         TEST_FILTER: .*

.yamato/config/__shared.metafile

@@ -63,43 +63,43 @@ test_platforms:
       - [OSX_OpenGlCore, OSX_Metal]: --platform=StandaloneOSX
       - [iPhone_Metal]: --platform=iOS
       - [Android_OpenGLES3, Android_Vulkan]: --platform=Android
-      
+
       - [Android_OpenGLES3, Android_Vulkan, iPhone_Metal,Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-load-path=players
-      
+
       - [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results
       - [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results
-        
+
       - [OSX_Metal]: --editor-location=.Editor
 
       - [OSX_Metal]: --scripting-backend=<SCRIPTING_BACKEND>
-      - [OSX_Metal]: --testfilter=%TEST_FILTER% 
-     
+      - [OSX_Metal]: --testfilter=%TEST_FILTER%
+
       - [Android_OpenGLES3, Android_Vulkan]: --architecture=ARM64
       - [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>
-      - [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-connection-ip=auto 
+      - [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-connection-ip=auto
 
     utr_flags_build:
-      - [all]: --testfilter=%TEST_FILTER% 
+      - [all]: --testfilter=%TEST_FILTER%
       - [all]: --suite=playmode
       - [all]: --build-only
       - [all]: --scripting-backend=<SCRIPTING_BACKEND>
-      - [all]: --extra-editor-arg="-colorspace=<COLORSPACE>" 
-      
+      - [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
+
       - [Win_DX11, Win_DX12, Win_Vulkan, Win_]: --platform=StandaloneWindows64
       - [Linux_OpenGlCore, Linux_Vulkan]: --platform=StandaloneLinux64
       - [OSX_OpenGlCore, OSX_Metal]: --platform=StandaloneOSX
       - [iPhone_Metal]: --platform=iOS
       - [Android_OpenGLES3, Android_Vulkan]: --platform=Android
-      
+
       - [all]: --testproject=./TestProjects/<PROJECT_FOLDER>
-      
+
       - [all]: --editor-location=.Editor
       - [Android_OpenGLES3, Android_Vulkan]: --editor-location=./WindowsEditor
-      
+
       - [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results
-      
+
       - [Android_OpenGLES3, Android_Vulkan, iPhone_Metal, Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-save-path=players
-      
+
       - [all]: --timeout=1200
       - [Android_OpenGLES3, Android_Vulkan]: --timeout=2700
       - [iPhone]: --timeout=1800
@@ -110,13 +110,13 @@ test_platforms:
       - [Win_Vulkan, Linux_Vulkan, Android_Vulkan]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="<COLORSPACE>"
       - [Android_OpenGLES3]: ---extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="gles3" --extra-editor-arg="<COLORSPACE>"
       - [iPhone_Metal]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="metal" --extra-editor-arg="<COLORSPACE>"
-      
+
       - [Win_DX11]: --extra-editor-arg="-playergraphicsapi=Direct3D11"
       - [Win_DX12]: --extra-editor-arg="-playergraphicsapi=Direct3D12"
       - [Win_Vulkan, Linux_Vulkan, Android_Vulkan]: --extra-editor-arg="-playergraphicsapi=Vulkan"
       - [Android_OpenGLES3]: --extra-editor-arg="-playergraphicsapi=OpenGLES3"
       - [iPhone_Metal]: --extra-editor-arg="-playergraphicsapi=Metal"
-      
+
       - [Android_OpenGLES3, Android_Vulkan]: --architecture=ARM64
     commands:
       - [Android_OpenGLES3, Android_Vulkan]: <shared.platform.commands.connect_bokken>
@@ -132,20 +132,20 @@ test_platforms:
       - [all]: <shared.platform.commands.call_utr>
   - type: playmode
     utr_flags:
-      - [all]: --testfilter=%TEST_FILTER% 
+      - [all]: --testfilter=%TEST_FILTER%
       - [all]: --zero-tests-are-ok=1
       - [all]: --suite=playmode
-      - [all]: --scripting-backend=<SCRIPTING_BACKEND> 
+      - [all]: --scripting-backend=<SCRIPTING_BACKEND>
       # - [all]: --reruncount=2
       - [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
-      
+
       - [all]: --testproject=./TestProjects/<PROJECT_FOLDER>
       - [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>
 
       - [all]: --editor-location=.Editor
       - [Android_OpenGLES3, Android_Vulkan]: --editor-location=./WindowsEditor
       - [OSX_Metal]: --editor-location=/Users/bokken/.Editor
-      
+
       - [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results
       - [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results
 
@@ -158,26 +158,26 @@ test_platforms:
       - [all]: <shared.platform.commands.setup_utr>
       - [all]: <shared.platform.commands.unity_downloader_cli>
       - [all]: <shared.platform.commands.call_utr>
-      
+
   - type: editmode
     utr_flags:
-      - [all]: --testfilter=%TEST_FILTER% 
+      - [all]: --testfilter=%TEST_FILTER%
       - [all]: --zero-tests-are-ok=1
       - [all]: --suite=editor
       # - [all]: --reruncount=2
-      - [all]: --scripting-backend=<SCRIPTING_BACKEND> 
+      - [all]: --scripting-backend=<SCRIPTING_BACKEND>
       - [all]: --platform=editmode
       - [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
       - [Android_OpenGLES3, Android_Vulkan]: --platform=Android
       - [iPhone_Metal]: --platform=iOS
-      
+
       - [all]: --testproject=./TestProjects/<PROJECT_FOLDER>
       - [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>
 
       - [all]: --editor-location=.Editor
       - [Android_OpenGLES3, Android_Vulkan]: --editor-location=./WindowsEditor
       - [OSX_Metal]: --editor-location=Users/bokken/.Editor
-      
+
       - [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results
       - [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results
 
@@ -236,12 +236,19 @@ platforms:
                     utr <UTR_FLAGS>
         call_utr_without_git:
           - utr <UTR_FLAGS>
-        unity_downloader_cli: 
+        call_utr_and_exit_0:
+          - |5-
+                    git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp
+                    set /p GIT_REVISIONDATE=<revdate.tmp
+                    echo %GIT_REVISIONDATE%
+                    del revdate.tmp
+                    utr <UTR_FLAGS> & exit 0
+        unity_downloader_cli:
           - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
           - unity-downloader-cli <EDITOR_REVISION_CMD> -c editor -c il2cpp  --wait --published-only
-        turn_off_firewall: 
+        turn_off_firewall:
           - NetSh Advfirewall set allprofiles state off
-  
+
   OSX:
     name: OSX
     os: macos
@@ -266,22 +273,22 @@ platforms:
     editorpath: "$(pwd)/.Editor/Unity.app/Contents/MacOS/Unity"
     commands:
       [Metal]:
-        setup_utr: 
+        setup_utr:
           - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
           - chmod +x utr
           - scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics
           - scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
         call_utr: # TODO add git commands when needed
           - |5-
                     ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr  <UTR_FLAGS> "
-                    UTR_RESULT=$? 
+                    UTR_RESULT=$?
                     mkdir -p TestProjects/<PROJECT_FOLDER>/test-results/
                     scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results/ TestProjects/<PROJECT_FOLDER>/test-results/
                     exit $UTR_RESULT
         call_utr_without_git:
           - |5-
                     ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr  <UTR_FLAGS> "
-                    UTR_RESULT=$? 
+                    UTR_RESULT=$?
                     mkdir -p TestProjects/<PROJECT_FOLDER>/test-results/
                     scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results/ TestProjects/<PROJECT_FOLDER>/test-results/
                     exit $UTR_RESULT
@@ -323,20 +330,20 @@ platforms:
         flavor: b1.xlarge
     commands:
       [OpenGlCore, Vulkan]:
-        setup_utr: 
+        setup_utr:
           - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
           - chmod +x utr
         call_utr:
           - DISPLAY=:0.0 ./utr <UTR_FLAGS> # TODO include git commands when needed
         call_utr_without_git:
           - DISPLAY=:0.0 ./utr <UTR_FLAGS>
-        unity_downloader_cli: 
+        unity_downloader_cli:
           - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
           - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
           - sudo apt update
           - sudo apt install unity-downloader-cli
           - sudo unity-downloader-cli <EDITOR_REVISION_CMD> -c editor -c il2cpp  --wait --published-only
-      
+
 
   Android:
     name: Android
@@ -356,7 +363,7 @@ platforms:
         flavor: b1.large
     commands:
       [OpenGLES3, Vulkan]:
-        setup_utr: 
+        setup_utr:
           - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
         call_utr:
           - |5-
@@ -371,12 +378,12 @@ platforms:
         unity_downloader_cli:
           - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
           - unity-downloader-cli <EDITOR_REVISION_CMD> -p WindowsEditor -c editor -c il2cpp -c android  --wait --published-only
-        turn_off_firewall: 
+        turn_off_firewall:
           - NetSh Advfirewall set allprofiles state off
         connect_bokken:
           - '%ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%'
           - powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
-        kill_server: 
+        kill_server:
           - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server
 
   iPhone:

.yamato/config/smoke_test.metafile

@@ -5,6 +5,12 @@ test_platforms:
   - type: playmode
   - type: editmode
   - type: Standalone
+    commands_build:
+      - [all]: <shared.platform.commands.turn_off_firewall>
+      - [all]: <shared.platform.commands.setup_utr>
+      - [all]: <shared.platform.commands.unity_downloader_cli>
+      - [Win_DX11, Win_DX12]: <shared.platform.commands.call_utr_and_exit_0>
+      - [all]: <shared.platform.commands.call_utr_without_git>
 platforms:
   - name: Win
     apis:
@@ -13,8 +19,8 @@ platforms:
       - name: mono
     color_spaces:
       - Linear
-expression_trigger: 
-  expression: ""     
+expression_trigger:
+  expression: 'pull_request.target eq "<TARGET_BRANCH>" AND NOT pull_request.draft AND pull_request.changes.any match ["TestProjects/SRP_SmokeTest/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
 pr:
   dependencies:
     - platform: Win
@@ -28,4 +34,4 @@ pr:
 nightly:
   dependencies:
     - project: Smoke_Test
-      pr: true      
+      pr: true