Fix urp udate custom revision jobs (#3107)

* Remove unity downloader command from test

* Re-add unity downloader command and change path of unity_revision.txt

* Fix xcopy command

* Change xcopy command - Use copy

* Apply changes to custom revision jobs only

Author: Théo Penavaire

.yamato/ruamel/jobs/projects/commands/internal.py

@@ -10,9 +10,12 @@ def _cmd_base(project, platform, utr_calls, editor):
         f'Xcopy /E /I \"com.unity.render-pipelines.core\" \"{TEST_PROJECTS_DIR}/URP-Update-testing/{project["folder"]}/Packages/com.unity.render-pipelines.core\" /Y',
         f'Xcopy /E /I \"com.unity.render-pipelines.universal\" \"{TEST_PROJECTS_DIR}/URP-Update-testing/{project["folder"]}/Packages/com.unity.render-pipelines.universal\" /Y',
         f'Xcopy /E /I \"com.unity.shadergraph\" \"{TEST_PROJECTS_DIR}/URP-Update-testing/{project["folder"]}/Packages/com.unity.shadergraph\" /Y',
-        f'cd {TEST_PROJECTS_DIR}/URP-Update-testing/{project["folder"]} && unity-downloader-cli { get_unity_downloader_cli_cmd(editor, platform["os"]) } {"".join([f"-c {c} " for c in platform["components"]])} --wait --published-only',
     ]
 
+    if str(editor['track']).lower()=='custom-revision':
+        base.append(f'copy /Y \"{PATH_UNITY_REVISION}" \"{TEST_PROJECTS_DIR}/URP-Update-testing/{project["folder"]}/{PATH_UNITY_REVISION}"')
+    base.append(f'cd {TEST_PROJECTS_DIR}/URP-Update-testing/{project["folder"]} && unity-downloader-cli { get_unity_downloader_cli_cmd(editor, platform["os"]) } {"".join([f"-c {c} " for c in platform["components"]])} --wait --published-only')
+
     for utr_args in utr_calls:
         base.append(f'cd {TEST_PROJECTS_DIR}/URP-Update-testing/{project["folder"]} && utr {" ".join(utr_args)}')
     return base
@@ -31,7 +34,7 @@ def cmd_standalone(project, platform, api, test_platform, editor, build_config,
     base = [f'curl -s {UTR_INSTALL_URL}.bat --output {TEST_PROJECTS_DIR}/{project["folder"]}/utr.bat']
     for utr_args in utr_calls:
         base.append(f'cd {TEST_PROJECTS_DIR}/{project["folder"]} && utr {" ".join(utr_args)}')
-    
+
     return base
 
 

.yamato/urpupdate-win-dx11.yml

@@ -73,6 +73,7 @@ URPUpdate_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION:
       -  Xcopy /E /I "com.unity.render-pipelines.core" "TestProjects/URP-Update-testing/URP-Update-Testing/Packages/com.unity.render-pipelines.core" /Y
       -  Xcopy /E /I "com.unity.render-pipelines.universal" "TestProjects/URP-Update-testing/URP-Update-Testing/Packages/com.unity.render-pipelines.universal" /Y
       -  Xcopy /E /I "com.unity.shadergraph" "TestProjects/URP-Update-testing/URP-Update-Testing/Packages/com.unity.shadergraph" /Y
+      -  copy /Y "unity_revision.txt" "TestProjects/URP-Update-testing/URP-Update-Testing/unity_revision.txt"
       -  cd TestProjects/URP-Update-testing/URP-Update-Testing && unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  cd TestProjects/URP-Update-testing/URP-Update-Testing && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d11" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=.
     artifacts:
@@ -101,6 +102,7 @@ URPUpdate_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION:
       -  Xcopy /E /I "com.unity.render-pipelines.core" "TestProjects/URP-Update-testing/URP-Update-Testing/Packages/com.unity.render-pipelines.core" /Y
       -  Xcopy /E /I "com.unity.render-pipelines.universal" "TestProjects/URP-Update-testing/URP-Update-Testing/Packages/com.unity.render-pipelines.universal" /Y
       -  Xcopy /E /I "com.unity.shadergraph" "TestProjects/URP-Update-testing/URP-Update-Testing/Packages/com.unity.shadergraph" /Y
+      -  copy /Y "unity_revision.txt" "TestProjects/URP-Update-testing/URP-Update-Testing/unity_revision.txt"
       -  cd TestProjects/URP-Update-testing/URP-Update-Testing && unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  cd TestProjects/URP-Update-testing/URP-Update-Testing && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d11" --extra-editor-arg="-playergraphicsapi=Direct3D11" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testfilter=%TEST_FILTER% --testproject=.
     artifacts:

.yamato/urpupdate-win-vulkan.yml

@@ -73,6 +73,7 @@ URPUpdate_Win_Vulkan_playmode_mono_Linear_CUSTOM-REVISION:
       -  Xcopy /E /I "com.unity.render-pipelines.core" "TestProjects/URP-Update-testing/URP-Update-Testing/Packages/com.unity.render-pipelines.core" /Y
       -  Xcopy /E /I "com.unity.render-pipelines.universal" "TestProjects/URP-Update-testing/URP-Update-Testing/Packages/com.unity.render-pipelines.universal" /Y
       -  Xcopy /E /I "com.unity.shadergraph" "TestProjects/URP-Update-testing/URP-Update-Testing/Packages/com.unity.shadergraph" /Y
+      -  copy /Y "unity_revision.txt" "TestProjects/URP-Update-testing/URP-Update-Testing/unity_revision.txt"
       -  cd TestProjects/URP-Update-testing/URP-Update-Testing && unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  cd TestProjects/URP-Update-testing/URP-Update-Testing && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=.
     artifacts:
@@ -101,6 +102,7 @@ URPUpdate_Win_Vulkan_editmode_mono_Linear_CUSTOM-REVISION:
       -  Xcopy /E /I "com.unity.render-pipelines.core" "TestProjects/URP-Update-testing/URP-Update-Testing/Packages/com.unity.render-pipelines.core" /Y
       -  Xcopy /E /I "com.unity.render-pipelines.universal" "TestProjects/URP-Update-testing/URP-Update-Testing/Packages/com.unity.render-pipelines.universal" /Y
       -  Xcopy /E /I "com.unity.shadergraph" "TestProjects/URP-Update-testing/URP-Update-Testing/Packages/com.unity.shadergraph" /Y
+      -  copy /Y "unity_revision.txt" "TestProjects/URP-Update-testing/URP-Update-Testing/unity_revision.txt"
       -  cd TestProjects/URP-Update-testing/URP-Update-Testing && unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  cd TestProjects/URP-Update-testing/URP-Update-Testing && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testfilter=%TEST_FILTER% --testproject=.
     artifacts:

.yamato/urpupdate_boatattack-win-dx11.yml

@@ -73,6 +73,7 @@ URPUpdate_BoatAttack_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION:
       -  Xcopy /E /I "com.unity.render-pipelines.core" "TestProjects/URP-Update-testing/BoatAttack-19-4/Packages/com.unity.render-pipelines.core" /Y
       -  Xcopy /E /I "com.unity.render-pipelines.universal" "TestProjects/URP-Update-testing/BoatAttack-19-4/Packages/com.unity.render-pipelines.universal" /Y
       -  Xcopy /E /I "com.unity.shadergraph" "TestProjects/URP-Update-testing/BoatAttack-19-4/Packages/com.unity.shadergraph" /Y
+      -  copy /Y "unity_revision.txt" "TestProjects/URP-Update-testing/BoatAttack-19-4/unity_revision.txt"
       -  cd TestProjects/URP-Update-testing/BoatAttack-19-4 && unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  cd TestProjects/URP-Update-testing/BoatAttack-19-4 && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d11" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=.
     artifacts:
@@ -101,6 +102,7 @@ URPUpdate_BoatAttack_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION:
       -  Xcopy /E /I "com.unity.render-pipelines.core" "TestProjects/URP-Update-testing/BoatAttack-19-4/Packages/com.unity.render-pipelines.core" /Y
       -  Xcopy /E /I "com.unity.render-pipelines.universal" "TestProjects/URP-Update-testing/BoatAttack-19-4/Packages/com.unity.render-pipelines.universal" /Y
       -  Xcopy /E /I "com.unity.shadergraph" "TestProjects/URP-Update-testing/BoatAttack-19-4/Packages/com.unity.shadergraph" /Y
+      -  copy /Y "unity_revision.txt" "TestProjects/URP-Update-testing/BoatAttack-19-4/unity_revision.txt"
       -  cd TestProjects/URP-Update-testing/BoatAttack-19-4 && unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  cd TestProjects/URP-Update-testing/BoatAttack-19-4 && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d11" --extra-editor-arg="-playergraphicsapi=Direct3D11" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testfilter=%TEST_FILTER% --testproject=.
     artifacts:

.yamato/urpupdate_boatattack-win-vulkan.yml

@@ -73,6 +73,7 @@ URPUpdate_BoatAttack_Win_Vulkan_playmode_mono_Linear_CUSTOM-REVISION:
       -  Xcopy /E /I "com.unity.render-pipelines.core" "TestProjects/URP-Update-testing/BoatAttack-19-4/Packages/com.unity.render-pipelines.core" /Y
       -  Xcopy /E /I "com.unity.render-pipelines.universal" "TestProjects/URP-Update-testing/BoatAttack-19-4/Packages/com.unity.render-pipelines.universal" /Y
       -  Xcopy /E /I "com.unity.shadergraph" "TestProjects/URP-Update-testing/BoatAttack-19-4/Packages/com.unity.shadergraph" /Y
+      -  copy /Y "unity_revision.txt" "TestProjects/URP-Update-testing/BoatAttack-19-4/unity_revision.txt"
       -  cd TestProjects/URP-Update-testing/BoatAttack-19-4 && unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  cd TestProjects/URP-Update-testing/BoatAttack-19-4 && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=.
     artifacts:
@@ -101,6 +102,7 @@ URPUpdate_BoatAttack_Win_Vulkan_editmode_mono_Linear_CUSTOM-REVISION:
       -  Xcopy /E /I "com.unity.render-pipelines.core" "TestProjects/URP-Update-testing/BoatAttack-19-4/Packages/com.unity.render-pipelines.core" /Y
       -  Xcopy /E /I "com.unity.render-pipelines.universal" "TestProjects/URP-Update-testing/BoatAttack-19-4/Packages/com.unity.render-pipelines.universal" /Y
       -  Xcopy /E /I "com.unity.shadergraph" "TestProjects/URP-Update-testing/BoatAttack-19-4/Packages/com.unity.shadergraph" /Y
+      -  copy /Y "unity_revision.txt" "TestProjects/URP-Update-testing/BoatAttack-19-4/unity_revision.txt"
       -  cd TestProjects/URP-Update-testing/BoatAttack-19-4 && unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  cd TestProjects/URP-Update-testing/BoatAttack-19-4 && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testfilter=%TEST_FILTER% --testproject=.
     artifacts:

.yamato/urpupdate_top_asset_store-win-dx11.yml

@@ -73,6 +73,7 @@ URPUpdate_Top_Asset_Store_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION:
       -  Xcopy /E /I "com.unity.render-pipelines.core" "TestProjects/URP-Update-testing/Top-URP-Assets/Packages/com.unity.render-pipelines.core" /Y
       -  Xcopy /E /I "com.unity.render-pipelines.universal" "TestProjects/URP-Update-testing/Top-URP-Assets/Packages/com.unity.render-pipelines.universal" /Y
       -  Xcopy /E /I "com.unity.shadergraph" "TestProjects/URP-Update-testing/Top-URP-Assets/Packages/com.unity.shadergraph" /Y
+      -  copy /Y "unity_revision.txt" "TestProjects/URP-Update-testing/Top-URP-Assets/unity_revision.txt"
       -  cd TestProjects/URP-Update-testing/Top-URP-Assets && unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  cd TestProjects/URP-Update-testing/Top-URP-Assets && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d11" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=.
     artifacts:
@@ -101,6 +102,7 @@ URPUpdate_Top_Asset_Store_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION:
       -  Xcopy /E /I "com.unity.render-pipelines.core" "TestProjects/URP-Update-testing/Top-URP-Assets/Packages/com.unity.render-pipelines.core" /Y
       -  Xcopy /E /I "com.unity.render-pipelines.universal" "TestProjects/URP-Update-testing/Top-URP-Assets/Packages/com.unity.render-pipelines.universal" /Y
       -  Xcopy /E /I "com.unity.shadergraph" "TestProjects/URP-Update-testing/Top-URP-Assets/Packages/com.unity.shadergraph" /Y
+      -  copy /Y "unity_revision.txt" "TestProjects/URP-Update-testing/Top-URP-Assets/unity_revision.txt"
       -  cd TestProjects/URP-Update-testing/Top-URP-Assets && unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  cd TestProjects/URP-Update-testing/Top-URP-Assets && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d11" --extra-editor-arg="-playergraphicsapi=Direct3D11" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testfilter=%TEST_FILTER% --testproject=.
     artifacts:

.yamato/urpupdate_top_asset_store-win-vulkan.yml

@@ -73,6 +73,7 @@ URPUpdate_Top_Asset_Store_Win_Vulkan_playmode_mono_Linear_CUSTOM-REVISION:
       -  Xcopy /E /I "com.unity.render-pipelines.core" "TestProjects/URP-Update-testing/Top-URP-Assets/Packages/com.unity.render-pipelines.core" /Y
       -  Xcopy /E /I "com.unity.render-pipelines.universal" "TestProjects/URP-Update-testing/Top-URP-Assets/Packages/com.unity.render-pipelines.universal" /Y
       -  Xcopy /E /I "com.unity.shadergraph" "TestProjects/URP-Update-testing/Top-URP-Assets/Packages/com.unity.shadergraph" /Y
+      -  copy /Y "unity_revision.txt" "TestProjects/URP-Update-testing/Top-URP-Assets/unity_revision.txt"
       -  cd TestProjects/URP-Update-testing/Top-URP-Assets && unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  cd TestProjects/URP-Update-testing/Top-URP-Assets && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=.
     artifacts:
@@ -101,6 +102,7 @@ URPUpdate_Top_Asset_Store_Win_Vulkan_editmode_mono_Linear_CUSTOM-REVISION:
       -  Xcopy /E /I "com.unity.render-pipelines.core" "TestProjects/URP-Update-testing/Top-URP-Assets/Packages/com.unity.render-pipelines.core" /Y
       -  Xcopy /E /I "com.unity.render-pipelines.universal" "TestProjects/URP-Update-testing/Top-URP-Assets/Packages/com.unity.render-pipelines.universal" /Y
       -  Xcopy /E /I "com.unity.shadergraph" "TestProjects/URP-Update-testing/Top-URP-Assets/Packages/com.unity.shadergraph" /Y
+      -  copy /Y "unity_revision.txt" "TestProjects/URP-Update-testing/Top-URP-Assets/unity_revision.txt"
       -  cd TestProjects/URP-Update-testing/Top-URP-Assets && unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp  --wait --published-only
       -  cd TestProjects/URP-Update-testing/Top-URP-Assets && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testfilter=%TEST_FILTER% --testproject=.
     artifacts: