From 40ee9564c7131db809ad5b13cbac2f469d38ec0f Mon Sep 17 00:00:00 2001 From: Liis Kivistik Date: Mon, 12 Oct 2020 15:43:58 +0200 Subject: [PATCH 1/4] take latest ruamel from master --- .yamato/_abv.yml | 218 +------------ .yamato/{_editor.yml => _editor_priming.yml} | 0 .yamato/_packages.yml | 208 +++++++------ .yamato/_projectcontext.yml | 34 +- .yamato/_templates.yml | 48 +-- .yamato/all-smoke_test.yml | 34 ++ .yamato/config/__shared.metafile | 33 +- .yamato/config/_abv.metafile | 21 +- .yamato/config/_editor.metafile | 47 ++- .yamato/config/_packages.metafile | 4 +- .yamato/config/smoke_test.metafile | 20 ++ .yamato/docs/editor_pinning.png | 3 + .yamato/docs/readme.md | 155 +++++++-- .yamato/hdrp-linux-vulkan.yml | 148 +++++++-- .yamato/hdrp-osx-metal.yml | 175 +++-------- .yamato/hdrp-win-dx11.yml | 141 +++++---- .yamato/hdrp-win-dx12.yml | 141 +++++---- .yamato/hdrp-win-vulkan.yml | 141 +++++---- .yamato/hdrp_dxr-win-dx12.yml | 87 +++--- .yamato/ruamel/build.py | 19 +- .../ruamel/editor_pinning/merge_revisions.py | 117 +++++++ .../ruamel/editor_pinning/update_revisions.py | 294 ++++++++++++++++++ .../editor_pinning/util/subprocess_helpers.py | 68 ++++ .yamato/ruamel/jobs/abv/abv_all_project_ci.py | 21 +- .../jobs/abv/abv_all_project_ci_nightly.py | 37 +-- .../ruamel/jobs/abv/abv_all_smoke_tests.py | 27 -- .yamato/ruamel/jobs/abv/abv_smoke_test.py | 46 --- .../ruamel/jobs/abv/abv_trunk_verification.py | 10 +- .yamato/ruamel/jobs/abv/yml_abv.py | 15 +- .../jobs/editor/editor_pinning_merge_all.py | 59 ++++ .../editor/editor_pinning_merge_revisions.py | 48 +++ .../editor/editor_pinning_target_to_ci.py | 40 +++ .../jobs/editor/editor_pinning_update.py | 43 +++ .../editor/{editor.py => editor_priming.py} | 19 +- .../jobs/editor/editor_priming_min_editor.py | 2 +- .yamato/ruamel/jobs/editor/yml_editor.py | 58 +++- .../ruamel/jobs/packages/package_publish.py | 9 +- ...lish_all.py => package_publish_all_tag.py} | 17 +- .../jobs/packages/package_publish_dry.py | 8 +- .yamato/ruamel/jobs/packages/package_test.py | 17 +- .../ruamel/jobs/packages/package_test_all.py | 18 +- .../packages/package_test_dependencies.py | 15 +- .../ruamel/jobs/packages/project_publish.py | 9 +- ...lish_all.py => project_publish_all_tag.py} | 9 +- .../jobs/packages/project_publish_dry.py | 8 +- .yamato/ruamel/jobs/packages/project_test.py | 18 +- .../ruamel/jobs/packages/project_test_all.py | 20 +- .../jobs/packages/project_test_min_editor.py | 4 +- .yamato/ruamel/jobs/packages/yml_package.py | 10 +- .yamato/ruamel/jobs/packages/yml_project.py | 10 +- .../jobs/preview_publish/pb_auto_version.py | 23 +- .yamato/ruamel/jobs/projects/_project_base.py | 27 +- .../jobs/projects/commands/_cmd_mapper.py | 11 +- .../ruamel/jobs/projects/commands/internal.py | 53 ++++ .../ruamel/jobs/projects/commands/iphone.py | 6 +- .../ruamel/jobs/projects/commands/linux.py | 30 +- .../jobs/projects/commands/linux_split.py | 37 --- .../jobs/projects/commands/osx_metal.py | 2 +- .../jobs/projects/commands/osx_metal_split.py | 57 ---- .../jobs/projects/commands/osx_openglcore.py | 2 +- .yamato/ruamel/jobs/projects/project_all.py | 10 +- .../jobs/projects/project_not_standalone.py | 15 +- .../jobs/projects/project_standalone.py | 13 +- .../jobs/projects/project_standalone_build.py | 8 +- .yamato/ruamel/jobs/projects/yml_project.py | 53 ++-- .yamato/ruamel/jobs/shared/constants.py | 24 +- .yamato/ruamel/jobs/shared/namer.py | 91 +++--- .yamato/ruamel/jobs/shared/utr_utils.py | 12 +- .yamato/ruamel/jobs/shared/yml_job.py | 10 + .../ruamel/jobs/templates/template_test.py | 18 +- .../templates/template_test_dependencies.py | 16 +- .yamato/ruamel/jobs/templates/test_all.py | 8 +- .yamato/ruamel/metafile_parser.py | 29 +- .yamato/shadergraph-linux-openglcore.yml | 54 ++-- .yamato/shadergraph-linux-vulkan.yml | 148 +++++++-- .yamato/shadergraph-osx-metal.yml | 142 ++------- .yamato/shadergraph-osx-openglcore.yml | 54 ++-- .yamato/shadergraph-win-dx11.yml | 114 ++++--- .yamato/shadergraph-win-vulkan.yml | 114 ++++--- .yamato/shadergraph_stereo-win.yml | 87 +++--- .yamato/smoke_test-win-dx11.yml | 273 ++++++++++++++++ .yamato/universal-android-opengles3.yml | 60 ++-- .yamato/universal-android-vulkan.yml | 60 ++-- .yamato/universal-linux-openglcore.yml | 54 ++-- .yamato/universal-linux-vulkan.yml | 148 +++++++-- .yamato/universal-osx-metal.yml | 175 +++-------- .yamato/universal-osx-openglcore.yml | 81 ++--- .yamato/universal-win-dx11.yml | 141 +++++---- .yamato/universal-win-vulkan.yml | 141 +++++---- .yamato/universal_stereo-win.yml | 87 +++--- .yamato/vfx_hdrp-linux-vulkan.yml | 148 +++++++-- .yamato/vfx_hdrp-osx-metal.yml | 142 ++------- .yamato/vfx_hdrp-win-dx11.yml | 114 ++++--- .yamato/vfx_hdrp-win-vulkan.yml | 114 ++++--- .yamato/vfx_urp-linux-openglcore.yml | 27 +- .yamato/vfx_urp-linux-vulkan.yml | 121 +++++-- .yamato/vfx_urp-osx-metal.yml | 66 ++-- .yamato/vfx_urp-osx-openglcore.yml | 27 +- .yamato/vfx_urp-win-dx11.yml | 87 +++--- .yamato/vfx_urp-win-vulkan.yml | 87 +++--- 100 files changed, 3761 insertions(+), 2413 deletions(-) rename .yamato/{_editor.yml => _editor_priming.yml} (100%) create mode 100644 .yamato/all-smoke_test.yml create mode 100644 .yamato/config/smoke_test.metafile create mode 100644 .yamato/docs/editor_pinning.png create mode 100644 .yamato/ruamel/editor_pinning/merge_revisions.py create mode 100644 .yamato/ruamel/editor_pinning/update_revisions.py create mode 100644 .yamato/ruamel/editor_pinning/util/subprocess_helpers.py delete mode 100644 .yamato/ruamel/jobs/abv/abv_all_smoke_tests.py delete mode 100644 .yamato/ruamel/jobs/abv/abv_smoke_test.py create mode 100644 .yamato/ruamel/jobs/editor/editor_pinning_merge_all.py create mode 100644 .yamato/ruamel/jobs/editor/editor_pinning_merge_revisions.py create mode 100644 .yamato/ruamel/jobs/editor/editor_pinning_target_to_ci.py create mode 100644 .yamato/ruamel/jobs/editor/editor_pinning_update.py rename .yamato/ruamel/jobs/editor/{editor.py => editor_priming.py} (65%) rename .yamato/ruamel/jobs/packages/{package_publish_all.py => package_publish_all_tag.py} (75%) rename .yamato/ruamel/jobs/packages/{project_publish_all.py => project_publish_all_tag.py} (75%) create mode 100644 .yamato/ruamel/jobs/projects/commands/internal.py delete mode 100644 .yamato/ruamel/jobs/projects/commands/linux_split.py delete mode 100644 .yamato/ruamel/jobs/projects/commands/osx_metal_split.py create mode 100644 .yamato/smoke_test-win-dx11.yml diff --git a/.yamato/_abv.yml b/.yamato/_abv.yml index e11c0a8c536..62310f47ed8 100644 --- a/.yamato/_abv.yml +++ b/.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_2020.1: - name: SRP Smoke Test - Standalone_2020.1 - 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:2020.1:windows - rerun: on-new-revision - artifacts: - logs: - paths: - - "**/test-results/**" -smoke_test_playmode_2020.1: - name: SRP Smoke Test - playmode_2020.1 - 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:2020.1:windows - rerun: on-new-revision - artifacts: - logs: - paths: - - "**/test-results/**" -smoke_test_editmode_2020.1: - name: SRP Smoke Test - editmode_2020.1 - 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:2020.1:windows - rerun: on-new-revision - artifacts: - logs: - paths: - - "**/test-results/**" -all_smoke_tests_2020.1: - name: All Smoke Tests - 2020.1 - dependencies: - - path: .yamato/_abv.yml#smoke_test_Standalone_2020.1 - rerun: on-new-revision - - path: .yamato/_abv.yml#smoke_test_playmode_2020.1 - rerun: on-new-revision - - path: .yamato/_abv.yml#smoke_test_editmode_2020.1 - rerun: on-new-revision all_project_ci_2020.1: name: _ABV for SRP repository - 2020.1 dependencies: @@ -92,11 +23,11 @@ all_project_ci_nightly_2020.1: dependencies: - path: .yamato/_abv.yml#all_project_ci_2020.1 rerun: on-new-revision - - path: .yamato/_abv.yml#smoke_test_Standalone_2020.1 + - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_2020.1 rerun: on-new-revision - - path: .yamato/_abv.yml#smoke_test_playmode_2020.1 + - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_editmode_2020.1 rerun: on-new-revision - - path: .yamato/_abv.yml#smoke_test_editmode_2020.1 + - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_2020.1 rerun: on-new-revision - path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_2020.1 rerun: on-new-revision @@ -127,75 +58,6 @@ trunk_verification_2020.1: rerun: on-new-revision - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_2020.1 rerun: on-new-revision -smoke_test_Standalone_fast-2020.1: - name: SRP Smoke Test - Standalone_fast-2020.1 - 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-2020.1:windows - rerun: on-new-revision - artifacts: - logs: - paths: - - "**/test-results/**" -smoke_test_playmode_fast-2020.1: - name: SRP Smoke Test - playmode_fast-2020.1 - 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-2020.1:windows - rerun: on-new-revision - artifacts: - logs: - paths: - - "**/test-results/**" -smoke_test_editmode_fast-2020.1: - name: SRP Smoke Test - editmode_fast-2020.1 - 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-2020.1:windows - rerun: on-new-revision - artifacts: - logs: - paths: - - "**/test-results/**" -all_smoke_tests_fast-2020.1: - name: All Smoke Tests - fast-2020.1 - dependencies: - - path: .yamato/_abv.yml#smoke_test_Standalone_fast-2020.1 - rerun: on-new-revision - - path: .yamato/_abv.yml#smoke_test_playmode_fast-2020.1 - rerun: on-new-revision - - path: .yamato/_abv.yml#smoke_test_editmode_fast-2020.1 - rerun: on-new-revision all_project_ci_fast-2020.1: name: _ABV for SRP repository - fast-2020.1 dependencies: @@ -234,80 +96,6 @@ trunk_verification_fast-2020.1: rerun: on-new-revision - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_fast-2020.1 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: diff --git a/.yamato/_editor.yml b/.yamato/_editor_priming.yml similarity index 100% rename from .yamato/_editor.yml rename to .yamato/_editor_priming.yml diff --git a/.yamato/_packages.yml b/.yamato/_packages.yml index afe0ab42339..68cad3094e2 100644 --- a/.yamato/_packages.yml +++ b/.yamato/_packages.yml @@ -374,8 +374,8 @@ test_core_windows_2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#pack_core + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -395,9 +395,9 @@ test_core_windows_2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#test_core_windows_2020.1 - .yamato/_packages.yml#pack_core + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -414,11 +414,11 @@ test_lwrp_windows_2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal - .yamato/_packages.yml#pack_lwrp + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -439,12 +439,12 @@ test_lwrp_windows_2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#test_lwrp_windows_2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal - .yamato/_packages.yml#pack_lwrp + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -465,9 +465,9 @@ test_shadergraph_windows_2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -488,10 +488,10 @@ test_shadergraph_windows_2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#test_shadergraph_windows_2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -512,12 +512,12 @@ test_hdrp_windows_2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -538,13 +538,13 @@ test_hdrp_windows_2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#test_hdrp_windows_2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -565,10 +565,10 @@ test_universal_windows_2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -589,11 +589,11 @@ test_universal_windows_2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#test_universal_windows_2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -614,10 +614,10 @@ test_vfx_windows_2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -638,11 +638,11 @@ test_vfx_windows_2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#test_vfx_windows_2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -663,9 +663,9 @@ test_config_windows_2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_config + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -686,10 +686,10 @@ test_config_windows_2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_packages.yml#test_config_windows_2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_config + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -710,8 +710,8 @@ test_core_macos_2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#pack_core + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -731,9 +731,9 @@ test_core_macos_2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#test_core_macos_2020.1 - .yamato/_packages.yml#pack_core + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -750,11 +750,11 @@ test_lwrp_macos_2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal - .yamato/_packages.yml#pack_lwrp + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -775,12 +775,12 @@ test_lwrp_macos_2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#test_lwrp_macos_2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal - .yamato/_packages.yml#pack_lwrp + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -801,9 +801,9 @@ test_shadergraph_macos_2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -824,10 +824,10 @@ test_shadergraph_macos_2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#test_shadergraph_macos_2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -848,12 +848,12 @@ test_hdrp_macos_2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -874,13 +874,13 @@ test_hdrp_macos_2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#test_hdrp_macos_2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -901,10 +901,10 @@ test_universal_macos_2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -925,11 +925,11 @@ test_universal_macos_2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#test_universal_macos_2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -950,10 +950,10 @@ test_vfx_macos_2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -974,11 +974,11 @@ test_vfx_macos_2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#test_vfx_macos_2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -999,9 +999,9 @@ test_config_macos_2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_config + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1022,10 +1022,10 @@ test_config_macos_2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_packages.yml#test_config_macos_2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_config + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1046,8 +1046,8 @@ test_core_windows_fast-2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#pack_core + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1067,9 +1067,9 @@ test_core_windows_fast-2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#test_core_windows_fast-2020.1 - .yamato/_packages.yml#pack_core + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1086,11 +1086,11 @@ test_lwrp_windows_fast-2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal - .yamato/_packages.yml#pack_lwrp + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1111,12 +1111,12 @@ test_lwrp_windows_fast-2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#test_lwrp_windows_fast-2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal - .yamato/_packages.yml#pack_lwrp + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1137,9 +1137,9 @@ test_shadergraph_windows_fast-2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1160,10 +1160,10 @@ test_shadergraph_windows_fast-2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#test_shadergraph_windows_fast-2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1184,12 +1184,12 @@ test_hdrp_windows_fast-2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1210,13 +1210,13 @@ test_hdrp_windows_fast-2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#test_hdrp_windows_fast-2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1237,10 +1237,10 @@ test_universal_windows_fast-2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1261,11 +1261,11 @@ test_universal_windows_fast-2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#test_universal_windows_fast-2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1286,10 +1286,10 @@ test_vfx_windows_fast-2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1310,11 +1310,11 @@ test_vfx_windows_fast-2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#test_vfx_windows_fast-2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1335,9 +1335,9 @@ test_config_windows_fast-2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_config + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1358,10 +1358,10 @@ test_config_windows_fast-2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_packages.yml#test_config_windows_fast-2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_config + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1382,8 +1382,8 @@ test_core_macos_fast-2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#pack_core + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1403,9 +1403,9 @@ test_core_macos_fast-2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#test_core_macos_fast-2020.1 - .yamato/_packages.yml#pack_core + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1422,11 +1422,11 @@ test_lwrp_macos_fast-2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal - .yamato/_packages.yml#pack_lwrp + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1447,12 +1447,12 @@ test_lwrp_macos_fast-2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#test_lwrp_macos_fast-2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal - .yamato/_packages.yml#pack_lwrp + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1473,9 +1473,9 @@ test_shadergraph_macos_fast-2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1496,10 +1496,10 @@ test_shadergraph_macos_fast-2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#test_shadergraph_macos_fast-2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1520,12 +1520,12 @@ test_hdrp_macos_fast-2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1546,13 +1546,13 @@ test_hdrp_macos_fast-2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#test_hdrp_macos_fast-2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1573,10 +1573,10 @@ test_universal_macos_fast-2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1597,11 +1597,11 @@ test_universal_macos_fast-2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#test_universal_macos_fast-2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1622,10 +1622,10 @@ test_vfx_macos_fast-2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1646,11 +1646,11 @@ test_vfx_macos_fast-2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#test_vfx_macos_fast-2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1671,9 +1671,9 @@ test_config_macos_fast-2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_config + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1694,10 +1694,10 @@ test_config_macos_fast-2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_packages.yml#test_config_macos_fast-2020.1 - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_config + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1718,8 +1718,8 @@ test_core_windows_CUSTOM-REVISION: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#pack_core + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1732,6 +1732,8 @@ test_core_windows_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_core_windows_CUSTOM-REVISION_dependencies: name: Test Core Win CUSTOM-REVISION - dependencies agent: @@ -1739,9 +1741,9 @@ test_core_windows_CUSTOM-REVISION_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#test_core_windows_CUSTOM-REVISION - .yamato/_packages.yml#pack_core + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1758,11 +1760,11 @@ test_lwrp_windows_CUSTOM-REVISION: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal - .yamato/_packages.yml#pack_lwrp + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1776,6 +1778,8 @@ test_lwrp_windows_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_lwrp_windows_CUSTOM-REVISION_dependencies: name: Test Lightweight Win CUSTOM-REVISION - dependencies agent: @@ -1783,12 +1787,12 @@ test_lwrp_windows_CUSTOM-REVISION_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#test_lwrp_windows_CUSTOM-REVISION - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal - .yamato/_packages.yml#pack_lwrp + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1809,9 +1813,9 @@ test_shadergraph_windows_CUSTOM-REVISION: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1825,6 +1829,8 @@ test_shadergraph_windows_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_shadergraph_windows_CUSTOM-REVISION_dependencies: name: Test ShaderGraph Win CUSTOM-REVISION - dependencies agent: @@ -1832,10 +1838,10 @@ test_shadergraph_windows_CUSTOM-REVISION_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#test_shadergraph_windows_CUSTOM-REVISION - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1856,12 +1862,12 @@ test_hdrp_windows_CUSTOM-REVISION: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1875,6 +1881,8 @@ test_hdrp_windows_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_hdrp_windows_CUSTOM-REVISION_dependencies: name: Test HDRP Win CUSTOM-REVISION - dependencies agent: @@ -1882,13 +1890,13 @@ test_hdrp_windows_CUSTOM-REVISION_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#test_hdrp_windows_CUSTOM-REVISION - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1909,10 +1917,10 @@ test_universal_windows_CUSTOM-REVISION: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1926,6 +1934,8 @@ test_universal_windows_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_universal_windows_CUSTOM-REVISION_dependencies: name: Test Universal Win CUSTOM-REVISION - dependencies agent: @@ -1933,11 +1943,11 @@ test_universal_windows_CUSTOM-REVISION_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#test_universal_windows_CUSTOM-REVISION - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1958,10 +1968,10 @@ test_vfx_windows_CUSTOM-REVISION: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -1975,6 +1985,8 @@ test_vfx_windows_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_vfx_windows_CUSTOM-REVISION_dependencies: name: Test VFX Win CUSTOM-REVISION - dependencies agent: @@ -1982,11 +1994,11 @@ test_vfx_windows_CUSTOM-REVISION_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#test_vfx_windows_CUSTOM-REVISION - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2007,9 +2019,9 @@ test_config_windows_CUSTOM-REVISION: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_config + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2023,6 +2035,8 @@ test_config_windows_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_config_windows_CUSTOM-REVISION_dependencies: name: Test Config Win CUSTOM-REVISION - dependencies agent: @@ -2030,10 +2044,10 @@ test_config_windows_CUSTOM-REVISION_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_packages.yml#test_config_windows_CUSTOM-REVISION - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_config + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2054,8 +2068,8 @@ test_core_macos_CUSTOM-REVISION: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#pack_core + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2068,6 +2082,8 @@ test_core_macos_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_core_macos_CUSTOM-REVISION_dependencies: name: Test Core OSX CUSTOM-REVISION - dependencies agent: @@ -2075,9 +2091,9 @@ test_core_macos_CUSTOM-REVISION_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#test_core_macos_CUSTOM-REVISION - .yamato/_packages.yml#pack_core + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2094,11 +2110,11 @@ test_lwrp_macos_CUSTOM-REVISION: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal - .yamato/_packages.yml#pack_lwrp + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2112,6 +2128,8 @@ test_lwrp_macos_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_lwrp_macos_CUSTOM-REVISION_dependencies: name: Test Lightweight OSX CUSTOM-REVISION - dependencies agent: @@ -2119,12 +2137,12 @@ test_lwrp_macos_CUSTOM-REVISION_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#test_lwrp_macos_CUSTOM-REVISION - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal - .yamato/_packages.yml#pack_lwrp + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2145,9 +2163,9 @@ test_shadergraph_macos_CUSTOM-REVISION: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2161,6 +2179,8 @@ test_shadergraph_macos_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_shadergraph_macos_CUSTOM-REVISION_dependencies: name: Test ShaderGraph OSX CUSTOM-REVISION - dependencies agent: @@ -2168,10 +2188,10 @@ test_shadergraph_macos_CUSTOM-REVISION_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#test_shadergraph_macos_CUSTOM-REVISION - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2192,12 +2212,12 @@ test_hdrp_macos_CUSTOM-REVISION: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2211,6 +2231,8 @@ test_hdrp_macos_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_hdrp_macos_CUSTOM-REVISION_dependencies: name: Test HDRP OSX CUSTOM-REVISION - dependencies agent: @@ -2218,13 +2240,13 @@ test_hdrp_macos_CUSTOM-REVISION_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#test_hdrp_macos_CUSTOM-REVISION - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2245,10 +2267,10 @@ test_universal_macos_CUSTOM-REVISION: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2262,6 +2284,8 @@ test_universal_macos_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_universal_macos_CUSTOM-REVISION_dependencies: name: Test Universal OSX CUSTOM-REVISION - dependencies agent: @@ -2269,11 +2293,11 @@ test_universal_macos_CUSTOM-REVISION_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#test_universal_macos_CUSTOM-REVISION - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2294,10 +2318,10 @@ test_vfx_macos_CUSTOM-REVISION: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2311,6 +2335,8 @@ test_vfx_macos_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_vfx_macos_CUSTOM-REVISION_dependencies: name: Test VFX OSX CUSTOM-REVISION - dependencies agent: @@ -2318,11 +2344,11 @@ test_vfx_macos_CUSTOM-REVISION_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#test_vfx_macos_CUSTOM-REVISION - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2343,9 +2369,9 @@ test_config_macos_CUSTOM-REVISION: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_config + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2359,6 +2385,8 @@ test_config_macos_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_config_macos_CUSTOM-REVISION_dependencies: name: Test Config OSX CUSTOM-REVISION - dependencies agent: @@ -2366,10 +2394,10 @@ test_config_macos_CUSTOM-REVISION_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_packages.yml#test_config_macos_CUSTOM-REVISION - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_config + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -2384,7 +2412,7 @@ test_config_macos_CUSTOM-REVISION_dependencies: paths: - "**/test-results/**" all_package_ci_2020.1: - name: Pack and test all packages - 2020.1 + name: Pack and test all packages - 2020.1 [package context] agent: type: Unity::VM image: package-ci/win10:stable @@ -2409,7 +2437,7 @@ all_package_ci_2020.1: - upm-ci package izon -t - upm-ci package izon -d all_package_ci_fast-2020.1: - name: Pack and test all packages - fast-2020.1 + name: Pack and test all packages - fast-2020.1 [package context] agent: type: Unity::VM image: package-ci/win10:stable @@ -2434,7 +2462,7 @@ all_package_ci_fast-2020.1: - upm-ci package izon -t - upm-ci package izon -d all_package_ci_CUSTOM-REVISION: - name: Pack and test all packages - CUSTOM-REVISION + name: Pack and test all packages - CUSTOM-REVISION [package context] agent: type: Unity::VM image: package-ci/win10:stable @@ -2454,12 +2482,14 @@ all_package_ci_CUSTOM-REVISION: - .yamato/_packages.yml#test_universal_macos_CUSTOM-REVISION - .yamato/_packages.yml#test_vfx_macos_CUSTOM-REVISION - .yamato/_packages.yml#test_config_macos_CUSTOM-REVISION + variables: + CUSTOM_REVISION: custom_revision_not_set commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t - upm-ci package izon -d -publish_all: - name: Publish all packages +publish_all_tag: + name: Publish all packages [package context][manual][tag] agent: type: Unity::VM image: package-ci/ubuntu:stable diff --git a/.yamato/_projectcontext.yml b/.yamato/_projectcontext.yml index d8b8fe32c91..5e20208169b 100644 --- a/.yamato/_projectcontext.yml +++ b/.yamato/_projectcontext.yml @@ -261,8 +261,8 @@ test_all_project_windows_2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_projectcontext.yml#pack_all_project + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -279,8 +279,8 @@ test_all_project_macos_2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_projectcontext.yml#pack_all_project + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -297,8 +297,8 @@ test_all_project_windows_fast-2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_projectcontext.yml#pack_all_project + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -315,8 +315,8 @@ test_all_project_macos_fast-2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_projectcontext.yml#pack_all_project + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -333,8 +333,8 @@ test_all_project_windows_CUSTOM-REVISION: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_projectcontext.yml#pack_all_project + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -344,6 +344,8 @@ test_all_project_windows_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_all_project_macos_CUSTOM-REVISION: name: Test all packages [project context] OSX CUSTOM-REVISION agent: @@ -351,8 +353,8 @@ test_all_project_macos_CUSTOM-REVISION: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_projectcontext.yml#pack_all_project + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -362,6 +364,8 @@ test_all_project_macos_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + variables: + CUSTOM_REVISION: custom_revision_not_set test_all_project_windows_min_editor: name: Test minimum editor version - all packages [project context] Win agent: @@ -370,7 +374,7 @@ test_all_project_windows_min_editor: flavor: b1.large dependencies: - .yamato/_projectcontext.yml#pack_all_project - - .yamato/_editor.yml#editor:priming:test_min_editor:windows + - .yamato/_editor_priming.yml#editor:priming:test_min_editor:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -388,7 +392,7 @@ test_all_project_macos_min_editor: flavor: m1.mac dependencies: - .yamato/_projectcontext.yml#pack_all_project - - .yamato/_editor.yml#editor:priming:test_min_editor:macos + - .yamato/_editor_priming.yml#editor:priming:test_min_editor:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -406,9 +410,7 @@ all_package_ci_project_2020.1: flavor: b1.large dependencies: - .yamato/_projectcontext.yml#test_all_project_windows_2020.1 - - .yamato/_projectcontext.yml#test_all_project_windows_min_editor - .yamato/_projectcontext.yml#test_all_project_macos_2020.1 - - .yamato/_projectcontext.yml#test_all_project_macos_min_editor commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t @@ -421,15 +423,11 @@ all_package_ci_project_fast-2020.1: flavor: b1.large dependencies: - .yamato/_projectcontext.yml#test_all_project_windows_fast-2020.1 - - .yamato/_projectcontext.yml#test_all_project_windows_min_editor - .yamato/_projectcontext.yml#test_all_project_macos_fast-2020.1 - - .yamato/_projectcontext.yml#test_all_project_macos_min_editor commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t - upm-ci package izon -d - triggers: - expression: pull_request.target eq "8.x.x/release" AND NOT pull_request.draft AND pull_request.push.changes.any match ["**/Documentation*/**/*"] all_package_ci_project_CUSTOM-REVISION: name: Pack and test all packages - CUSTOM-REVISION [project context] agent: @@ -438,15 +436,15 @@ all_package_ci_project_CUSTOM-REVISION: flavor: b1.large dependencies: - .yamato/_projectcontext.yml#test_all_project_windows_CUSTOM-REVISION - - .yamato/_projectcontext.yml#test_all_project_windows_min_editor - .yamato/_projectcontext.yml#test_all_project_macos_CUSTOM-REVISION - - .yamato/_projectcontext.yml#test_all_project_macos_min_editor + variables: + CUSTOM_REVISION: custom_revision_not_set commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t - upm-ci package izon -d -publish_all_project: - name: Publish all packages [project context] +publish_all_project_tag: + name: Publish all packages [project context][manual][tag] agent: type: Unity::VM image: package-ci/ubuntu:stable diff --git a/.yamato/_templates.yml b/.yamato/_templates.yml index f63500a22f8..11397d35312 100644 --- a/.yamato/_templates.yml +++ b/.yamato/_templates.yml @@ -38,13 +38,13 @@ test_hdrp_template_windows_2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_templates.yml#pack_hdrp_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -63,13 +63,13 @@ test_hdrp_template_windows_2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_templates.yml#pack_hdrp_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -88,11 +88,11 @@ test_universal_template_windows_2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_templates.yml#pack_universal_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -111,11 +111,11 @@ test_universal_template_windows_2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:windows - .yamato/_templates.yml#pack_universal_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -134,13 +134,13 @@ test_hdrp_template_macos_2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_templates.yml#pack_hdrp_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -159,13 +159,13 @@ test_hdrp_template_macos_2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_templates.yml#pack_hdrp_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -184,11 +184,11 @@ test_universal_template_macos_2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_templates.yml#pack_universal_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -207,11 +207,11 @@ test_universal_template_macos_2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:2020.1:macos - .yamato/_templates.yml#pack_universal_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -230,13 +230,13 @@ test_hdrp_template_windows_fast-2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_templates.yml#pack_hdrp_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -255,13 +255,13 @@ test_hdrp_template_windows_fast-2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_templates.yml#pack_hdrp_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -280,11 +280,11 @@ test_universal_template_windows_fast-2020.1: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_templates.yml#pack_universal_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -303,11 +303,11 @@ test_universal_template_windows_fast-2020.1_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:windows - .yamato/_templates.yml#pack_universal_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -326,13 +326,13 @@ test_hdrp_template_macos_fast-2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_templates.yml#pack_hdrp_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -351,13 +351,13 @@ test_hdrp_template_macos_fast-2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_templates.yml#pack_hdrp_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -376,11 +376,11 @@ test_universal_template_macos_fast-2020.1: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_templates.yml#pack_universal_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -399,11 +399,11 @@ test_universal_template_macos_fast-2020.1_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:fast-2020.1:macos - .yamato/_templates.yml#pack_universal_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -422,13 +422,13 @@ test_hdrp_template_windows_CUSTOM-REVISION: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_templates.yml#pack_hdrp_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -447,13 +447,13 @@ test_hdrp_template_windows_CUSTOM-REVISION_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_templates.yml#pack_hdrp_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -472,11 +472,11 @@ test_universal_template_windows_CUSTOM-REVISION: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_templates.yml#pack_universal_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -495,11 +495,11 @@ test_universal_template_windows_CUSTOM-REVISION_dependencies: image: package-ci/win10:stable flavor: b1.large dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - .yamato/_templates.yml#pack_universal_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -518,13 +518,13 @@ test_hdrp_template_macos_CUSTOM-REVISION: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_templates.yml#pack_hdrp_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -543,13 +543,13 @@ test_hdrp_template_macos_CUSTOM-REVISION_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_templates.yml#pack_hdrp_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_vfx - .yamato/_packages.yml#pack_config - .yamato/_packages.yml#pack_hdrp + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -568,11 +568,11 @@ test_universal_template_macos_CUSTOM-REVISION: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_templates.yml#pack_universal_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -591,11 +591,11 @@ test_universal_template_macos_CUSTOM-REVISION_dependencies: image: package-ci/mac:stable flavor: m1.mac dependencies: - - .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - .yamato/_templates.yml#pack_universal_template - .yamato/_packages.yml#pack_core - .yamato/_packages.yml#pack_shadergraph - .yamato/_packages.yml#pack_universal + - .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade diff --git a/.yamato/all-smoke_test.yml b/.yamato/all-smoke_test.yml new file mode 100644 index 00000000000..95db345f2ea --- /dev/null +++ b/.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_2020.1: + name: All Smoke_Test CI - 2020.1 + dependencies: + - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_2020.1 + rerun: on-new-revision + - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_editmode_2020.1 + rerun: on-new-revision + - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_2020.1 + rerun: on-new-revision +All_Smoke_Test_fast-2020.1: + name: All Smoke_Test CI - fast-2020.1 + dependencies: + - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_fast-2020.1 + rerun: on-new-revision + - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_editmode_fast-2020.1 + rerun: on-new-revision + - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_fast-2020.1 + 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 diff --git a/.yamato/config/__shared.metafile b/.yamato/config/__shared.metafile index 96af3f2ae23..a1e678cd841 100644 --- a/.yamato/config/__shared.metafile +++ b/.yamato/config/__shared.metafile @@ -1,15 +1,24 @@ target_branch: 8.x.x/release # specifies the branch on which recurrent or pr triggers are created, etc +# target_branch_editor_ci: ci/editor-pinning # specifies the branch on which editor pinning is done target_editor: 2020.1 # specifies the target editor used for some package/preview publish jobs -editors: # applied for all yml files. Override this by specifying override_editors (in the same format) in a specific metafile - - version: 2020.1 +editors: # applied for all yml files + - track: 2020.1 + name: 2020.1 rerun_strategy: on-new-revision - cmd: -u 2020.1 - - version: fast-2020.1 + editor_pinning: False + nightly: True + - track: 2020.1 + name: fast-2020.1 rerun_strategy: on-new-revision - cmd: -u 2020.1 --fast - - version: CUSTOM-REVISION + editor_pinning: False + nightly: False + fast: True + abv_pr: True + - track: CUSTOM-REVISION + name: CUSTOM-REVISION rerun_strategy: always - cmd: -u $CUSTOM_REVISION + editor_pinning: False + fast: False platforms: Win: name: Win @@ -48,6 +57,8 @@ platforms: os: macos apis: - name: Metal + exclude_test_platforms: + - editmode - name: OpenGLCore exclude_test_platforms: - Standalone @@ -95,6 +106,10 @@ platforms: type: Unity::VM image: cds-ops/ubuntu-18.04-base:stable flavor: b1.large + standalone_build: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge Android: name: Android os: android @@ -152,6 +167,10 @@ non_project_agents: type: Unity::VM image: package-ci/ubuntu:stable flavor: b1.large + package_ci_ubuntu_small: + type: Unity::VM + image: package-ci/ubuntu:stable + flavor: b1.small package_ci_win_large: type: Unity::VM image: package-ci/win10:stable diff --git a/.yamato/config/_abv.metafile b/.yamato/config/_abv.metafile index 20f34886710..6bfb047536a 100644 --- a/.yamato/config/_abv.metafile +++ b/.yamato/config/_abv.metafile @@ -1,6 +1,4 @@ abv: # specify the editor versions for which to create the expression trigger for all_project_ci job - trigger_editors: - - fast-2020.1 projects: - name: Universal - name: ShaderGraph @@ -8,9 +6,14 @@ abv: # specify the editor versions for which to create the expression trigger fo - name: VFX_HDRP - name: VFX_URP nightly: - allowed_editors: # specify the editor versions for which to create nightly jobs - - 2020.1 - extra_dependencies: # additional project jobs to run nightly (in addition to ABV and smoke tests) + extra_dependencies: # additional project jobs to run nightly (in addition to ABV) + - project: Smoke_Test + platform: Win + api: DX11 + test_platforms: + - playmode + - editmode + - Standalone - project: Universal platform: Android api: OpenGLES3 @@ -21,14 +24,6 @@ nightly: api: Vulkan test_platforms: - Standalone -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 trunk_verification: # jobs to include in trunk verification job dependencies: - project: Universal diff --git a/.yamato/config/_editor.metafile b/.yamato/config/_editor.metafile index 888d1563e10..915908173ed 100644 --- a/.yamato/config/_editor.metafile +++ b/.yamato/config/_editor.metafile @@ -1,3 +1,5 @@ + +### EDITOR PRIMING platforms: # Exhaustive list of operating systems and editor components used by all jobs so the preparation jobs # can make sure all editors are cached on cheap vms before starting the heavy duty machines for running tests @@ -6,4 +8,47 @@ platforms: - name: Win - name: Linux - name: iPhone -agent: cds_ops_ubuntu_small \ No newline at end of file +editor_priming_agent: cds_ops_ubuntu_small + +### EDITOR PINNING +editor_pin_agent: package_ci_ubuntu_small + +# 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 + + +### Configuration required by update_revisions.py +trunk_track: '2021.1' # 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.1 + + +# Paths relative to the root. Use forward slashes as directory separators. +editor_versions_file: .yamato/config/_latest_editor_versions_TRACK.metafile +ruamel_build_file: .yamato/ruamel/build.py +yml_files_path: .yamato/*.yml + +# Components to have unity-downloader-cli to trigger. +unity_downloader_components: + windows: + - editor + - il2cpp + macos: + - editor + - il2cpp + linux: + - editor + - il2cpp + android: + - editor + - il2cpp + - android + ios: + - editor + - ios + +versions_file_header: | + # WARNING: This file is automatically generated. + # To add new Unity Editor tracks, the script needs to be updated. + diff --git a/.yamato/config/_packages.metafile b/.yamato/config/_packages.metafile index c05648fcda3..34178d315dd 100644 --- a/.yamato/config/_packages.metafile +++ b/.yamato/config/_packages.metafile @@ -1,6 +1,6 @@ # all_package_ci needs dependencies for package_test_dependencies (currently commented out due to breaking) packages: - - name: Core + - name: Core id: core packagename: com.unity.render-pipelines.core dependencies: @@ -60,3 +60,5 @@ platforms: agent_pack: package_ci_win_large agent_publish: package_ci_win_large agent_publish_all: package_ci_ubuntu_large +publish_all_tracks: + - 2020.1 \ No newline at end of file diff --git a/.yamato/config/smoke_test.metafile b/.yamato/config/smoke_test.metafile new file mode 100644 index 00000000000..ec867af2380 --- /dev/null +++ b/.yamato/config/smoke_test.metafile @@ -0,0 +1,20 @@ +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 + \ No newline at end of file diff --git a/.yamato/docs/editor_pinning.png b/.yamato/docs/editor_pinning.png new file mode 100644 index 00000000000..a322a750e45 --- /dev/null +++ b/.yamato/docs/editor_pinning.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21a54ea5f81313ea78939562774f19d78e5e4c11ec40b5745f435289ae85696f +size 500833 diff --git a/.yamato/docs/readme.md b/.yamato/docs/readme.md index 0d3ad23a6cc..801b0634e59 100644 --- a/.yamato/docs/readme.md +++ b/.yamato/docs/readme.md @@ -41,12 +41,17 @@ The majority of changes are introduced within metafiles (*.yamato/config/\*.meta ### Changes when branching out - When branching out (e.g. moving from *master* to *9.x.x/release* branch), the following steps must be done: - In *__shared.metafile* : - - Change `editors` section to contain the correct editor versions - - Change `target_editor` to the target editor version for this branch (this is used e.g. for dependencies of *packages#publish_*, *preview_publish#publish_* and *preview_publish#wait_for_nightly*) (e.g. for 9.x.x this would correspond to `2020.1`) + - Change `editors` section to contain the correct editors + - Change `target_editor` to the target editor track for this branch (this is used e.g. for dependencies of *packages#publish_*, *preview_publish#publish_* and *preview_publish#wait_for_nightly*) (e.g. for 9.x.x this would correspond to `2020.1`) - Change `target_branch` to the current branch (this is used for ci triggers, such as ABV (*all_project_ci*) jobs) (e.g. for 9.x.x this would correspond to `9.x.x/release`) - - In *__abv.metafile* : - - Change `abv.trigger_editors` to the editor against which to trigger the ABV (*all_project_ci*) job (typically `fast-*` editor) (e.g. for 9.x.x this would correspond to `fast-2020.1`) - - Change `nightly.allowed_editors` to contain the editors for which to run nightly (*all_project_ci_nightly*) jobs (e.g. for 9.x.x this would correspond to `2020.1`) + - Change `target_branch_editor_ci` to the correct ci branch (editor pinning branch) + - In *__editor.metafile*: + - Change `editor_tracks` to correct track (trunk, 2020.1, etc) + - In *_packages.metafile*: + - Change `publish_all_track` to correct track (trunk, 2020.1, etc), on which package publish job depends on. This track is also used for setting a separate PR trigger on all package CI job (but it is currently commented out/disabled, as it is already covered by ABV). + +### If trunk track changes: + - Change `trunk_track` in `_editor.metafile` ### Custom test platforms: - There are 3 base test platforms to choose from: standalone (build), playmode, editmode. These can be extended by renaming them, and/or adding additional utr on top of existing ones. Their corresponding base UTR flags are found in `ruamel/jobs/shared/utr_utils.py` @@ -97,11 +102,47 @@ The majority of changes are introduced within metafiles (*.yamato/config/\*.meta - Each of these files contains functions for 3 commandsets (for standalone, standalone_build, not_standalone), which are then used according to which job is being created. - The mapping of which commands to use for which platform is done under _cmd_mapper.py. This also makes it easy to switch the set of commands for a specific platform, such as to switch to new split built/test, without completely losing the old solution. +## Editor priming vs editor pinning +- Editor priming: + - Gets the editor in a separate job to save on the compute resources, stores the editor version in a .txt file which is then picked up by the parent job which calls unity-downloader-cli + - Still used for custom-revision jobs, because we don't want to hold on to expensive compute resources the job itself requires, while waiting for the editor +- Editor pinning: + - Updates editor revisions (`config/_latest_editor_versions_[track].metafile`) on a nightly basis, on the condition that ABV for this editor track passes. This way, if e.g. trunk breaks, it is discovered by the nightly update job (and revisions for this platform won't be updated), and we continue using the latest working revision, until a new working one becomes available. + - There are 3 types of revisions retrieved from _unity-downloader-cli_: `staging` corresponds to `--fast`, `latest_public` corresponds to `--published-only`, and `latest_internal` corresponds to no flags + - There are 2 `merge-all` jobs, which are identical except for triggers and dependencies: + - _[ABV] [CI]_ is the main one used in the CI flow. It is has the branch trigger for versions file, and the dependent merge revision jobs have ABV as dependency (updated revisions only get merged on green ABV) + - _[no ABV] [no CI]_ is the manual counterpart of CI flow. It has no triggers, and it does not have ABV dependencies, i.e. it is essentially a forced push of updated revisions (since no ABV is run, it merges whatever revisions are on ci branch into target, and regenerates ymls based on those). It is useful for either testing the editor pinning, or to force updating the revisions when ABV dependency is seen as blocking. + - Setup on master: + - 2 nightlies, one for trunk and other for 2020.2 (nightlies contain ABV, package pack/test all, and some additional jobs) + - ABV on PRs is triggered for 2020.2 (change under `_abv.metafile` `abv.trigger_editors`) + - Trunk targets latest_internal, 2020.2 targets staging (editor revisions) + - Package publish all (dependencies) run against trunk (change under `_packages.metafile` `publish_all_track`) + - Workflow in short: + - Update job runs nightly on target-branch. It merges target-branch into ci-branch (syncs), gets new revisions for all tracks and pushes these together with updated ymls to ci branch + - Merge job is triggered on changes to editor version files on ci-branch. It runs a merge job per each track, which (if the ABV with updated revisions passes green) pushes the corresponding editor revisions file to target-branch. Once everything is done, it regenerates all ymls based on whichever revisions have reached master branch. + - Workflow in details is on figure below + ![Editor pinning flow](editor_pinning.png) + +- Running editor pinning locally: + - Make sure you have the latest version of unity-downloader-cli + - Update job: `python .yamato\ruamel\editor_pinning\update_revisions.py --target-branch [localbranch] --local` + - _--local_ flag specifies that no git pull/push/commit gets executed + - _--target-branch_ would usually correspond to CI branch, but when running locally, just set it to the one you have checked out locally + - This job updates `_latest_editor_versions.metafile` locally, and also runs `build.py` again to regenerate all ymls with the updated revisions. You can either keep all of the latest revisions, or only the ones you want, and rerun ymls. Once ready, merge like normal PR (i.e. no need to run the merge_revisions job) + - Merge job: `python .yamato\ruamel\editor_pinning\merge_revisions.py --target-branch [targetbranch] --local --revision [git sha] --track [editortrack]` + - _--local_ flag skips checkout/pull of the target branch (but still makes commit on the currently checkout branch, if there is something to commit) + - _--target-branch_ the target branch into which the revisions get merged to from the ci branch (after jobs passed on ci branch, when CI context used). But due to the local flag, this branch won't get checked out/pulled. + - _--revision_ the git SHA of the updated revisions commit (the one made on the ci branch by update job). The job runs `git diff HEAD..[revision] -- [path]`, i.e. diff between the current checked out branch vs that SHA (revision). (The _path_ corresponds to yml files or the latest editor versions metafile, but this is already setup within the job). Therefore the merge job only cares about these two paths, and will not merge other changes. This works, because in general, if merge job gets triggered, then CI branch is 1 commit ahead of target branch (which is the updated revisions commit). + - _--track_ specifies which editor track the merge job runs for (i.e which editor file it aims to merge) + - In general there is no need to run this file locally. It is only handy when wanting to test the script for syntax errors/functionality etc. + + # FAQ - How is Nightly ABV set up (all_project_ci_nightly)? Nightly contains the normal ABV (all_project_ci), smoke tests, plus any additional jobs specified in the _abv.metafile under nightly extra dependencies. - What are smoke tests? Blank Unity projects containing all SRP packages (and default packages) to make sure all packages work with each other - Why does OpenGLCore not have standalone? Because the GPU is simulated and this job is too resource heavy for these machines +- What happens to editor pinning if ABV is red? If ABV is red, then editor pinning merge job fails, i.e. the target branch (on which ABV runs) will not get editor revisions updated automatically. To remedy this, there are 2 merge jobs, one postfixed with \[ABV\] (triggered automatically, dependent on ABV), other with \[manual\] (triggered manually, not dependent on ABV). If editor revisions must be updated despite the red ABV, then the manual job must be triggered. # Configuration files (metafiles) @@ -113,13 +154,48 @@ target_branch: master # target editor version used for this branch target_editor: trunk -# editors applied for all yml files (overridable) (list) +# editors applied for all yml files (overridable) (bunch of examples) editors: - - version: trunk + # run editor pinning for trunk, and set up a recurrent nightly + - track: trunk + name: trunk #name used in job ids + rerun_strategy: on-new-revision + editor_pinning: True #use editor pinning for this track + nightly: True #run the _Nightly job nightly + + # run editor pinning for 2020.2, and set up a recurrent nightly + - track: 2020.2 + name: 2020.2 + rerun_strategy: on-new-revision + editor_pinning: True + nightly: True + + # don't use editor pinning for 2020.2, use --fast flag with editor priming instead. + # trigger ABV on fast-2020.2 on PRs, but disable the recurrent _Nightly job + - track: 2020.2 + name: fast-2020.2 + rerun_strategy: on-new-revision + editor_pinning: False #don't use editor pinning, let it use editor-priming instead + fast: True #use --fast flag (so get the latest built revision) + abv_pr: True #trigger ABV on PRs (so run fast-2020.2 like before editor pinning) + nightly: False #don't run nightly on this editor + + # don't use editor pinning for 2020.2, use editor priming instead + # don't trigger ABV on latest-2020.2 on PRs, and disable the recurrent _Nightly job + - track: 2020.2 + name: latest-2020.2 + rerun_strategy: on-new-revision + editor_pinning: False + fast: False #don't use --fast flag (get the latest possibly not-build revision) + abv_pr: False #dont trigger ABV on PRs for this editor + nightly: False #dont run nightly for this editor + + # run custom revision as usual (editor priming) + - track: CUSTOM-REVISION + name: CUSTOM-REVISION rerun_strategy: always - cmd: -u trunk # used only by editor job - - ... - + editor_pinning: False #custom revision always has editor pinning as false + fast: False #custom revision always has fast as false # specifies platform details for each platform platforms: Win: @@ -216,16 +292,12 @@ non_project_agents: ### _abv.metafile: contains configurations for ABV jobs ``` abv: # all_project_ci (ABV) job configuration - trigger_editors: # editor(s) for which to create a PR trigger - - fast-trunk projects: # projects to include in ABV by calling All_{project} jobs - name: Universal - name: Universal_Stereo - ... nightly: # all_project_ci_nightly job configuration - allowed_editors: # editor(s) for which to create nightly jobs - - trunk extra_dependencies: # project jobs to run in addition to ABV - project: Universal # use this format to run a specific job platform: Android @@ -264,7 +336,8 @@ override_editors: ### _editor.metafile: configuration for editor priming jobs ``` -# all platforms for editor priming jobs +## EDITOR PRIMING +# All platforms for editor priming jobs platforms: # Exhaustive list of operating systems and editor components used by all jobs so the preparation jobs # can make sure all editors are cached on cheap vms before starting the heavy duty machines for running tests @@ -273,13 +346,53 @@ platforms: - name: Win - name: Linux - name: iPhone -agent: cds_ops_ubuntu_small # agent for editor priming, refers to __shared.metafile +editor_priming_agent: cds_ops_ubuntu_small # agent for editor priming + + + +## EDITOR PINNING +editor_pin_agent: package_ci_ubuntu_small # agent for editor pinning + +# Overrides for target and ci branch used for editor pinning (the actual branches are marked in shared metafile) +# This is useful when testing editor pinning on other branches +target_branch_editor_ci: yamato/editor-pin-ci # the branch on which the ci job runs (merge job) +target_branch: yamato/editor-pin # the branch which gets the updated revisions pushed into + + +# Configuration required by update_revisions.py +trunk_track: '2020.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 (e.g. 2020.1, 2020.2 etc) +- trunk + +# Paths relative to the root. Use forward slashes as directory separators. +editor_versions_file: .yamato/config/_latest_editor_versions.metafile +ruamel_build_file: .yamato/ruamel/build.py +yml_files_path: .yamato/*.yml + +# Components to have unity-downloader-cli to trigger. +unity_downloader_components: + windows: + - editor + - il2cpp + macos: + - editor + - il2cpp + linux: + - editor + - il2cpp + android: + - editor + - il2cpp + - android + ios: + - editor + - ios + +versions_file_header: | + # WARNING: This file is automatically generated. + # To add new Unity Editor tracks, the script needs to be updated. + -# optionally to override editors from __shared.metafile -override_editors: - - version: trunk - rerun_strategy: always - cmd: -u trunk ``` diff --git a/.yamato/hdrp-linux-vulkan.yml b/.yamato/hdrp-linux-vulkan.yml index 019a2d60918..90ff89ee4d1 100644 --- a/.yamato/hdrp-linux-vulkan.yml +++ b/.yamato/hdrp-linux-vulkan.yml @@ -11,20 +11,21 @@ HDRP_Linux_Vulkan_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision HDRP_Linux_Vulkan_editmode_2020.1: name: HDRP on Linux_Vulkan_editmode on version 2020.1 agent: @@ -33,20 +34,21 @@ HDRP_Linux_Vulkan_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision HDRP_Linux_Vulkan_Standalone_2020.1: name: HDRP on Linux_Vulkan_Standalone on version 2020.1 agent: @@ -55,20 +57,47 @@ HDRP_Linux_Vulkan_Standalone_2020.1: 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 --output TestProjects/HDRP_RuntimeTests/utr + - chmod +x TestProjects/HDRP_RuntimeTests/utr + - cd TestProjects/HDRP_RuntimeTests && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux rerun: on-new-revision + - path: .yamato/hdrp-linux-vulkan.yml#Build_HDRP_Linux_Vulkan_Player_2020.1 + rerun: on-new-revision + skip_checkout: true +Build_HDRP_Linux_Vulkan_Player_2020.1: + name: Build HDRP on Linux_Vulkan_Player on version 2020.1 + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr - chmod +x TestProjects/HDRP_RuntimeTests/utr - cd TestProjects/HDRP_RuntimeTests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision HDRP_Linux_Vulkan_playmode_fast-2020.1: name: HDRP on Linux_Vulkan_playmode on version fast-2020.1 agent: @@ -77,20 +106,21 @@ HDRP_Linux_Vulkan_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision HDRP_Linux_Vulkan_editmode_fast-2020.1: name: HDRP on Linux_Vulkan_editmode on version fast-2020.1 agent: @@ -99,20 +129,21 @@ HDRP_Linux_Vulkan_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision HDRP_Linux_Vulkan_Standalone_fast-2020.1: name: HDRP on Linux_Vulkan_Standalone on version fast-2020.1 agent: @@ -121,20 +152,47 @@ HDRP_Linux_Vulkan_Standalone_fast-2020.1: 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 --output TestProjects/HDRP_RuntimeTests/utr + - chmod +x TestProjects/HDRP_RuntimeTests/utr + - cd TestProjects/HDRP_RuntimeTests && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision + - path: .yamato/hdrp-linux-vulkan.yml#Build_HDRP_Linux_Vulkan_Player_fast-2020.1 rerun: on-new-revision + skip_checkout: true +Build_HDRP_Linux_Vulkan_Player_fast-2020.1: + name: Build HDRP on Linux_Vulkan_Player on version fast-2020.1 + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr - chmod +x TestProjects/HDRP_RuntimeTests/utr - cd TestProjects/HDRP_RuntimeTests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision HDRP_Linux_Vulkan_playmode_CUSTOM-REVISION: name: HDRP on Linux_Vulkan_playmode on version CUSTOM-REVISION agent: @@ -144,20 +202,21 @@ HDRP_Linux_Vulkan_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always HDRP_Linux_Vulkan_editmode_CUSTOM-REVISION: name: HDRP on Linux_Vulkan_editmode on version CUSTOM-REVISION agent: @@ -167,20 +226,21 @@ HDRP_Linux_Vulkan_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always HDRP_Linux_Vulkan_Standalone_CUSTOM-REVISION: name: HDRP on Linux_Vulkan_Standalone on version CUSTOM-REVISION agent: @@ -190,17 +250,45 @@ HDRP_Linux_Vulkan_Standalone_CUSTOM-REVISION: 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 --output TestProjects/HDRP_RuntimeTests/utr + - chmod +x TestProjects/HDRP_RuntimeTests/utr + - cd TestProjects/HDRP_RuntimeTests && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always + - path: .yamato/hdrp-linux-vulkan.yml#Build_HDRP_Linux_Vulkan_Player_CUSTOM-REVISION rerun: always + skip_checkout: true +Build_HDRP_Linux_Vulkan_Player_CUSTOM-REVISION: + name: Build HDRP on Linux_Vulkan_Player on version CUSTOM-REVISION + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr - chmod +x TestProjects/HDRP_RuntimeTests/utr - cd TestProjects/HDRP_RuntimeTests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/hdrp-osx-metal.yml b/.yamato/hdrp-osx-metal.yml index bb5e27da0e5..924c0bbb075 100644 --- a/.yamato/hdrp-osx-metal.yml +++ b/.yamato/hdrp-osx-metal.yml @@ -11,19 +11,16 @@ HDRP_OSX_Metal_playmode_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ @@ -32,6 +29,10 @@ HDRP_OSX_Metal_playmode_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision HDRP_OSX_Metal_playmode_XR_2020.1: name: HDRP on OSX_Metal_playmode_XR on version 2020.1 agent: @@ -40,19 +41,16 @@ HDRP_OSX_Metal_playmode_XR_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --extra-editor-arg="-xr-tests"" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --reruncount=2 --extra-editor-arg="-xr-tests"" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ @@ -61,35 +59,10 @@ HDRP_OSX_Metal_playmode_XR_2020.1: logs: paths: - "**/test-results/**" -HDRP_OSX_Metal_editmode_2020.1: - name: HDRP on OSX_Metal_editmode on version 2020.1 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + - "TestProjects/HDRP_Tests/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos rerun: on-new-revision - commands: - - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - - chmod +x TestProjects/HDRP_Tests/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - - |5- - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=editor --platform=editmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results" - UTR_RESULT=$? - mkdir -p TestProjects/HDRP_Tests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ - exit $UTR_RESULT - artifacts: - logs: - paths: - - "**/test-results/**" HDRP_OSX_Metal_Standalone_2020.1: name: HDRP on OSX_Metal_Standalone on version 2020.1 agent: @@ -98,19 +71,16 @@ HDRP_OSX_Metal_Standalone_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr - chmod +x TestProjects/HDRP_RuntimeTests/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/HDRP_RuntimeTests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results/ TestProjects/HDRP_RuntimeTests/test-results/ @@ -119,6 +89,10 @@ HDRP_OSX_Metal_Standalone_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision HDRP_OSX_Metal_playmode_fast-2020.1: name: HDRP on OSX_Metal_playmode on version fast-2020.1 agent: @@ -127,19 +101,16 @@ HDRP_OSX_Metal_playmode_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ @@ -148,6 +119,10 @@ HDRP_OSX_Metal_playmode_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision HDRP_OSX_Metal_playmode_XR_fast-2020.1: name: HDRP on OSX_Metal_playmode_XR on version fast-2020.1 agent: @@ -156,19 +131,16 @@ HDRP_OSX_Metal_playmode_XR_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --extra-editor-arg="-xr-tests"" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --reruncount=2 --extra-editor-arg="-xr-tests"" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ @@ -177,35 +149,10 @@ HDRP_OSX_Metal_playmode_XR_fast-2020.1: logs: paths: - "**/test-results/**" -HDRP_OSX_Metal_editmode_fast-2020.1: - name: HDRP on OSX_Metal_editmode on version fast-2020.1 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + - "TestProjects/HDRP_Tests/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos rerun: on-new-revision - commands: - - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - - chmod +x TestProjects/HDRP_Tests/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - - |5- - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=editor --platform=editmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results" - UTR_RESULT=$? - mkdir -p TestProjects/HDRP_Tests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ - exit $UTR_RESULT - artifacts: - logs: - paths: - - "**/test-results/**" HDRP_OSX_Metal_Standalone_fast-2020.1: name: HDRP on OSX_Metal_Standalone on version fast-2020.1 agent: @@ -214,19 +161,16 @@ HDRP_OSX_Metal_Standalone_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr - chmod +x TestProjects/HDRP_RuntimeTests/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/HDRP_RuntimeTests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results/ TestProjects/HDRP_RuntimeTests/test-results/ @@ -235,6 +179,10 @@ HDRP_OSX_Metal_Standalone_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision HDRP_OSX_Metal_playmode_CUSTOM-REVISION: name: HDRP on OSX_Metal_playmode on version CUSTOM-REVISION agent: @@ -244,19 +192,16 @@ HDRP_OSX_Metal_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ @@ -265,6 +210,10 @@ HDRP_OSX_Metal_playmode_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always HDRP_OSX_Metal_playmode_XR_CUSTOM-REVISION: name: HDRP on OSX_Metal_playmode_XR on version CUSTOM-REVISION agent: @@ -274,19 +223,16 @@ HDRP_OSX_Metal_playmode_XR_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --extra-editor-arg="-xr-tests"" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --reruncount=2 --extra-editor-arg="-xr-tests"" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ @@ -295,36 +241,10 @@ HDRP_OSX_Metal_playmode_XR_CUSTOM-REVISION: logs: paths: - "**/test-results/**" -HDRP_OSX_Metal_editmode_CUSTOM-REVISION: - name: HDRP on OSX_Metal_editmode on version CUSTOM-REVISION - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: custom_revision_not_set + - "TestProjects/HDRP_Tests/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos rerun: always - commands: - - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - - chmod +x TestProjects/HDRP_Tests/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - - |5- - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=editor --platform=editmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results" - UTR_RESULT=$? - mkdir -p TestProjects/HDRP_Tests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ - exit $UTR_RESULT - artifacts: - logs: - paths: - - "**/test-results/**" HDRP_OSX_Metal_Standalone_CUSTOM-REVISION: name: HDRP on OSX_Metal_Standalone on version CUSTOM-REVISION agent: @@ -334,19 +254,16 @@ HDRP_OSX_Metal_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr - chmod +x TestProjects/HDRP_RuntimeTests/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/HDRP_RuntimeTests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results/ TestProjects/HDRP_RuntimeTests/test-results/ @@ -355,3 +272,7 @@ HDRP_OSX_Metal_Standalone_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always diff --git a/.yamato/hdrp-win-dx11.yml b/.yamato/hdrp-win-dx11.yml index d914f2fd325..5c30ca31b60 100644 --- a/.yamato/hdrp-win-dx11.yml +++ b/.yamato/hdrp-win-dx11.yml @@ -12,18 +12,19 @@ HDRP_Win_DX11_playmode_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_Win_DX11_playmode_XR_2020.1: name: HDRP on Win_DX11_playmode_XR on version 2020.1 agent: @@ -33,18 +34,19 @@ HDRP_Win_DX11_playmode_XR_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d11" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_Win_DX11_editmode_2020.1: name: HDRP on Win_DX11_editmode on version 2020.1 agent: @@ -53,18 +55,19 @@ HDRP_Win_DX11_editmode_2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_Win_DX11_Standalone_2020.1: name: HDRP on Win_DX11_Standalone on version 2020.1 agent: @@ -74,18 +77,19 @@ HDRP_Win_DX11_Standalone_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/hdrp-win-dx11.yml#Build_HDRP_Win_DX11_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/hdrp-win-dx11.yml#Build_HDRP_Win_DX11_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_HDRP_Win_DX11_Player_2020.1: name: Build HDRP on Win_DX11_Player on version 2020.1 @@ -96,9 +100,6 @@ Build_HDRP_Win_DX11_Player_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -108,9 +109,13 @@ Build_HDRP_Win_DX11_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_Win_DX11_playmode_fast-2020.1: name: HDRP on Win_DX11_playmode on version fast-2020.1 agent: @@ -120,18 +125,19 @@ HDRP_Win_DX11_playmode_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_Win_DX11_playmode_XR_fast-2020.1: name: HDRP on Win_DX11_playmode_XR on version fast-2020.1 agent: @@ -141,18 +147,19 @@ HDRP_Win_DX11_playmode_XR_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d11" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_Win_DX11_editmode_fast-2020.1: name: HDRP on Win_DX11_editmode on version fast-2020.1 agent: @@ -161,18 +168,19 @@ HDRP_Win_DX11_editmode_fast-2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_Win_DX11_Standalone_fast-2020.1: name: HDRP on Win_DX11_Standalone on version fast-2020.1 agent: @@ -182,18 +190,19 @@ HDRP_Win_DX11_Standalone_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/hdrp-win-dx11.yml#Build_HDRP_Win_DX11_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/hdrp-win-dx11.yml#Build_HDRP_Win_DX11_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_HDRP_Win_DX11_Player_fast-2020.1: name: Build HDRP on Win_DX11_Player on version fast-2020.1 @@ -204,9 +213,6 @@ Build_HDRP_Win_DX11_Player_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -216,9 +222,13 @@ Build_HDRP_Win_DX11_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_Win_DX11_playmode_CUSTOM-REVISION: name: HDRP on Win_DX11_playmode on version CUSTOM-REVISION agent: @@ -229,18 +239,19 @@ HDRP_Win_DX11_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION: name: HDRP on Win_DX11_playmode_XR on version CUSTOM-REVISION agent: @@ -251,18 +262,19 @@ HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d11" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always HDRP_Win_DX11_editmode_CUSTOM-REVISION: name: HDRP on Win_DX11_editmode on version CUSTOM-REVISION agent: @@ -272,18 +284,19 @@ HDRP_Win_DX11_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always HDRP_Win_DX11_Standalone_CUSTOM-REVISION: name: HDRP on Win_DX11_Standalone on version CUSTOM-REVISION agent: @@ -294,18 +307,19 @@ HDRP_Win_DX11_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/hdrp-win-dx11.yml#Build_HDRP_Win_DX11_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/hdrp-win-dx11.yml#Build_HDRP_Win_DX11_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_HDRP_Win_DX11_Player_CUSTOM-REVISION: name: Build HDRP on Win_DX11_Player on version CUSTOM-REVISION @@ -317,9 +331,6 @@ Build_HDRP_Win_DX11_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -329,6 +340,10 @@ Build_HDRP_Win_DX11_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/hdrp-win-dx12.yml b/.yamato/hdrp-win-dx12.yml index 8614bb1e1e7..035782823ac 100644 --- a/.yamato/hdrp-win-dx12.yml +++ b/.yamato/hdrp-win-dx12.yml @@ -12,18 +12,19 @@ HDRP_Win_DX12_playmode_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d12" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_Win_DX12_playmode_XR_2020.1: name: HDRP on Win_DX12_playmode_XR on version 2020.1 agent: @@ -33,18 +34,19 @@ HDRP_Win_DX12_playmode_XR_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d12" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d12" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_Win_DX12_editmode_2020.1: name: HDRP on Win_DX12_editmode on version 2020.1 agent: @@ -53,18 +55,19 @@ HDRP_Win_DX12_editmode_2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d12" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_Win_DX12_Standalone_2020.1: name: HDRP on Win_DX12_Standalone on version 2020.1 agent: @@ -74,18 +77,19 @@ HDRP_Win_DX12_Standalone_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/hdrp-win-dx12.yml#Build_HDRP_Win_DX12_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/hdrp-win-dx12.yml#Build_HDRP_Win_DX12_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_HDRP_Win_DX12_Player_2020.1: name: Build HDRP on Win_DX12_Player on version 2020.1 @@ -96,9 +100,6 @@ Build_HDRP_Win_DX12_Player_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -108,9 +109,13 @@ Build_HDRP_Win_DX12_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_Win_DX12_playmode_fast-2020.1: name: HDRP on Win_DX12_playmode on version fast-2020.1 agent: @@ -120,18 +125,19 @@ HDRP_Win_DX12_playmode_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d12" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_Win_DX12_playmode_XR_fast-2020.1: name: HDRP on Win_DX12_playmode_XR on version fast-2020.1 agent: @@ -141,18 +147,19 @@ HDRP_Win_DX12_playmode_XR_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d12" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d12" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_Win_DX12_editmode_fast-2020.1: name: HDRP on Win_DX12_editmode on version fast-2020.1 agent: @@ -161,18 +168,19 @@ HDRP_Win_DX12_editmode_fast-2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d12" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_Win_DX12_Standalone_fast-2020.1: name: HDRP on Win_DX12_Standalone on version fast-2020.1 agent: @@ -182,18 +190,19 @@ HDRP_Win_DX12_Standalone_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/hdrp-win-dx12.yml#Build_HDRP_Win_DX12_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/hdrp-win-dx12.yml#Build_HDRP_Win_DX12_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_HDRP_Win_DX12_Player_fast-2020.1: name: Build HDRP on Win_DX12_Player on version fast-2020.1 @@ -204,9 +213,6 @@ Build_HDRP_Win_DX12_Player_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -216,9 +222,13 @@ Build_HDRP_Win_DX12_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_Win_DX12_playmode_CUSTOM-REVISION: name: HDRP on Win_DX12_playmode on version CUSTOM-REVISION agent: @@ -229,18 +239,19 @@ HDRP_Win_DX12_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d12" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always HDRP_Win_DX12_playmode_XR_CUSTOM-REVISION: name: HDRP on Win_DX12_playmode_XR on version CUSTOM-REVISION agent: @@ -251,18 +262,19 @@ HDRP_Win_DX12_playmode_XR_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d12" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d12" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always HDRP_Win_DX12_editmode_CUSTOM-REVISION: name: HDRP on Win_DX12_editmode on version CUSTOM-REVISION agent: @@ -272,18 +284,19 @@ HDRP_Win_DX12_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d12" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always HDRP_Win_DX12_Standalone_CUSTOM-REVISION: name: HDRP on Win_DX12_Standalone on version CUSTOM-REVISION agent: @@ -294,18 +307,19 @@ HDRP_Win_DX12_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/hdrp-win-dx12.yml#Build_HDRP_Win_DX12_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/hdrp-win-dx12.yml#Build_HDRP_Win_DX12_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_HDRP_Win_DX12_Player_CUSTOM-REVISION: name: Build HDRP on Win_DX12_Player on version CUSTOM-REVISION @@ -317,9 +331,6 @@ Build_HDRP_Win_DX12_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -329,6 +340,10 @@ Build_HDRP_Win_DX12_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/hdrp-win-vulkan.yml b/.yamato/hdrp-win-vulkan.yml index c3b2c6fb50a..dc79720113b 100644 --- a/.yamato/hdrp-win-vulkan.yml +++ b/.yamato/hdrp-win-vulkan.yml @@ -12,18 +12,19 @@ HDRP_Win_Vulkan_playmode_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_Win_Vulkan_playmode_XR_2020.1: name: HDRP on Win_Vulkan_playmode_XR on version 2020.1 agent: @@ -33,18 +34,19 @@ HDRP_Win_Vulkan_playmode_XR_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_Win_Vulkan_editmode_2020.1: name: HDRP on Win_Vulkan_editmode on version 2020.1 agent: @@ -53,18 +55,19 @@ HDRP_Win_Vulkan_editmode_2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_Win_Vulkan_Standalone_2020.1: name: HDRP on Win_Vulkan_Standalone on version 2020.1 agent: @@ -74,18 +77,19 @@ HDRP_Win_Vulkan_Standalone_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/hdrp-win-vulkan.yml#Build_HDRP_Win_Vulkan_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/hdrp-win-vulkan.yml#Build_HDRP_Win_Vulkan_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_HDRP_Win_Vulkan_Player_2020.1: name: Build HDRP on Win_Vulkan_Player on version 2020.1 @@ -96,9 +100,6 @@ Build_HDRP_Win_Vulkan_Player_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -108,9 +109,13 @@ Build_HDRP_Win_Vulkan_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_Win_Vulkan_playmode_fast-2020.1: name: HDRP on Win_Vulkan_playmode on version fast-2020.1 agent: @@ -120,18 +125,19 @@ HDRP_Win_Vulkan_playmode_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_Win_Vulkan_playmode_XR_fast-2020.1: name: HDRP on Win_Vulkan_playmode_XR on version fast-2020.1 agent: @@ -141,18 +147,19 @@ HDRP_Win_Vulkan_playmode_XR_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_Win_Vulkan_editmode_fast-2020.1: name: HDRP on Win_Vulkan_editmode on version fast-2020.1 agent: @@ -161,18 +168,19 @@ HDRP_Win_Vulkan_editmode_fast-2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_Win_Vulkan_Standalone_fast-2020.1: name: HDRP on Win_Vulkan_Standalone on version fast-2020.1 agent: @@ -182,18 +190,19 @@ HDRP_Win_Vulkan_Standalone_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/hdrp-win-vulkan.yml#Build_HDRP_Win_Vulkan_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/hdrp-win-vulkan.yml#Build_HDRP_Win_Vulkan_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_HDRP_Win_Vulkan_Player_fast-2020.1: name: Build HDRP on Win_Vulkan_Player on version fast-2020.1 @@ -204,9 +213,6 @@ Build_HDRP_Win_Vulkan_Player_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -216,9 +222,13 @@ Build_HDRP_Win_Vulkan_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_Win_Vulkan_playmode_CUSTOM-REVISION: name: HDRP on Win_Vulkan_playmode on version CUSTOM-REVISION agent: @@ -229,18 +239,19 @@ HDRP_Win_Vulkan_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always HDRP_Win_Vulkan_playmode_XR_CUSTOM-REVISION: name: HDRP on Win_Vulkan_playmode_XR on version CUSTOM-REVISION agent: @@ -251,18 +262,19 @@ HDRP_Win_Vulkan_playmode_XR_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always HDRP_Win_Vulkan_editmode_CUSTOM-REVISION: name: HDRP on Win_Vulkan_editmode on version CUSTOM-REVISION agent: @@ -272,18 +284,19 @@ HDRP_Win_Vulkan_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always HDRP_Win_Vulkan_Standalone_CUSTOM-REVISION: name: HDRP on Win_Vulkan_Standalone on version CUSTOM-REVISION agent: @@ -294,18 +307,19 @@ HDRP_Win_Vulkan_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/hdrp-win-vulkan.yml#Build_HDRP_Win_Vulkan_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/HDRP_RuntimeTests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/hdrp-win-vulkan.yml#Build_HDRP_Win_Vulkan_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_HDRP_Win_Vulkan_Player_CUSTOM-REVISION: name: Build HDRP on Win_Vulkan_Player on version CUSTOM-REVISION @@ -317,9 +331,6 @@ Build_HDRP_Win_Vulkan_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_RuntimeTests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -329,6 +340,10 @@ Build_HDRP_Win_Vulkan_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_Tests/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/hdrp_dxr-win-dx12.yml b/.yamato/hdrp_dxr-win-dx12.yml index 5396979d187..f3a888da8c2 100644 --- a/.yamato/hdrp_dxr-win-dx12.yml +++ b/.yamato/hdrp_dxr-win-dx12.yml @@ -12,18 +12,19 @@ HDRP_DXR_Win_DX12_Standalone_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/hdrp_dxr-win-dx12.yml#Build_HDRP_DXR_Win_DX12_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_DXR_Tests/utr.bat - - cd TestProjects/HDRP_DXR_Tests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/HDRP_DXR_Tests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_DXR_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/hdrp_dxr-win-dx12.yml#Build_HDRP_DXR_Win_DX12_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_HDRP_DXR_Win_DX12_Player_2020.1: name: Build HDRP_DXR on Win_DX12_Player on version 2020.1 @@ -34,9 +35,6 @@ Build_HDRP_DXR_Win_DX12_Player_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_DXR_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -46,9 +44,13 @@ Build_HDRP_DXR_Win_DX12_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_DXR_Tests/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_DXR_Win_DX12_playmode_2020.1: name: HDRP_DXR on Win_DX12_playmode on version 2020.1 agent: @@ -58,18 +60,19 @@ HDRP_DXR_Win_DX12_playmode_2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_DXR_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_DXR_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_DXR_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + - cd TestProjects/HDRP_DXR_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d12" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_DXR_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision HDRP_DXR_Win_DX12_Standalone_fast-2020.1: name: HDRP_DXR on Win_DX12_Standalone on version fast-2020.1 agent: @@ -79,18 +82,19 @@ HDRP_DXR_Win_DX12_Standalone_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/hdrp_dxr-win-dx12.yml#Build_HDRP_DXR_Win_DX12_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_DXR_Tests/utr.bat - - cd TestProjects/HDRP_DXR_Tests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/HDRP_DXR_Tests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_DXR_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/hdrp_dxr-win-dx12.yml#Build_HDRP_DXR_Win_DX12_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_HDRP_DXR_Win_DX12_Player_fast-2020.1: name: Build HDRP_DXR on Win_DX12_Player on version fast-2020.1 @@ -101,9 +105,6 @@ Build_HDRP_DXR_Win_DX12_Player_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_DXR_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -113,9 +114,13 @@ Build_HDRP_DXR_Win_DX12_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_DXR_Tests/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_DXR_Win_DX12_playmode_fast-2020.1: name: HDRP_DXR on Win_DX12_playmode on version fast-2020.1 agent: @@ -125,18 +130,19 @@ HDRP_DXR_Win_DX12_playmode_fast-2020.1: model: rtx2080 variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_DXR_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_DXR_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_DXR_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + - cd TestProjects/HDRP_DXR_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d12" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_DXR_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision HDRP_DXR_Win_DX12_Standalone_CUSTOM-REVISION: name: HDRP_DXR on Win_DX12_Standalone on version CUSTOM-REVISION agent: @@ -147,18 +153,19 @@ HDRP_DXR_Win_DX12_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/hdrp_dxr-win-dx12.yml#Build_HDRP_DXR_Win_DX12_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_DXR_Tests/utr.bat - - cd TestProjects/HDRP_DXR_Tests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/HDRP_DXR_Tests && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_DXR_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/hdrp_dxr-win-dx12.yml#Build_HDRP_DXR_Win_DX12_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_HDRP_DXR_Win_DX12_Player_CUSTOM-REVISION: name: Build HDRP_DXR on Win_DX12_Player on version CUSTOM-REVISION @@ -170,9 +177,6 @@ Build_HDRP_DXR_Win_DX12_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_DXR_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -182,9 +186,13 @@ Build_HDRP_DXR_Win_DX12_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_DXR_Tests/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always HDRP_DXR_Win_DX12_playmode_CUSTOM-REVISION: name: HDRP_DXR on Win_DX12_playmode on version CUSTOM-REVISION agent: @@ -195,15 +203,16 @@ HDRP_DXR_Win_DX12_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/HDRP_DXR_Tests/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/HDRP_DXR_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_DXR_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + - cd TestProjects/HDRP_DXR_Tests && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d12" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/HDRP_DXR_Tests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/ruamel/build.py b/.yamato/ruamel/build.py index eaff9b72be5..0981c8964db 100644 --- a/.yamato/ruamel/build.py +++ b/.yamato/ruamel/build.py @@ -11,7 +11,7 @@ from jobs.preview_publish.yml_pb import create_preview_publish_ymls from jobs.templates.yml_template import create_template_ymls -root_dir = os.path.dirname(os.path.dirname(os.getcwd())) +root_dir = os.path.dirname(os.path.dirname(os.path.abspath(os.path.dirname(__file__)))) yamato_dir = os.path.join(root_dir,'.yamato') config_dir = os.path.join(yamato_dir,'config') comment = ''' @@ -21,8 +21,9 @@ \n''' shared = {} +latest_editor_versions = {} yml_files = {} - + def yml_load(filepath): with open(filepath) as f: return yaml.load(f) @@ -57,7 +58,7 @@ def add_comments(): def get_metafile(metafile_name, unfold_agents_root_keys=[], unfold_test_platforms_root_keys=[]): metafile = yml_load(metafile_name) - return format_metafile(metafile, shared, unfold_agents_root_keys, unfold_test_platforms_root_keys) + return format_metafile(metafile, shared, latest_editor_versions, unfold_agents_root_keys, unfold_test_platforms_root_keys) if __name__== "__main__": @@ -68,12 +69,17 @@ def get_metafile(metafile_name, unfold_agents_root_keys=[], unfold_test_platform yaml.indent(offset=2, mapping=4, sequence=5) # clear directory from existing yml files, not to have old duplicates etc - old_yml_files = glob.glob(os.path.join(yamato_dir,'**/*.yml'), recursive=True) + old_yml_files = glob.glob(os.path.join(yamato_dir,'*.yml'), recursive=True) for f in old_yml_files: os.remove(f) # read shared file shared = yml_load(os.path.join(config_dir,'__shared.metafile')) + editor_tracks = shared['editors'] + latest_editor_versions = {} + for editor in editor_tracks: + if editor['editor_pinning']: + latest_editor_versions[editor['track']] = yml_load(os.path.join(config_dir,f'_latest_editor_versions_{str(editor["track"])}.metafile')) # create editor print(f'Running: editor') @@ -87,8 +93,7 @@ def get_metafile(metafile_name, unfold_agents_root_keys=[], unfold_test_platform yml_dump_files(create_projectcontext_ymls(package_metafile)) # create abv - print(f'Running: ABV') - abv_metafile = get_metafile(os.path.join(config_dir,'_abv.metafile'), unfold_agents_root_keys=['smoke_test'], unfold_test_platforms_root_keys=['smoke_test']) + abv_metafile = get_metafile(os.path.join(config_dir,'_abv.metafile')) yml_dump_files(create_abv_ymls(abv_metafile)) # create preview publish @@ -114,4 +119,4 @@ def get_metafile(metafile_name, unfold_agents_root_keys=[], unfold_test_platform # # add comments on top of all yml files print(f'Adding comments') - add_comments() + add_comments() \ No newline at end of file diff --git a/.yamato/ruamel/editor_pinning/merge_revisions.py b/.yamato/ruamel/editor_pinning/merge_revisions.py new file mode 100644 index 00000000000..3e2c97642a7 --- /dev/null +++ b/.yamato/ruamel/editor_pinning/merge_revisions.py @@ -0,0 +1,117 @@ +# 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 + +from update_revisions import load_config, DEFAULT_CONFIG_FILE, EXPECTATIONS_PATH +from util.subprocess_helpers import git_cmd, run_cmd + + +def verify_changed_files(editor_versions_file, commit_hash, working_dir): + cmd = ['show', '--pretty=format:', '--name-only', commit_hash] + filenames = git_cmd(cmd, working_dir).strip().replace('\\', '/').split() + + assert editor_versions_file in filenames, f'Cannot find {editor_versions_file} in {filenames}' + filenames.remove(editor_versions_file) + assert all('_latest_editor_versions' in filename or filename.endswith('.yml') for filename in filenames), ( + f'Found other files than {editor_versions_file}, .yml, and expectation files in {filenames}') + + +def checkout_and_pull_branch(branch, working_dir): + git_cmd(f'checkout {branch}', working_dir) + git_cmd('pull', working_dir) + + +def apply_target_revision_changes(editor_versions_file, yml_files_path, commit, working_dir): + """Apply the changes for the .metafile only (since expectations might have conflicts) + Returns: True if any changes were applied, False otherwise. + """ + + def apply_changes(path): + print(f'RUNNING: git diff HEAD..{commit} -- {path}') + diff = git_cmd(f'diff HEAD..{commit} -- {path}') + if len(diff.strip()) > 0: + print('RUNNING: git apply diff.patch') + diff_filename = 'diff.patch' + with open(diff_filename, 'w') as f: + f.write(diff) + git_cmd(f'apply {diff_filename}') + os.remove(diff_filename) + git_cmd(f'add {path}', working_dir) + return True + return False + + changed_editor = apply_changes(editor_versions_file) + #changed_yml = apply_changes(yml_files_path) + + return changed_editor + + +def get_commit_message(git_hash): + return git_cmd(f'log --format=%B -n 1 {git_hash}') + + +def commit_and_push(commit_msg, working_dir, track, development_mode=False): + commit_msg = f'{commit_msg}' + if not development_mode: + git_cmd(['commit', '-m', f'[CI] [{str(track)}] Updated latest editors metafile'], working_dir) + #git_cmd(['commit', '-m', f'[{str(track)}] {commit_msg}'], working_dir) + git_cmd('pull', working_dir) + git_cmd('push', working_dir) + + +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('--config', required=False, default=DEFAULT_CONFIG_FILE, + help=f'Configuration YAML file to use. Default: {DEFAULT_CONFIG_FILE}') + parser.add_argument("--revision", required=True) + parser.add_argument("--track", required=True) + parser.add_argument("--working-dir", required=False, + help='Working directory (optional). If omitted the root ' + 'of the repo will be used.') + parser.add_argument("--target-branch", required=True, + help='The Git branch to merge the changes in the file into.') + args = parser.parse_args(flags) + if not os.path.isfile(args.config): + parser.error(f'Cannot find config file {args.config}') + return args + + +def main(argv): + logging.basicConfig(level=logging.INFO, format='[%(levelname)s] %(message)s') + args = parse_args(argv) + config = load_config(args.config) + editor_versions_file = config['editor_versions_file'].replace('TRACK',str(args.track)) + + try: + working_dir = args.working_dir or os.path.abspath( + git_cmd('rev-parse --show-toplevel', cwd='.').strip()) + if args.local: + logging.warning('\n\n!! DEVELOPMENT MODE: will not switch branch, pull or push !!\n') + logging.info(f'Working directory: {working_dir}') + verify_changed_files(editor_versions_file, args.revision, working_dir) + if not args.local: + checkout_and_pull_branch(args.target_branch, working_dir) + if git_cmd('rev-parse HEAD').strip() == args.revision: + logging.info('No changes compared to current revision. Exiting...') + return 0 + if apply_target_revision_changes(editor_versions_file, config['yml_files_path'], args.revision, working_dir): + commit_msg = get_commit_message(args.revision) + commit_and_push(commit_msg, working_dir, args.track, args.local) + else: + logging.info('No revision changes to merge. 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/ruamel/editor_pinning/update_revisions.py b/.yamato/ruamel/editor_pinning/update_revisions.py new file mode 100644 index 00000000000..d3494f8ded8 --- /dev/null +++ b/.yamato/ruamel/editor_pinning/update_revisions.py @@ -0,0 +1,294 @@ +# Taken from https://github.com/Unity-Technologies/dots/blob/master/Tools/CI/editor_pinning/update_revisions.py + +"""Updates editor versions by calling unity-downloader-cli.""" +import argparse +import logging +import os +import re +import subprocess +import sys +import yaml + +from util.subprocess_helpers import run_cmd, git_cmd + +# These are by convention how the different revisions are categorized. +# These should not be changed unless also updated in Yamato YAML. +SUPPORTED_VERSION_TYPES = ('latest_internal', 'latest_public', 'staging') +PROJECT_VERSION_NAME = 'project_revision' +PLATFORMS = ('windows', 'macos', 'linux', 'android', 'ios') + +SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__)) +# DEFAULT_CONFIG_FILE = os.path.join(SCRIPT_DIR, 'config.yml') +DEFAULT_CONFIG_FILE = os.path.join(os.path.abspath(git_cmd('rev-parse --show-toplevel', cwd='.').strip()),'.yamato','config','_editor.metafile') +EXPECTATIONS_PATH = os.path.join('.yamato', 'expectations') + +INVALID_VERSION_ERROR = 'Are you sure this is actually a valid unity version?' +VERSION_PARSER_RE = re.compile(r'Grabbing unity release ([0-9\.a-z]+) which is revision') + + +def generate_downloader_cmd(track, version, trunk_track, platform, unity_downloader_components): + """Generate a list of commmand arguments for the invovation of the unity-downloader-cli.""" + assert platform in PLATFORMS, f'Unsupported platform: {platform}' + if version == 'staging': + # --fast avoids problems with ongoing builds. If we hit such it will + # return an older build instead, which is fine for us for this tool. + if track == trunk_track or track == 'trunk': + target_str = '-u trunk --fast' + else: + target_str = f'-u {track}/staging --fast' + elif version == 'latest_public': + target_str = f'-u {track} --published-only' + elif version == 'latest_internal': + target_str = f'-u {track}' + else: + raise ValueError(f'Could not parse track: {track} version: {version}.') + components = ' '.join('-c ' + c for c in unity_downloader_components[platform]) + + if platform.lower() == 'android': + platform = 'windows' + elif platform.lower() == 'ios': + platform = 'macos' + + return (f'unity-downloader-cli -o {platform} {components} -s {target_str} ' + '--wait --skip-download').split() + +def create_version_files(config, root): + + + editor_version_files =[] + editor_versions_filename = config['editor_versions_file'] + for track in config['editor_tracks']: + + editor_versions_filename_track = editor_versions_filename.replace('TRACK',str(track)) + editor_versions_file = load_latest_versions_metafile(editor_versions_filename_track) + versions = get_versions_from_unity_downloader([track], config['trunk_track'], config['unity_downloader_components'], editor_versions_file) + print(f'INFO: Saving {editor_versions_filename_track}.') + write_versions_file(os.path.join(root, editor_versions_filename_track), + config['versions_file_header'], + versions) + if versions_file_is_unchanged(editor_versions_filename_track, root): + print(f'INFO: No changes in {editor_versions_filename_track}, or file is not tracked by git diff') + editor_version_files.append(editor_versions_filename_track) + return editor_version_files + + +def get_versions_from_unity_downloader(tracks, trunk_track, unity_downloader_components, editor_versions_file): + """Gets the latest versions for each supported editor track using unity-downloader-cli. + Args: + tracks: Tuple of editor tracks, i.e. 2020.1, 2020.2 + trunk_track: String indicating which track is currently trunk. + unity_downloader_components: Dict containing keys for plaforms mapping to list of + components. + Returns: A dict of version keys where each points to a dict containing three + key-value pairs (one per version_type) containing versions and revisions per each platform, e.g + { + 2020.2_latest_internal: + android: + revision: 3e0d5f775006 + version: 2020.2.0a21 + ios: + revision: 3e0d5f775006 + version: 2020.2.0a21 + linux: + revision: 3e0d5f775006 + version: 2020.2.0a21 + macos: + revision: 3e0d5f775006 + version: 2020.2.0a21 + windows: + revision: 3e0d5f775006 + version: 2020.2.0a21 + } + """ + + # load existing latest_editor_versions + versions = editor_versions_file.get("editor_versions", {}) + + # drop all the keys that don't correspond to specified tracks (useful when different tracks are used between branches) + false_keys = [key for key in versions if key.split('_')[0] not in tracks] + for key in false_keys: del versions[key] + + for track in tracks: # pylint: disable=too-many-nested-blocks + for version_type in SUPPORTED_VERSION_TYPES: + + key = f'{track}_{version_type}' + + if not versions.get(key): + versions[key] = {} + + for platform in PLATFORMS: + try: + + timeout = 120 + result = subprocess.check_output(generate_downloader_cmd(track, version_type, trunk_track, platform, + unity_downloader_components), stderr=subprocess.STDOUT, universal_newlines=True, timeout=timeout, cwd='.') + + revision = result.strip().splitlines()[-1] + versions[key][platform] = {} + versions[key][platform]['revision'] = revision + + # Parse for the version in stderr (only exists for some cases): + versions[key][platform]['version'] = '' + for line in result.strip().splitlines(): + match = VERSION_PARSER_RE.match(line) + version = '' + if match: + version = match.group(1) + versions[key][platform]['version'] = version + break + print(f'INFO: Latest revision for {key} [{platform}]: {revision} (version: {version})') + except subprocess.TimeoutExpired as err: + print(f'WARNING: {key} [{platform}]: Timout {timeout}s exceeded') + + except subprocess.CalledProcessError as err: + # Not great error handling but will hold until there's a better way. + if err.stderr and INVALID_VERSION_ERROR in err.stderr: + print( + f'WARNING: {key} [{platform}]: ' + f'unity-downloader-cli did not find a version for track: {track} ' + f'and version: {version}. This is expected in some cases, e.g. alphas ' + 'that are not public yet.') + else: + print( + f'ERROR: {key} [{platform}] Revision will not be updated (keeping the previously existing one):\n' + f'Failed to run {err.cmd} \nStdout:\n{err.stdout}\nStderr:\n{err.stderr} ') + return versions + + +def get_current_branch(): + return git_cmd("rev-parse --abbrev-ref HEAD").strip() + + +def checkout_and_push(editor_versions_files, yml_files_path, target_branch, root, force_push, + commit_message_details): + original_branch = get_current_branch() + git_cmd(f'checkout -B {target_branch}', cwd=root) + for editor_versions_file in editor_versions_files: + git_cmd(f'add {editor_versions_file}', cwd=root) + git_cmd(f'add {yml_files_path}', cwd=root) + + # Expectations generated if yamato-parser is used: + expectations_dir = os.path.join(root, EXPECTATIONS_PATH) + if os.path.isdir(expectations_dir): + git_cmd(f'add {expectations_dir}', cwd=root) + + cmd = ['commit', '-m', + f'[CI] Updated pinned editor versions \n\n{commit_message_details}'] + git_cmd(cmd, cwd=root) + + cmd = ['push', '--set-upstream', 'origin', target_branch] + if force_push: + assert not (target_branch in ('master', '9.x.x/release','8.x.x/release','7.x.x/release')), ( + 'Error: not allowed to force push to {target_branch}.') + cmd.append('--force') + git_cmd(cmd, cwd=root) + git_cmd(f'checkout {original_branch}', cwd=root) + + +def versions_file_is_unchanged(file_path, root): + diff = git_cmd(f'diff {file_path}', cwd=root).strip() + return len(diff) == 0 + + +def write_versions_file(file_path, header, versions): + with open(file_path, 'w') as output_file: + output_file.write(header + os.linesep) + + # Write editor_version_names list: + editor_version_names = {'editor_version_names': list(versions.keys())} + yaml.dump(editor_version_names, output_file, indent=2) + output_file.write(os.linesep) + + # Write editor_versions dict: + # output_file.write(dict_comment + os.linesep) + editor_version = {'editor_versions': versions} + yaml.dump(editor_version, output_file, indent=2) + +def load_latest_versions_metafile(filename): + try: + with open(filename) as yaml_file: + return yaml.safe_load(yaml_file) + except FileNotFoundError: + return {} + + +def load_config(filename): + with open(filename) as yaml_file: + config = yaml.safe_load(yaml_file) + try: + # Perform validation checks. + assert 'editor_tracks' in config + assert isinstance(config['editor_tracks'], list) + assert 'trunk_track' in config + assert isinstance(config['trunk_track'], str) + assert 'editor_versions_file' in config + assert isinstance(config['editor_versions_file'], str) + + assert 'unity_downloader_components' in config + components = config['unity_downloader_components'] + assert isinstance(components, dict) + assert 'windows' in components + assert 'macos' in components + + assert 'versions_file_header' in config + assert isinstance(config['versions_file_header'], str) + return config + except AssertionError: + print('ERROR: Your configuration file {filename} has an error:') + raise + + +def parse_args(flags): + parser = argparse.ArgumentParser() + parser.add_argument('--local', action='store_true', + help='Running locally skips sanity checks that should be applied on CI') + parser.add_argument('--config', required=False, default=DEFAULT_CONFIG_FILE, + help=f'Configuration YAML file to use. Default: {DEFAULT_CONFIG_FILE}') + parser.add_argument('--target-branch', required=True, + help='Branch to push the updated editor revisions to, should run full ' + + 'CI on commit.') + parser.add_argument('--yamato-parser', required=False, + help='The yamato-parser executable to use (if specified)') + parser.add_argument('--force-push', action='store_true', + help='If --force flag should be used for `git push`.') + parser.add_argument('-v', '--verbose', default=False, action='store_true', required=False, + help='Print verbose output for debugging purposes.') + args = parser.parse_args(flags) + if not os.path.isfile(args.config): + parser.error(f'Cannot find config file {args.config}') + return args + + +def main(argv): + args = parse_args(argv) + if args.verbose: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO, format='[%(levelname)s] %(message)s') + config = load_config(args.config) + + print(f'INFO: Updating editor revisions to the latest found using unity-downloader-cli') + print(f'INFO: Configuration file: {args.config}') + + ROOT = os.path.abspath(git_cmd('rev-parse --show-toplevel', cwd='.').strip()) + + print(f'INFO: Running in {os.path.abspath(os.curdir)}') + # projectversion_filename = os.path.join(ROOT, config['project_version_file']) + # assert os.path.isfile(projectversion_filename), f'Cannot find {projectversion_filename}' + + try: + + editor_version_files = create_version_files(config, ROOT) + subprocess.call(['python', config['ruamel_build_file']]) + if not args.local: + checkout_and_push(editor_version_files, config['yml_files_path'], args.target_branch, ROOT, args.force_push, + 'Updating pinned editor revisions') + print(f'INFO: Done updating editor versions.') + return 0 + except subprocess.CalledProcessError as err: + print(f"ERROR: 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/ruamel/editor_pinning/util/subprocess_helpers.py b/.yamato/ruamel/editor_pinning/util/subprocess_helpers.py new file mode 100644 index 00000000000..14ebe7ef519 --- /dev/null +++ b/.yamato/ruamel/editor_pinning/util/subprocess_helpers.py @@ -0,0 +1,68 @@ +# Taken from https://github.com/Unity-Technologies/dots/blob/master/Tools/CI/util/subprocess_helpers.py + +""" +Helper functions around subprocess +""" +import logging +import subprocess + + +def run_cmd(cmd, cwd=None): + """Runs a command and returns its output as an UTF-8 string. + NOTICE: The output normally ends with a newline that might need to be stripped. + NOTICE: This does not return any stderr if the command succeeds, only on + non-zero exit code when the error is raised. + Args: + cmd: Command line as a string or a list (if any item contains spaces). + cwd: Working directory to run the command in. If omitted the + interpreter's working dir will be used. + Raises: subprocess.CalledProcessError similar to subprocess.check_output. + """ + if isinstance(cmd, str): + cmd = cmd.split() + assert isinstance(cmd, list), 'cmd must be of list type, but was "{}"'.format(type(cmd)) + logging.info(" Running: {0} (cwd: {1})".format(' '.join(cmd), cwd)) + return subprocess.check_output(cmd, cwd=cwd, universal_newlines=True) + + +def npm_cmd(cmd, registry=None, cwd=None): + """Runs a npm command and returns its output as an UTF-8 string. + NOTICE: The command shall not include 'npm', since it will be added. + NOTICE: The output normally ends with a newline that might need to be stripped. + Args: + cmd: Command line as a string or a list (if any item contains spaces). + registry: NPM registry to use, if specified (otherwise default will be used). + cwd: Working directory to run the command in. If omitted the + interpreter's working dir will be used. + Raises: subprocess.CalledProcessError similar to subprocess.check_output. + """ + if isinstance(cmd, str): + cmd = cmd.split() + assert isinstance(cmd, list), 'cmd must be of list type, but was "{}"'.format(type(cmd)) + assert cmd[0] != 'npm', 'Please omit "npm" from the command: {0}'.format(' '.join(cmd)) + commands = ['npm'] + cmd[:] # Use a new list to avoid modifying passed object. + if registry: + commands.append(['--registry', registry]) + logging.info(" Running: {0} (cwd: {1})".format(' '.join(commands), cwd)) + return subprocess.check_output(commands, cwd=cwd, universal_newlines=True, + stderr=subprocess.STDOUT) + + +def git_cmd(cmd, cwd=None): + """Runs a git command and returns its output as an UTF-8 string. + NOTICE: The command shall not include 'git', since it will be added. + NOTICE: The output normally ends with a newline that might need to be stripped. + Args: + cmd: Command line as a string or a list (if any item contains spaces). + cwd: Working directory to run the command in. If omitted the + interpreter's working dir will be used. + Raises: subprocess.CalledProcessError similar to subprocess.check_output. + """ + if isinstance(cmd, str): + cmd = cmd.split() + assert isinstance(cmd, list), 'cmd must be of list type, but was "{}"'.format(type(cmd)) + assert cmd[0] != 'git', 'Please omit "git" from the command: {0}'.format(' '.join(cmd)) + commands = ['git'] + cmd[:] # Use a new list to avoid modifying passed object. + logging.info(" Running: {0} (cwd: {1})".format(' '.join(commands), cwd)) + return subprocess.check_output(commands, cwd=cwd, universal_newlines=True, + stderr=subprocess.STDOUT) \ No newline at end of file diff --git a/.yamato/ruamel/jobs/abv/abv_all_project_ci.py b/.yamato/ruamel/jobs/abv/abv_all_project_ci.py index dd3d3f58846..3a29a6ccb06 100644 --- a/.yamato/ruamel/jobs/abv/abv_all_project_ci.py +++ b/.yamato/ruamel/jobs/abv/abv_all_project_ci.py @@ -4,28 +4,29 @@ class ABV_AllProjectCiJob(): - def __init__(self, editor, projects, abv_trigger_editors, target_branch): - self.job_id = abv_job_id_all_project_ci(editor["version"]) - self.yml = self.get_job_definition(editor, projects, abv_trigger_editors, target_branch).get_yml() + def __init__(self, editor, projects, target_branch): + self.job_id = abv_job_id_all_project_ci(editor["name"]) + self.yml = self.get_job_definition(editor, projects, target_branch).get_yml() - def get_job_definition(self, editor, projects, abv_trigger_editors, target_branch): + def get_job_definition(self, editor, projects, target_branch): # define dependencies dependencies = [{ - 'path': f'{projectcontext_filepath()}#{projectcontext_job_id_test_all(editor["version"])}', - 'rerun': editor["rerun_strategy"]}] + 'path': f'{projectcontext_filepath()}#{projectcontext_job_id_test_all(editor["name"])}', + 'rerun': editor["rerun_strategy"] + }] for project in projects: dependencies.append({ - 'path': f'{project_filepath_all(project["name"])}#{project_job_id_all(project["name"], editor["version"])}', + 'path': f'{project_filepath_all(project["name"])}#{project_job_id_all(project["name"], editor["name"])}', 'rerun': editor["rerun_strategy"]}) # construct job job = YMLJob() - job.set_name(f'_ABV for SRP repository - {editor["version"]}') + job.set_name(f'_ABV for SRP repository - {editor["name"]}') job.add_dependencies(dependencies) - job.add_var_custom_revision(editor["version"]) - if editor['version'] in abv_trigger_editors: + job.add_var_custom_revision(editor["track"]) + if editor.get("abv_pr"): job.set_trigger_on_expression(f'pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND NOT pull_request.push.changes.all match ["**/*.md", "doc/**/*", "**/Documentation*/**/*", ".github/**/*", "Tools/**/*"]') return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py b/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py index 5be3eb2a0a3..60a7e709df8 100644 --- a/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py +++ b/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py @@ -4,40 +4,41 @@ class ABV_AllProjectCiNightlyJob(): - def __init__(self, editor, projects, test_platforms, nightly_config, target_branch): - if editor["version"] not in nightly_config["allowed_editors"]: - raise Exception(f'Tried to construct nightly with PR trigger for version {editor["version"]}') - self.job_id = abv_job_id_all_project_ci_nightly(editor["version"]) - self.yml = self.get_job_definition(editor, projects, test_platforms, nightly_config.get("extra_dependencies",[]), target_branch).get_yml() + def __init__(self, editor, test_platforms, nightly_config, target_branch): + self.job_id = abv_job_id_all_project_ci_nightly(editor["name"]) + self.yml = self.get_job_definition(editor,test_platforms, nightly_config.get("extra_dependencies",[]), target_branch).get_yml() - def get_job_definition(self, editor, projects, test_platforms, extra_dependencies, target_branch): + def get_job_definition(self, editor, test_platforms, extra_dependencies, target_branch): # define dependencies - dependencies = [{ - 'path': f'{abv_filepath()}#{abv_job_id_all_project_ci(editor["version"])}', - 'rerun': editor["rerun_strategy"]}] - - for test_platform in test_platforms: # TODO replace with all_smoke_tests if rerun strategy can override lower level ones - dependencies.append({ - 'path': f'{abv_filepath()}#{abv_job_id_smoke_test(editor["version"],test_platform["name"])}', - 'rerun': editor["rerun_strategy"]}) + dependencies = [ + { + 'path': f'{abv_filepath()}#{abv_job_id_all_project_ci(editor["name"])}', + 'rerun': editor["rerun_strategy"]}, + # Todo: re-add template tests to the nightly once the publishing issue with upm-ci template test is fixed: + # "(There has never been a full release of this package. The major must be 0 or 1.)" + # { + # 'path': f'{templates_filepath()}#{template_job_id_test_all(editor["track"])}', + # 'rerun': editor["rerun_strategy"] + # } + ] for dep in extra_dependencies: if dep.get("all"): dependencies.append({ - 'path': f'{project_filepath_all(dep["project"])}#{project_job_id_all(dep["project"], editor["version"])}', + 'path': f'{project_filepath_all(dep["project"])}#{project_job_id_all(dep["project"], editor["name"])}', 'rerun': editor["rerun_strategy"]}) else: for tp in dep["test_platforms"]: dependencies.append({ - 'path': f'{project_filepath_specific(dep["project"], dep["platform"], dep["api"])}#{project_job_id_test(dep["project"], dep["platform"], dep["api"], tp, editor["version"])}', + 'path': f'{project_filepath_specific(dep["project"], dep["platform"], dep["api"])}#{project_job_id_test(dep["project"], dep["platform"], dep["api"], tp, editor["name"])}', 'rerun': editor["rerun_strategy"]}) # construct job job = YMLJob() - job.set_name(f'_Nightly ABV against { editor["version"] }') + job.set_name(f'_Nightly ABV against { editor["name"] }') job.add_dependencies(dependencies) - job.add_var_custom_revision(editor["version"]) + job.add_var_custom_revision(editor["track"]) job.add_trigger_recurrent(target_branch,'0 * * ?') return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/abv/abv_all_smoke_tests.py b/.yamato/ruamel/jobs/abv/abv_all_smoke_tests.py deleted file mode 100644 index 13f8524b083..00000000000 --- a/.yamato/ruamel/jobs/abv/abv_all_smoke_tests.py +++ /dev/null @@ -1,27 +0,0 @@ -from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss -from ..shared.namer import * -from ..shared.yml_job import YMLJob - -class ABV_AllSmokeTestsJob(): - - def __init__(self, editor, test_platforms): - self.job_id = abv_job_id_all_smoke_tests(editor["version"]) - self.yml = self.get_job_definition(editor, test_platforms).get_yml() - - - def get_job_definition(self,editor, test_platforms): - - # define dependencies - dependencies = [] - for test_platform in test_platforms: - dependencies.append({ - 'path': f'{abv_filepath()}#{abv_job_id_smoke_test(editor["version"],test_platform["name"])}', - 'rerun': editor["rerun_strategy"] - }) - - # construct job - job = YMLJob() - job.set_name(f'All Smoke Tests - {editor["version"]}') - job.add_dependencies(dependencies) - job.add_var_custom_revision(editor["version"]) - return job diff --git a/.yamato/ruamel/jobs/abv/abv_smoke_test.py b/.yamato/ruamel/jobs/abv/abv_smoke_test.py deleted file mode 100644 index f35f3f7eefc..00000000000 --- a/.yamato/ruamel/jobs/abv/abv_smoke_test.py +++ /dev/null @@ -1,46 +0,0 @@ -from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss -from ..shared.namer import * -from ..shared.constants import TEST_PROJECTS_DIR, PATH_UNITY_REVISION, PATH_TEST_RESULTS, UTR_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL -from ..shared.yml_job import YMLJob - -class ABV_SmokeTestJob(): - - def __init__(self, editor, test_platform, smoke_test): - self.job_id = abv_job_id_smoke_test(editor["version"], test_platform["name"]) - self.yml = self.get_job_definition(editor, test_platform, smoke_test).get_yml() - - - def get_job_definition(self, editor, test_platform, smoke_test): - agent = dict(smoke_test["agent"]) - agent_gpu = dict(smoke_test["agent_gpu"]) - - # define dependencies - dependencies = [{ - 'path':f'{editor_filepath()}#{editor_job_id(editor["version"], "windows")}', - 'rerun': editor["rerun_strategy"]}] - - - # define commands - commands = [ - f'curl -s {UTR_INSTALL_URL}.bat --output {TEST_PROJECTS_DIR}/{smoke_test["folder"]}/utr.bat', - f'pip install unity-downloader-cli --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade', - f'cd {TEST_PROJECTS_DIR}/{smoke_test["folder"]} && unity-downloader-cli --source-file ../../{PATH_UNITY_REVISION} -c editor --wait --published-only' ] - if test_platform['name'].lower() == 'standalone': - commands.append(f'cd {TEST_PROJECTS_DIR}/{smoke_test["folder"]} && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path={PATH_TEST_RESULTS} --timeout=1200') - elif test_platform['name'].lower() == 'playmode': - commands.append(f'cd {TEST_PROJECTS_DIR}/{smoke_test["folder"]} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path={PATH_TEST_RESULTS}') - elif test_platform['name'].lower() == 'editmode': - commands.append(f'cd {TEST_PROJECTS_DIR}/{smoke_test["folder"]} && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path={PATH_TEST_RESULTS}') - else: - raise Exception('Unknown testplatform specified') - - # construct job - job = YMLJob() - job.set_name(f'SRP Smoke Test - {test_platform["name"]}_{editor["version"]}') - job.set_agent(agent if test_platform["name"] == 'editmode' else agent_gpu) - job.add_var_upm_registry() - job.add_var_custom_revision(editor["version"]) - job.add_commands(commands) - job.add_dependencies(dependencies) - job.add_artifacts_test_results() - return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/abv/abv_trunk_verification.py b/.yamato/ruamel/jobs/abv/abv_trunk_verification.py index 1c13102a3fa..89f63e7e7be 100644 --- a/.yamato/ruamel/jobs/abv/abv_trunk_verification.py +++ b/.yamato/ruamel/jobs/abv/abv_trunk_verification.py @@ -5,7 +5,7 @@ class ABV_TrunkVerificationJob(): def __init__(self, editor, extra_dependencies): - self.job_id = abv_job_id_trunk_verification(editor["version"]) + self.job_id = abv_job_id_trunk_verification(editor["name"]) self.yml = self.get_job_definition(editor, extra_dependencies).get_yml() @@ -16,17 +16,17 @@ def get_job_definition(self, editor, extra_dependencies): for dep in extra_dependencies: if dep.get("all"): dependencies.append({ - 'path': f'{project_filepath_all(dep["project"])}#{project_job_id_all(dep["project"], editor["version"])}', + 'path': f'{project_filepath_all(dep["project"])}#{project_job_id_all(dep["project"], editor["name"])}', 'rerun': editor["rerun_strategy"]}) else: for tp in dep["test_platforms"]: dependencies.append({ - 'path': f'{project_filepath_specific(dep["project"], dep["platform"], dep["api"])}#{project_job_id_test(dep["project"], dep["platform"], dep["api"], tp, editor["version"])}', + 'path': f'{project_filepath_specific(dep["project"], dep["platform"], dep["api"])}#{project_job_id_test(dep["project"], dep["platform"], dep["api"], tp, editor["name"])}', 'rerun': editor["rerun_strategy"]}) # construct job job = YMLJob() - job.set_name(f'Trunk verification - {editor["version"]}') + job.set_name(f'Trunk verification - {editor["name"]}') job.add_dependencies(dependencies) - job.add_var_custom_revision(editor["version"]) + job.add_var_custom_revision(editor["track"]) return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/abv/yml_abv.py b/.yamato/ruamel/jobs/abv/yml_abv.py index e0e096e52c9..88c4f311a3c 100644 --- a/.yamato/ruamel/jobs/abv/yml_abv.py +++ b/.yamato/ruamel/jobs/abv/yml_abv.py @@ -1,8 +1,6 @@ from ..shared.namer import abv_filepath from jobs.abv.abv_all_project_ci import ABV_AllProjectCiJob from jobs.abv.abv_all_project_ci_nightly import ABV_AllProjectCiNightlyJob -from jobs.abv.abv_all_smoke_tests import ABV_AllSmokeTestsJob -from jobs.abv.abv_smoke_test import ABV_SmokeTestJob from jobs.abv.abv_trunk_verification import ABV_TrunkVerificationJob def create_abv_ymls(metafile): @@ -10,18 +8,11 @@ def create_abv_ymls(metafile): yml = {} for editor in metafile["editors"]: - for test_platform in metafile["smoke_test"]["test_platforms"]: - job = ABV_SmokeTestJob(editor, test_platform, metafile["smoke_test"]) - yml[job.job_id] = job.yml - - job = ABV_AllSmokeTestsJob(editor, metafile["smoke_test"]["test_platforms"]) - yml[job.job_id] = job.yml - - job = ABV_AllProjectCiJob(editor, metafile["abv"]["projects"], metafile["abv"]["trigger_editors"], metafile["target_branch"]) + job = ABV_AllProjectCiJob(editor, metafile["abv"]["projects"],metafile["target_branch"]) yml[job.job_id] = job.yml - if editor["version"] in metafile["nightly"]["allowed_editors"]: - job = ABV_AllProjectCiNightlyJob(editor, metafile["abv"]["projects"], metafile["smoke_test"]["test_platforms"], metafile["nightly"], metafile["target_branch"]) + if editor.get("nightly"): + job = ABV_AllProjectCiNightlyJob(editor, metafile["abv"]["projects"], metafile["nightly"], metafile["target_branch"]) yml[job.job_id] = job.yml job = ABV_TrunkVerificationJob(editor, metafile["trunk_verification"]["dependencies"]) diff --git a/.yamato/ruamel/jobs/editor/editor_pinning_merge_all.py b/.yamato/ruamel/jobs/editor/editor_pinning_merge_all.py new file mode 100644 index 00000000000..35947184352 --- /dev/null +++ b/.yamato/ruamel/jobs/editor/editor_pinning_merge_all.py @@ -0,0 +1,59 @@ +from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss +from ruamel.yaml.scalarstring import PreservedScalarString as pss +from ..shared.namer import * +from ..shared.constants import VAR_UPM_REGISTRY, PATH_UNITY_REVISION +from ..shared.yml_job import YMLJob + +class Editor_PinningMergeAllJob(): + + def __init__(self, editors, agent, target_branch, target_branch_editor_ci, abv): + self.job_id = editor_job_id_merge_all(abv) + self.yml_job = self.get_job_definition(editors, agent, target_branch, target_branch_editor_ci, abv) + self.yml = self.yml_job.get_yml() + + + def get_job_definition(self, editors, agent, target_branch, target_branch_editor_ci, abv): + + + dependencies = [] + for editor in editors: + if not editor['editor_pinning']: + continue + + dependencies.append(f'{editor_pinning_filepath()}#{editor_job_id_merge_revisions(editor["name"], abv)}') + + commands = [ + f'sudo pip3 install pipenv --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple',# Remove when the image has this preinstalled. + f'python3 -m pipenv install --dev', + f'curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -', + f'sudo sh -c "echo \'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main\' > /etc/apt/sources.list.d/unity.list"', + f'sudo apt-get update', + pss(f''' + if [[ "$GIT_BRANCH" != "{target_branch_editor_ci }" ]]; then + echo "Should run on '{ target_branch_editor_ci }' but is running on '$GIT_BRANCH'" + exit 1 + fi'''),# This should never run on anything other than stable. If you try it then it will fail + f'git config --global user.name "noreply@unity3d.com"', # TODO + f'git config --global user.email "noreply@unity3d.com"', # TODO + f'git checkout {target_branch}', + f'git pull', + f'pipenv run python3 .yamato/ruamel/build.py', + f'git add .yamato/*.yml', + f'git commit -m "[CI] Updated .ymls to new revision" --allow-empty', + f'git push' + ] + + # construct job + job = YMLJob() + + if abv: + job.set_name(f'Merge all [ABV] [CI]') + job.set_trigger_on_expression(f'push.branch eq "{target_branch_editor_ci}" AND push.changes.any match "**/_latest_editor_versions*.metafile"') + else: + job.set_name(f'Merge all [no ABV] [no CI]') + + job.set_agent(agent) + job.add_var_custom('CI', True) + job.add_dependencies(dependencies) + job.add_commands(commands) + return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/editor/editor_pinning_merge_revisions.py b/.yamato/ruamel/jobs/editor/editor_pinning_merge_revisions.py new file mode 100644 index 00000000000..8d11dd9fab0 --- /dev/null +++ b/.yamato/ruamel/jobs/editor/editor_pinning_merge_revisions.py @@ -0,0 +1,48 @@ +from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss +from ruamel.yaml.scalarstring import PreservedScalarString as pss +from ..shared.namer import editor_job_id, abv_filepath, abv_job_id_all_project_ci, editor_job_id_merge_revisions +from ..shared.constants import VAR_UPM_REGISTRY, PATH_UNITY_REVISION +from ..shared.yml_job import YMLJob + +class Editor_PinningMergeRevisionsJob(): + + def __init__(self, editor, agent, target_branch, target_branch_editor_ci, abv): + self.job_id = editor_job_id_merge_revisions(editor["name"], abv) + self.yml_job = self.get_job_definition(editor, agent, target_branch, target_branch_editor_ci, abv) + self.yml = self.yml_job.get_yml() + + + def get_job_definition(self, editor, agent, target_branch, target_branch_editor_ci, abv): + + + commands = [ + f'sudo pip3 install pipenv --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple',# Remove when the image has this preinstalled. + f'python3 -m pipenv install --dev', + f'curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -', + f'sudo sh -c "echo \'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main\' > /etc/apt/sources.list.d/unity.list"', + f'sudo apt-get update', + f'sudo apt-get install yamato-parser -y', + pss(f''' + if [[ "$GIT_BRANCH" != "{target_branch_editor_ci }" ]]; then + echo "Should run on '{target_branch_editor_ci}' but is running on '$GIT_BRANCH'" + exit 1 + fi'''),# This should never run on anything other than stable. If you try it then it will fail + f'git config --global user.name "noreply@unity3d.com"', # TODO + f'git config --global user.email "noreply@unity3d.com"', # TODO + f'pipenv run python3 .yamato/ruamel/editor_pinning/merge_revisions.py --revision $GIT_REVISION --target-branch { target_branch } --track {editor["track"]}' + ] + + # construct job + job = YMLJob() + + if abv: + job.set_name(f'Merge [{editor["track"]}] revisions to {target_branch} [ABV]') + job.allow_failure() + job.add_dependencies([f'{abv_filepath()}#{abv_job_id_all_project_ci(editor["name"])}']) + else: + job.set_name(f'Merge [{editor["track"]}] revisions to {target_branch} [no ABV]') + + job.set_agent(agent) + job.add_var_custom('CI', True) + job.add_commands(commands) + return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/editor/editor_pinning_target_to_ci.py b/.yamato/ruamel/jobs/editor/editor_pinning_target_to_ci.py new file mode 100644 index 00000000000..017f8c08307 --- /dev/null +++ b/.yamato/ruamel/jobs/editor/editor_pinning_target_to_ci.py @@ -0,0 +1,40 @@ +from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss +from ruamel.yaml.scalarstring import PreservedScalarString as pss +from ..shared.namer import editor_job_id, abv_filepath, abv_job_id_all_project_ci, editor_job_id_target_to_ci +from ..shared.constants import VAR_UPM_REGISTRY, PATH_UNITY_REVISION +from ..shared.yml_job import YMLJob + +class Editor_PinningTargetToCIJob(): + + def __init__(self, agent, target_branch, target_branch_editor_ci): + self.job_id = editor_job_id_target_to_ci() + self.yml = self.get_job_definition(agent, target_branch, target_branch_editor_ci).get_yml() + + + def get_job_definition(self, agent, target_branch, target_branch_editor_ci): + + + commands = [ + # This should never run on anything other than master or releases. If you try it then it will fail + f'echo $GIT_BRANCH', + pss(f''' + if [[ "$GIT_BRANCH" != "{target_branch }" ]]; then + echo "Should run on '{target_branch}' but is running on '$GIT_BRANCH'" + exit 1 + fi'''), + f'git fetch', + f'git checkout {target_branch}', + f'git checkout {target_branch_editor_ci}', + f'git config --global user.name "noreply@unity3d.com"', + f'git config --global user.email "noreply@unity3d.com"', + f'git merge {target_branch} --no-ff -X theirs', + f'git push' + ] + + # construct job + job = YMLJob() + job.set_name(f'Merge {target_branch} to {target_branch_editor_ci}') + job.set_agent(agent) + job.add_var_custom('CI', True) + job.add_commands(commands) + return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/editor/editor_pinning_update.py b/.yamato/ruamel/jobs/editor/editor_pinning_update.py new file mode 100644 index 00000000000..9b9d9fd5acf --- /dev/null +++ b/.yamato/ruamel/jobs/editor/editor_pinning_update.py @@ -0,0 +1,43 @@ +from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss +from ruamel.yaml.scalarstring import PreservedScalarString as pss + +from ..shared.namer import editor_job_id, editor_job_id_update, editor_pinning_filepath, editor_job_id_target_to_ci +from ..shared.constants import VAR_UPM_REGISTRY, PATH_UNITY_REVISION +from ..shared.yml_job import YMLJob + +class Editor_PinningUpdateJob(): + + def __init__(self, agent, target_branch, target_branch_editor_ci): + self.job_id = editor_job_id_update() + self.yml_job = self.get_job_definition(agent, target_branch, target_branch_editor_ci) + self.yml = self.yml_job.get_yml() + + + def get_job_definition(self, agent, target_branch, target_branch_editor_ci): + + commands = [ + f'sudo pip3 install pipenv --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple',# Remove when the image has this preinstalled. + f'python3 -m pipenv install --dev', + f'curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -', + f'sudo sh -c "echo \'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main\' > /etc/apt/sources.list.d/unity.list"', + f'sudo apt-get update', + f'sudo apt-get install yamato-parser -y', + pss(f''' + if [[ "$GIT_BRANCH" != "{target_branch }" ]]; then + echo "Should run on '{ target_branch }' but is running on '$GIT_BRANCH'" + exit 1 + fi'''),# This should never run on anything other than stable. If you try it then it will fail + f'git config --global user.name "noreply@unity3d.com"', # TODO + f'git config --global user.email "noreply@unity3d.com"', # TODO + f'pipenv run python3 .yamato/ruamel/editor_pinning/update_revisions.py --target-branch { target_branch_editor_ci } --force-push' + ] + + # construct job + job = YMLJob() + job.set_name(f'Update pinned editor versions') + job.set_agent(agent) + job.add_var_custom('CI', True) + job.add_commands(commands) + job.add_dependencies([f'{editor_pinning_filepath()}#{editor_job_id_target_to_ci()}']) #TODO toggle + job.add_trigger_recurrent(target_branch, '0 * * ?') # TODO uncomment + return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/editor/editor.py b/.yamato/ruamel/jobs/editor/editor_priming.py similarity index 65% rename from .yamato/ruamel/jobs/editor/editor.py rename to .yamato/ruamel/jobs/editor/editor_priming.py index e04d64962f9..42bf7214536 100644 --- a/.yamato/ruamel/jobs/editor/editor.py +++ b/.yamato/ruamel/jobs/editor/editor_priming.py @@ -1,12 +1,12 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss from ..shared.namer import editor_job_id -from ..shared.constants import VAR_UPM_REGISTRY, PATH_UNITY_REVISION, UNITY_DOWNLOADER_CLI_URL +from ..shared.constants import VAR_UPM_REGISTRY, PATH_UNITY_REVISION, UNITY_DOWNLOADER_CLI_URL, VAR_CUSTOM_REVISION from ..shared.yml_job import YMLJob class Editor_PrimingJob(): def __init__(self, platform, editor, agent): - self.job_id = editor_job_id(editor["version"], platform["os"]) + self.job_id = editor_job_id(editor["name"], platform["os"]) self.yml = self.get_job_definition(platform, editor, agent).get_yml() @@ -21,18 +21,27 @@ def get_job_definition(self, platform, editor, agent): else: platform_os = platform["os"] + if str(editor['track']).lower()=='custom-revision': + editor_cli_rev = VAR_CUSTOM_REVISION + else: + editor_cli_rev = str(editor["track"]) + if editor.get('fast'): + editor_cli_rev += " --fast" + + + # construct job job = YMLJob() - job.set_name(f'[{editor["version"]},{platform["os"]}] Editor priming') + job.set_name(f'[{editor["name"]},{platform["os"]}] Editor priming') job.set_agent(agent) job.set_skip_checkout(True) job.add_var_custom('PATH', '/home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin') job.add_var_custom('DISPLAY', dss(":0")) job.add_var_upm_registry() - job.add_var_custom_revision(editor["version"]) + job.add_var_custom_revision(editor["track"]) job.add_commands([ f'pip install unity-downloader-cli --user --upgrade --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade', - f'unity-downloader-cli {editor["cmd"]} -o {platform_os} --wait --skip-download {"".join([f"-c {c} " for c in components])} > {PATH_UNITY_REVISION}']) + f'unity-downloader-cli -u {editor_cli_rev} -o {platform_os} --wait --skip-download {"".join([f"-c {c} " for c in components])} > {PATH_UNITY_REVISION}']) job.add_artifacts_unity_revision() return job diff --git a/.yamato/ruamel/jobs/editor/editor_priming_min_editor.py b/.yamato/ruamel/jobs/editor/editor_priming_min_editor.py index c3da597b085..68fd88c3cbf 100644 --- a/.yamato/ruamel/jobs/editor/editor_priming_min_editor.py +++ b/.yamato/ruamel/jobs/editor/editor_priming_min_editor.py @@ -1,6 +1,6 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss from ..shared.namer import * -from ..shared.constants import VAR_UPM_REGISTRY, PATH_UNITY_REVISION, UNITY_DOWNLOADER_CLI_URL +from ..shared.constants import VAR_UPM_REGISTRY, PATH_UNITY_REVISION, UNITY_DOWNLOADER_CLI_URL, VAR_CUSTOM_REVISION from ..shared.yml_job import YMLJob class Editor_PrimingMinEditorJob(): diff --git a/.yamato/ruamel/jobs/editor/yml_editor.py b/.yamato/ruamel/jobs/editor/yml_editor.py index bd508a6b4f0..e438d06634d 100644 --- a/.yamato/ruamel/jobs/editor/yml_editor.py +++ b/.yamato/ruamel/jobs/editor/yml_editor.py @@ -1,19 +1,67 @@ -from .editor import Editor_PrimingJob -from ..shared.namer import editor_filepath + +from .editor_priming import Editor_PrimingJob +from .editor_pinning_merge_all import Editor_PinningMergeAllJob from .editor_priming_min_editor import Editor_PrimingMinEditorJob +from .editor_pinning_merge_revisions import Editor_PinningMergeRevisionsJob +from .editor_pinning_target_to_ci import Editor_PinningTargetToCIJob +from .editor_pinning_update import Editor_PinningUpdateJob +from ..shared.namer import editor_priming_filepath, editor_pinning_filepath def create_editor_yml(metafile): yml_files = {} + #### editor priming jobs yml = {} for platform in metafile["platforms"]: for editor in metafile['editors']: - job = Editor_PrimingJob(platform, editor, metafile["agent"]) + # only create editor priming jobs for editor configs which dont use editor_pinning: + # creating them causes no harm, but we just may end up with priming jobs with exactly the same content but different id, causing confusion of what's the difference + if editor['editor_pinning']: + continue + + job = Editor_PrimingJob(platform, editor, metafile["editor_priming_agent"]) yml[job.job_id] = job.yml - job = Editor_PrimingMinEditorJob(platform, metafile["agent"]) + job = Editor_PrimingMinEditorJob(platform, metafile["editor_priming_agent"]) + yml[job.job_id] = job.yml + + yml_files[editor_priming_filepath()] = yml + + + #### editor pinning jobs + if any([editor['editor_pinning'] for editor in metafile['editors']]): # only enter this if there exists an track that needs editor pinning + + yml = {} + + # sync job + job = Editor_PinningTargetToCIJob(metafile["editor_pin_agent"], metafile["target_branch"], metafile["target_branch_editor_ci"]) + yml[job.job_id] = job.yml + + job = Editor_PinningUpdateJob(metafile["editor_pin_agent"], metafile["target_branch"], metafile["target_branch_editor_ci"]) yml[job.job_id] = job.yml - yml_files[editor_filepath()] = yml + for editor in metafile['editors']: + if not editor['editor_pinning']: + continue + + # no ci/abv + job = Editor_PinningMergeRevisionsJob(editor, metafile["editor_pin_agent"], metafile["target_branch"], metafile["target_branch_editor_ci"], abv=False) + yml[job.job_id] = job.yml + + # ci + abv flow + job = Editor_PinningMergeRevisionsJob(editor, metafile["editor_pin_agent"], metafile["target_branch"], metafile["target_branch_editor_ci"], abv=True) + yml[job.job_id] = job.yml + + # no ci/abv + job = Editor_PinningMergeAllJob(metafile['editors'], metafile["editor_pin_agent"], metafile["target_branch"], metafile["target_branch_editor_ci"], abv=False) + yml[job.job_id] = job.yml + + # ci + abv + job = Editor_PinningMergeAllJob(metafile['editors'], metafile["editor_pin_agent"], metafile["target_branch"], metafile["target_branch_editor_ci"], abv=True) + yml[job.job_id] = job.yml + + yml_files[editor_pinning_filepath()] = yml + + return yml_files \ No newline at end of file diff --git a/.yamato/ruamel/jobs/packages/package_publish.py b/.yamato/ruamel/jobs/packages/package_publish.py index 0218a61a9a5..17b215cfdab 100644 --- a/.yamato/ruamel/jobs/packages/package_publish.py +++ b/.yamato/ruamel/jobs/packages/package_publish.py @@ -5,17 +5,18 @@ class Package_PublishJob(): - def __init__(self, package, agent, platforms, target_editor): + def __init__(self, package, agent, platforms, editor_tracks): self.package_id = package["id"] self.job_id = package_job_id_publish(package["id"]) - self.yml = self.get_job_definition(package, agent, platforms, target_editor).get_yml() + self.yml = self.get_job_definition(package, agent, platforms, editor_tracks).get_yml() - def get_job_definition(self, package, agent, platforms, target_editor): + def get_job_definition(self, package, agent, platforms, editor_tracks): # define dependencies dependencies = [f'{packages_filepath()}#{package_job_id_pack(package["id"])}'] - dependencies.extend([f'{packages_filepath()}#{package_job_id_test(package["id"], platform["os"], target_editor)}' for platform in platforms]) + for editor_track in editor_tracks: + dependencies.extend([f'{packages_filepath()}#{package_job_id_test(package["id"], platform["os"], editor_track)}' for platform in platforms]) # construct job job = YMLJob() diff --git a/.yamato/ruamel/jobs/packages/package_publish_all.py b/.yamato/ruamel/jobs/packages/package_publish_all_tag.py similarity index 75% rename from .yamato/ruamel/jobs/packages/package_publish_all.py rename to .yamato/ruamel/jobs/packages/package_publish_all_tag.py index df1a871dc1b..5d0b8ba410e 100644 --- a/.yamato/ruamel/jobs/packages/package_publish_all.py +++ b/.yamato/ruamel/jobs/packages/package_publish_all_tag.py @@ -1,28 +1,23 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss -from ..shared.namer import packages_filepath, package_job_id_publish, package_job_id_publish_all +from ..shared.namer import packages_filepath, package_job_id_publish, package_job_id_publish_all_tag from ..shared.yml_job import YMLJob -class Package_PublishAllJob(): + +class Package_PublishAllTagJob(): def __init__(self, packages, target_branch, agent): - self.job_id = package_job_id_publish_all() + self.job_id = package_job_id_publish_all_tag() self.yml = self.get_job_definition(packages, target_branch, agent).get_yml() def get_job_definition(self, packages, target_branch, agent): - - # construct job + job = YMLJob() - job.set_name(f'Publish all packages') + job.set_name(f'Publish all packages [package context][manual][tag]') job.set_agent(agent) job.add_dependencies([f'{packages_filepath()}#{package_job_id_publish(package["id"])}' for package in packages]) job.add_commands([ f'git tag v$(cd com.unity.render-pipelines.core && node -e "console.log(require(\'./package.json\').version)")', f'git push origin --tags']) - #job.add_trigger_recurrent(target_branch, 'daily') return job - - - - \ No newline at end of file diff --git a/.yamato/ruamel/jobs/packages/package_publish_dry.py b/.yamato/ruamel/jobs/packages/package_publish_dry.py index 0c267b93c32..e1c70ef9f94 100644 --- a/.yamato/ruamel/jobs/packages/package_publish_dry.py +++ b/.yamato/ruamel/jobs/packages/package_publish_dry.py @@ -7,15 +7,15 @@ class Package_PublishDryJob(): - def __init__(self, package, agent, platforms, target_editor): + def __init__(self, package, agent, platforms, editor_tracks): self.package_id = package["id"] self.job_id = package_job_id_publish_dry(package["id"]) - self.yml = self.get_job_definition(package, agent, platforms, target_editor) + self.yml = self.get_job_definition(package, agent, platforms, editor_tracks) - def get_job_definition(self, package, agent, platforms, target_editor): + def get_job_definition(self, package, agent, platforms, editor_tracks): - job = Package_PublishJob(package, agent, platforms, target_editor) + job = Package_PublishJob(package, agent, platforms, editor_tracks) job.yml['commands'][-1] += ' --dry-run' job.yml['name'] += ' [dry run]' diff --git a/.yamato/ruamel/jobs/packages/package_test.py b/.yamato/ruamel/jobs/packages/package_test.py index a4b319f2262..b0c3d7c78d9 100644 --- a/.yamato/ruamel/jobs/packages/package_test.py +++ b/.yamato/ruamel/jobs/packages/package_test.py @@ -1,6 +1,6 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss from ..shared.namer import * -from ..shared.constants import PATH_UNITY_REVISION, NPM_UPMCI_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL,PATH_PACKAGES_temp +from ..shared.constants import PATH_UNITY_REVISION, NPM_UPMCI_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL, PATH_PACKAGES_temp, get_unity_downloader_cli_cmd from ..shared.yml_job import YMLJob @@ -8,22 +8,22 @@ class Package_TestJob(): def __init__(self, package, platform, editor): self.package_id = package["id"] - self.job_id = package_job_id_test(package["id"],platform["os"],editor["version"]) + self.job_id = package_job_id_test(package["id"],platform["os"],editor["name"]) self.yml = self.get_job_definition(package,platform, editor).get_yml() def get_job_definition(self, package, platform, editor): # define dependencies - dependencies = [f'{editor_filepath()}#{editor_job_id(editor["version"], platform["os"]) }'] - dependencies.extend([f'{packages_filepath()}#{package_job_id_pack(dep)}' for dep in package["dependencies"]]) - - + dependencies = [f'{packages_filepath()}#{package_job_id_pack(dep)}' for dep in package["dependencies"]] + if not editor['editor_pinning']: + dependencies.extend([f'{editor_priming_filepath()}#{editor_job_id(editor["name"], platform["os"]) }']) + # define commands commands = [ f'npm install upm-ci-utils@stable -g --registry {NPM_UPMCI_INSTALL_URL}', f'pip install unity-downloader-cli --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade', - f'unity-downloader-cli --source-file {PATH_UNITY_REVISION} -c editor --wait --published-only'] + f'unity-downloader-cli {get_unity_downloader_cli_cmd(editor,platform["os"])} -c editor --wait --published-only'] if platform["os"].lower() == 'windows': commands.append(f'mkdir upm-ci~\\packages') commands.append(f'copy {PATH_PACKAGES_temp}\\{package["id"]}\\upm-ci~\\packages\\packages.json upm-ci~\\packages') @@ -40,11 +40,12 @@ def get_job_definition(self, package, platform, editor): # construct job job = YMLJob() - job.set_name(f'Test { package["name"] } {platform["name"]} {editor["version"]}') + job.set_name(f'Test { package["name"] } {platform["name"]} {editor["name"]}') job.set_agent(platform['agent_package']) job.add_dependencies(dependencies) job.add_commands(commands) job.add_artifacts_test_results() + job.add_var_custom_revision(editor["track"]) return job diff --git a/.yamato/ruamel/jobs/packages/package_test_all.py b/.yamato/ruamel/jobs/packages/package_test_all.py index 9dfbf3fe764..5d86b6ac0dd 100644 --- a/.yamato/ruamel/jobs/packages/package_test_all.py +++ b/.yamato/ruamel/jobs/packages/package_test_all.py @@ -6,32 +6,30 @@ class Package_AllPackageCiJob(): - def __init__(self, packages, agent, platforms, editor): - self.job_id = package_job_id_test_all(editor["version"]) - self.yml = self.get_job_definition(packages, agent, platforms, editor).get_yml() + def __init__(self, packages, agent, platforms, target_branch, editor): + self.job_id = package_job_id_test_all(editor["name"]) + self.yml = self.get_job_definition(packages, agent, platforms, target_branch, editor).get_yml() - def get_job_definition(self, packages, agent, platforms, editor): + def get_job_definition(self, packages, agent, platforms, target_branch, editor): # define dependencies dependencies = [] for platform in platforms: for package in packages: - dependencies.append(f'{packages_filepath()}#{package_job_id_test(package["id"],platform["os"],editor["version"])}') - #dependencies.append(f'{packages_filepath()}#{package_job_id_test_dependencies(package["id"],platform["os"],editor["version"])}') + dependencies.append(f'{packages_filepath()}#{package_job_id_test(package["id"],platform["os"],editor["name"])}') + #dependencies.append(f'{packages_filepath()}#{package_job_id_test_dependencies(package["id"],platform["os"],editor["track"])}') # construct job job = YMLJob() - job.set_name(f'Pack and test all packages - { editor["version"] }') + job.set_name(f'Pack and test all packages - { editor["name"] } [package context]') job.set_agent(agent) job.add_dependencies(dependencies) + job.add_var_custom_revision(editor["track"]) job.add_commands([ f'npm install upm-ci-utils@stable -g --registry {NPM_UPMCI_INSTALL_URL}', f'upm-ci package izon -t', f'upm-ci package izon -d']) - # if editor['version'] == f'fast-{target_editor}': - # # trigger the job when updating the docs to avoid merging jpg images (this is not allowed by the package validation suite) - # job.set_trigger_on_expression(f'pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.any match ["**/Documentation*/**/*"]') return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/packages/package_test_dependencies.py b/.yamato/ruamel/jobs/packages/package_test_dependencies.py index bb0a7780e87..97c40e6e221 100644 --- a/.yamato/ruamel/jobs/packages/package_test_dependencies.py +++ b/.yamato/ruamel/jobs/packages/package_test_dependencies.py @@ -1,30 +1,29 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss from ..shared.namer import * -from ..shared.constants import PATH_UNITY_REVISION, NPM_UPMCI_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL +from ..shared.constants import PATH_UNITY_REVISION, NPM_UPMCI_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL, get_unity_downloader_cli_cmd from ..shared.yml_job import YMLJob class Package_TestDependenciesJob(): def __init__(self, package, platform, editor): self.package_id = package["id"] - self.job_id = package_job_id_test_dependencies(package["id"],platform["os"],editor["version"]) + self.job_id = package_job_id_test_dependencies(package["id"],platform["os"],editor["name"]) self.yml = self.get_job_definition(package,platform, editor).get_yml() def get_job_definition(yml, package, platform, editor): # define dependencies - dependencies = [ - f'{editor_filepath()}#{editor_job_id(editor["version"], platform["os"]) }', - f'{packages_filepath()}#{package_job_id_test(package["id"],platform["os"],editor["version"])}'] + dependencies = [f'{packages_filepath()}#{package_job_id_test(package["id"],platform["os"],editor["name"])}'] dependencies.extend([f'{packages_filepath()}#{package_job_id_pack(dep)}' for dep in package["dependencies"]]) - + if not editor["editor_pinning"]: + dependencies.extend([f'{editor_priming_filepath()}#{editor_job_id(editor["name"], platform["os"]) }']) # define commands commands = [ f'npm install upm-ci-utils@stable -g --registry {NPM_UPMCI_INSTALL_URL}', f'pip install unity-downloader-cli --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade', - f'unity-downloader-cli --source-file {PATH_UNITY_REVISION} -c editor --wait --published-only'] + f'unity-downloader-cli { get_unity_downloader_cli_cmd(editor, platform["os"]) } -c editor --wait --published-only'] if package.get('hascodependencies', None) is not None: if platform["os"].lower() == 'windows': commands.append(f'mkdir upm-ci~\\packages') @@ -40,7 +39,7 @@ def get_job_definition(yml, package, platform, editor): # construct job job = YMLJob() - job.set_name(f'Test { package["name"] } {platform["name"]} {editor["version"]} - dependencies') + job.set_name(f'Test { package["name"] } {platform["name"]} {editor["name"]} - dependencies') job.set_agent(platform['agent_package']) job.add_dependencies(dependencies) job.add_commands(commands) diff --git a/.yamato/ruamel/jobs/packages/project_publish.py b/.yamato/ruamel/jobs/packages/project_publish.py index 9916bb85946..37590d74ff4 100644 --- a/.yamato/ruamel/jobs/packages/project_publish.py +++ b/.yamato/ruamel/jobs/packages/project_publish.py @@ -5,17 +5,18 @@ class Project_PublishJob(): - def __init__(self, package, agent, platforms, target_editor): + def __init__(self, package, agent, platforms, editor_tracks): self.package_id = package["id"] self.job_id = projectcontext_job_id_publish(package["id"]) - self.yml = self.get_job_definition(package, agent, platforms, target_editor).get_yml() + self.yml = self.get_job_definition(package, agent, platforms, editor_tracks).get_yml() - def get_job_definition(self, package, agent, platforms, target_editor): + def get_job_definition(self, package, agent, platforms, editor_tracks): # define dependencies dependencies = [f'{projectcontext_filepath()}#{projectcontext_job_id_pack()}'] - dependencies.extend([f'{projectcontext_filepath()}#{projectcontext_job_id_test(platform["os"], target_editor)}' for platform in platforms]) + for editor_track in editor_tracks: + dependencies.extend([f'{projectcontext_filepath()}#{projectcontext_job_id_test(platform["os"], editor_track)}' for platform in platforms]) # construct job job = YMLJob() diff --git a/.yamato/ruamel/jobs/packages/project_publish_all.py b/.yamato/ruamel/jobs/packages/project_publish_all_tag.py similarity index 75% rename from .yamato/ruamel/jobs/packages/project_publish_all.py rename to .yamato/ruamel/jobs/packages/project_publish_all_tag.py index 3d7d4b663ff..e8a45c5bf03 100644 --- a/.yamato/ruamel/jobs/packages/project_publish_all.py +++ b/.yamato/ruamel/jobs/packages/project_publish_all_tag.py @@ -1,11 +1,11 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss -from ..shared.namer import projectcontext_filepath, projectcontext_job_id_publish, projectcontext_job_id_publish_all +from ..shared.namer import projectcontext_filepath, projectcontext_job_id_publish, projectcontext_job_id_publish_all_tag from ..shared.yml_job import YMLJob -class Project_PublishAllJob(): +class Project_PublishAllTagJob(): def __init__(self, packages, target_branch, agent): - self.job_id = projectcontext_job_id_publish_all() + self.job_id = projectcontext_job_id_publish_all_tag() self.yml = self.get_job_definition(packages, target_branch, agent).get_yml() @@ -13,13 +13,12 @@ def get_job_definition(self, packages, target_branch, agent): # construct job job = YMLJob() - job.set_name(f'Publish all packages [project context]') + job.set_name(f'Publish all packages [project context][manual][tag]') job.set_agent(agent) job.add_dependencies([f'{projectcontext_filepath()}#{projectcontext_job_id_publish(package["id"])}' for package in packages]) job.add_commands([ f'git tag v$(cd com.unity.render-pipelines.core && node -e "console.log(require(\'./package.json\').version)")', f'git push origin --tags']) - #job.add_trigger_recurrent(target_branch, 'daily') return job diff --git a/.yamato/ruamel/jobs/packages/project_publish_dry.py b/.yamato/ruamel/jobs/packages/project_publish_dry.py index c16dd4f09eb..d5b6b1b155a 100644 --- a/.yamato/ruamel/jobs/packages/project_publish_dry.py +++ b/.yamato/ruamel/jobs/packages/project_publish_dry.py @@ -6,15 +6,15 @@ class Project_PublishJob_DryRun(): - def __init__(self, package, agent, platforms, target_editor): + def __init__(self, package, agent, platforms, editor_tracks): self.package_id = package["id"] self.job_id = projectcontext_job_id_publish_dry(package["id"]) - self.yml = self.get_job_definition(package, agent, platforms, target_editor) + self.yml = self.get_job_definition(package, agent, platforms, editor_tracks) - def get_job_definition(self, package, agent, platforms, target_editor): + def get_job_definition(self, package, agent, platforms, editor_tracks): - job = Project_PublishJob(package, agent, platforms, target_editor) + job = Project_PublishJob(package, agent, platforms, editor_tracks) job.yml['commands'][-1] += ' --dry-run' job.yml['name'] += ' [dry run]' diff --git a/.yamato/ruamel/jobs/packages/project_test.py b/.yamato/ruamel/jobs/packages/project_test.py index 508192199d9..1fe36973092 100644 --- a/.yamato/ruamel/jobs/packages/project_test.py +++ b/.yamato/ruamel/jobs/packages/project_test.py @@ -1,38 +1,38 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss from ..shared.namer import * -from ..shared.constants import PATH_UNITY_REVISION +from ..shared.constants import PATH_UNITY_REVISION, get_editor_revision, NPM_UPMCI_INSTALL_URL, get_unity_downloader_cli_cmd from ..shared.yml_job import YMLJob -from ..shared.constants import NPM_UPMCI_INSTALL_URL class Project_TestJob(): def __init__(self, platform, editor): - self.job_id = projectcontext_job_id_test(platform["os"],editor["version"]) + self.job_id = projectcontext_job_id_test(platform["os"],editor["name"]) self.yml = self.get_job_definition(platform, editor).get_yml() def get_job_definition(self, platform, editor): # define dependencies - dependencies = [f'{editor_filepath()}#{editor_job_id(editor["version"], platform["os"]) }'] - dependencies.extend([f'{projectcontext_filepath()}#{projectcontext_job_id_pack()}']) - - + dependencies = [f'{projectcontext_filepath()}#{projectcontext_job_id_pack()}'] + if not editor['editor_pinning']: + dependencies.extend([f'{editor_priming_filepath()}#{editor_job_id(editor["name"], platform["os"]) }']) + # define commands commands = [ f'npm install upm-ci-utils@stable -g --registry {NPM_UPMCI_INSTALL_URL}', f'pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade', - f'unity-downloader-cli --source-file {PATH_UNITY_REVISION} -c editor --wait --published-only'] + f'unity-downloader-cli {get_unity_downloader_cli_cmd(editor,platform["os"])} -c editor --wait --published-only'] commands.append(f'upm-ci project test -u {platform["editorpath"]} --project-path TestProjects/SRP_SmokeTest --type vetting-tests') # construct job job = YMLJob() - job.set_name(f'Test all packages [project context] {platform["name"]} {editor["version"]}') + job.set_name(f'Test all packages [project context] {platform["name"]} {editor["name"]}') job.set_agent(platform['agent_package']) job.add_dependencies(dependencies) job.add_commands(commands) job.add_artifacts_test_results() + job.add_var_custom_revision(editor["track"]) return job diff --git a/.yamato/ruamel/jobs/packages/project_test_all.py b/.yamato/ruamel/jobs/packages/project_test_all.py index 95f9f8a8936..07b0a18f9bb 100644 --- a/.yamato/ruamel/jobs/packages/project_test_all.py +++ b/.yamato/ruamel/jobs/packages/project_test_all.py @@ -6,31 +6,31 @@ class Project_AllPackageCiJob(): - def __init__(self, packages, agent, platforms, target_editor, target_branch, editor): - self.job_id = projectcontext_job_id_test_all(editor["version"]) - self.yml = self.get_job_definition(packages, agent, platforms, target_editor, target_branch, editor).get_yml() + def __init__(self, packages, agent, platforms, target_branch, editor): + self.job_id = projectcontext_job_id_test_all(editor["name"]) + self.yml = self.get_job_definition(packages, agent, platforms, target_branch, editor).get_yml() - def get_job_definition(self, packages, agent, platforms, target_editor, target_branch, editor): + def get_job_definition(self, packages, agent, platforms, target_branch, editor): # define dependencies dependencies = [] for platform in platforms: - dependencies.append(f'{projectcontext_filepath()}#{projectcontext_job_id_test(platform["os"],editor["version"])}') - dependencies.append(f'{projectcontext_filepath()}#{projectcontext_job_id_test_min_editor(platform["os"])}') + dependencies.append(f'{projectcontext_filepath()}#{projectcontext_job_id_test(platform["os"],editor["name"])}') + if str(editor["track"]).lower() == "trunk": + dependencies.append(f'{projectcontext_filepath()}#{projectcontext_job_id_test_min_editor(platform["os"])}') + #dependencies.append(f'{packages_filepath()}#{package_job_id_test_dependencies(package["id"],platform["os"],editor["track"])}') # construct job job = YMLJob() - job.set_name(f'Pack and test all packages - { editor["version"] } [project context]') + job.set_name(f'Pack and test all packages - { editor["name"]} [project context]') job.set_agent(agent) job.add_dependencies(dependencies) + job.add_var_custom_revision(editor["track"]) job.add_commands([ f'npm install upm-ci-utils@stable -g --registry {NPM_UPMCI_INSTALL_URL}', f'upm-ci package izon -t', f'upm-ci package izon -d']) - if editor['version'] == f'fast-{target_editor}': - # trigger the job when updating the docs to avoid merging jpg images (this is not allowed by the package validation suite) - job.set_trigger_on_expression(f'pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.any match ["**/Documentation*/**/*"]') return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/packages/project_test_min_editor.py b/.yamato/ruamel/jobs/packages/project_test_min_editor.py index 48a3ca15b8d..abed955f0c9 100644 --- a/.yamato/ruamel/jobs/packages/project_test_min_editor.py +++ b/.yamato/ruamel/jobs/packages/project_test_min_editor.py @@ -1,6 +1,6 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss from ..shared.namer import * -from ..shared.constants import PATH_UNITY_REVISION, NPM_UPMCI_INSTALL_URL +from ..shared.constants import PATH_UNITY_REVISION, NPM_UPMCI_INSTALL_URL, get_unity_downloader_cli_cmd from ..shared.yml_job import YMLJob class Project_TestMinEditorJob(): @@ -14,7 +14,7 @@ def get_job_definition(self, platform): # define dependencies dependencies = [f'{projectcontext_filepath()}#{projectcontext_job_id_pack()}'] - dependencies.extend([f'{editor_filepath()}#{editor_job_id_test_min_editor(platform["os"]) }']) + dependencies.extend([f'{editor_priming_filepath()}#{editor_job_id_test_min_editor(platform["os"]) }']) # define commands commands = [ diff --git a/.yamato/ruamel/jobs/packages/yml_package.py b/.yamato/ruamel/jobs/packages/yml_package.py index fbce1931809..25dd2dc07ab 100644 --- a/.yamato/ruamel/jobs/packages/yml_package.py +++ b/.yamato/ruamel/jobs/packages/yml_package.py @@ -4,7 +4,7 @@ from .package_publish_dry import Package_PublishDryJob from .package_test import Package_TestJob from .package_test_dependencies import Package_TestDependenciesJob -from .package_publish_all import Package_PublishAllJob +from .package_publish_all_tag import Package_PublishAllTagJob from .package_test_all import Package_AllPackageCiJob @@ -17,10 +17,10 @@ def create_package_ymls(metafile): job = Package_PackJob(package, metafile["agent_pack"]) yml[job.job_id] = job.yml - job = Package_PublishJob(package, metafile["agent_publish"], metafile["platforms"], metafile["target_editor"]) + job = Package_PublishJob(package, metafile["agent_publish"], metafile["platforms"], metafile["publish_all_tracks"]) yml[job.job_id] = job.yml - job = Package_PublishDryJob(package, metafile["agent_publish"], metafile["platforms"], metafile["target_editor"]) + job = Package_PublishDryJob(package, metafile["agent_publish"], metafile["platforms"], metafile["publish_all_tracks"]) yml[job.job_id] = job.yml for editor in metafile["editors"]: @@ -33,10 +33,10 @@ def create_package_ymls(metafile): yml[job.job_id] = job.yml for editor in metafile['editors']: - job = Package_AllPackageCiJob(metafile["packages"], metafile["agent_publish"], metafile["platforms"], editor) + job = Package_AllPackageCiJob(metafile["packages"], metafile["agent_publish"], metafile["platforms"], metafile["target_branch"], editor) yml[job.job_id] = job.yml - job = Package_PublishAllJob(metafile["packages"], metafile["target_branch"], metafile["agent_publish_all"]) + job = Package_PublishAllTagJob(metafile["packages"], metafile["target_branch"], metafile["agent_publish_all"]) yml[job.job_id] = job.yml yml_files[packages_filepath()] = yml diff --git a/.yamato/ruamel/jobs/packages/yml_project.py b/.yamato/ruamel/jobs/packages/yml_project.py index 838858ec7ea..b9dae38315f 100644 --- a/.yamato/ruamel/jobs/packages/yml_project.py +++ b/.yamato/ruamel/jobs/packages/yml_project.py @@ -3,7 +3,7 @@ from .project_publish import Project_PublishJob from .project_test import Project_TestJob from .project_test_min_editor import Project_TestMinEditorJob -from .project_publish_all import Project_PublishAllJob +from .project_publish_all_tag import Project_PublishAllTagJob from .project_test_all import Project_AllPackageCiJob from .project_publish_dry import Project_PublishJob_DryRun @@ -15,10 +15,10 @@ def create_projectcontext_ymls(metafile): job = Project_PackJob(metafile["agent_pack"]) yml[job.job_id] = job.yml for package in metafile["packages"]: - job = Project_PublishJob(package, metafile["agent_publish"], metafile["platforms"], metafile["target_editor"]) + job = Project_PublishJob(package, metafile["agent_publish"], metafile["platforms"], metafile["publish_all_tracks"]) yml[job.job_id] = job.yml - job = Project_PublishJob_DryRun(package, metafile["agent_publish"], metafile["platforms"], metafile["target_editor"]) + job = Project_PublishJob_DryRun(package, metafile["agent_publish"], metafile["platforms"], metafile["publish_all_tracks"]) yml[job.job_id] = job.yml for editor in metafile["editors"]: @@ -31,10 +31,10 @@ def create_projectcontext_ymls(metafile): yml[job.job_id] = job.yml for editor in metafile['editors']: - job = Project_AllPackageCiJob(metafile["packages"], metafile["agent_publish"], metafile["platforms"], metafile["target_editor"], metafile["target_branch"], editor) + job = Project_AllPackageCiJob(metafile["packages"], metafile["agent_publish"], metafile["platforms"], metafile["target_branch"], editor) yml[job.job_id] = job.yml - job = Project_PublishAllJob(metafile["packages"], metafile["target_branch"], metafile["agent_publish_all"]) + job = Project_PublishAllTagJob(metafile["packages"], metafile["target_branch"], metafile["agent_publish_all"]) yml[job.job_id] = job.yml yml_files[projectcontext_filepath()] = yml diff --git a/.yamato/ruamel/jobs/preview_publish/pb_auto_version.py b/.yamato/ruamel/jobs/preview_publish/pb_auto_version.py index 4a3fb5b2629..b07d7cc93f6 100644 --- a/.yamato/ruamel/jobs/preview_publish/pb_auto_version.py +++ b/.yamato/ruamel/jobs/preview_publish/pb_auto_version.py @@ -1,4 +1,5 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss +from ruamel.yaml.scalarstring import PreservedScalarString as pss from ..shared.namer import pb_job_id_auto_version from ..shared.yml_job import YMLJob from ..shared.constants import NPM_UPMCI_INSTALL_URL @@ -22,10 +23,24 @@ def get_job_definition(self, agent, packages, target_branch, auto_version): job.add_commands([ f'npm install upm-ci-utils@stable -g --registry {NPM_UPMCI_INSTALL_URL}', f'upm-ci utils auto-version bump {bump_packages_args}', - f'upm-ci utils auto-version commit --push']) - job.set_trigger_on_expression(f'push.branch eq "{target_branch}" AND NOT push.changes.all match ["*template*/**/*.json"]') + f'upm-ci utils auto-version commit --push', + f'python3 ./Tools/standalone/templates_auto_bumper.py --template-name ./com.unity.template-hd --target-dependency com.unity.render-pipelines.high-definition', + f'python3 ./Tools/standalone/templates_auto_bumper.py --template-name ./com.unity.template-universal --target-dependency com.unity.render-pipelines.universal', + pss(f''' + git diff --quiet + if [[ $? != 0 ]]; then + git config --global user.name "noreply@unity3d.com" + git config --global user.email "noreply@unity3d.com" + git add ./com.unity.template-* + git checkout {target_branch} + git commit -m "[Automation] Auto-bump template dependencies" + git push origin {target_branch} + else + echo "Did not find any dependency to bump. Will not commit and push anything." + fi''' + )]) + if auto_version is True: + job.set_trigger_on_expression(f'push.branch eq "{target_branch}" AND NOT push.changes.all match ["com.unity.template-*/**/*.json"] AND NOT push.changes.all match ["com.unity.*/package.json"]') job.add_artifacts_packages() - # if auto_version is True: - # job.add_trigger_integration_branch(target_branch) return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/projects/_project_base.py b/.yamato/ruamel/jobs/projects/_project_base.py index ad128dba978..6b22e8f89b9 100644 --- a/.yamato/ruamel/jobs/projects/_project_base.py +++ b/.yamato/ruamel/jobs/projects/_project_base.py @@ -5,30 +5,37 @@ from ..shared.namer import * from ..shared.yml_job import YMLJob -def _job(project_name, test_platform_name, editor, platform, api, cmd): +def _job(project, test_platform_name, editor, platform, api, cmd): # define name if test_platform_name.lower() == 'standalone_build': - job_name = f'Build {project_name} on {platform["name"]}_{api["name"]}_Player on version {editor["version"]}' + job_name = f'Build {project["name"]} on {platform["name"]}_{api["name"]}_Player on version {editor["name"]}' else: - job_name = f'{project_name} on {platform["name"]}_{api["name"]}_{test_platform_name} on version {editor["version"]}' + job_name = f'{project["name"]} on {platform["name"]}_{api["name"]}_{test_platform_name} on version {editor["name"]}' # define agent platform_agents_project = platform.get(f'agents_project_{api["name"]}', platform.get('agents_project')) agent = platform_agents_project.get(f'{test_platform_name.lower()}', platform_agents_project['default']) # replace(" ","_") called for playmode_XR - - # define dependencies - dependencies = [{ - 'path' : f'{editor_filepath()}#{editor_job_id(editor["version"], platform["os"])}', - 'rerun' : editor["rerun_strategy"]}] # construct job job = YMLJob() job.set_name(job_name) job.set_agent(agent) job.add_var_upm_registry() - job.add_var_custom_revision(editor["version"]) - job.add_dependencies(dependencies) + job.add_var_custom_revision(editor["track"]) job.add_commands(cmd) job.add_artifacts_test_results() + + if test_platform_name.lower()=='standalone': + job.add_artifacts_project_logs(project.get("folder_standalone", project["folder"])) + else: + job.add_artifacts_project_logs(project["folder"]) + + + + if not editor['editor_pinning']: + job.add_dependencies([{ + 'path' : f'{editor_priming_filepath()}#{editor_job_id(editor["name"], platform["os"])}', + 'rerun' : editor["rerun_strategy"]}]) + return job diff --git a/.yamato/ruamel/jobs/projects/commands/_cmd_mapper.py b/.yamato/ruamel/jobs/projects/commands/_cmd_mapper.py index defba481681..d0e0bd32c87 100644 --- a/.yamato/ruamel/jobs/projects/commands/_cmd_mapper.py +++ b/.yamato/ruamel/jobs/projects/commands/_cmd_mapper.py @@ -1,4 +1,4 @@ -from . import win, osx_openglcore, osx_metal, linux, android, linux_split, iphone +from . import win, osx_openglcore, osx_metal, linux, android, iphone, internal cmd_map = { 'win' : { @@ -36,8 +36,13 @@ 'playmode': iphone.cmd_playmode, 'standalone' : iphone.cmd_standalone, 'standalone_build' : iphone.cmd_standalone_build - } - + }, + 'internal' : { + 'editmode': internal.cmd_editmode, + 'playmode': internal.cmd_playmode, + 'standalone' : internal.cmd_standalone, + 'standalone_build' : internal.cmd_standalone_build + } } diff --git a/.yamato/ruamel/jobs/projects/commands/internal.py b/.yamato/ruamel/jobs/projects/commands/internal.py new file mode 100644 index 00000000000..28e327435b8 --- /dev/null +++ b/.yamato/ruamel/jobs/projects/commands/internal.py @@ -0,0 +1,53 @@ +from ...shared.constants import TEST_PROJECTS_DIR, PATH_UNITY_REVISION, PATH_TEST_RESULTS, PATH_PLAYERS, GITHUB_CDS_URL, UNITY_DOWNLOADER_CLI_URL, UTR_INSTALL_URL,get_unity_downloader_cli_cmd +from ...shared.utr_utils import utr_editmode_flags, utr_playmode_flags, utr_standalone_split_flags,utr_standalone_not_split_flags, utr_standalone_build_flags + + +def _cmd_base(project_folder, platform, utr_flags, editor): + return [ + f'git clone {GITHUB_CDS_URL}/sophia/URP-Update-testing.git TestProjects/URP-Update-testing', + f'curl -s {UTR_INSTALL_URL}.bat --output {TEST_PROJECTS_DIR}/URP-Update-testing/{project_folder}/utr.bat', + f'pip install unity-downloader-cli --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade', + 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', + f'cd {TEST_PROJECTS_DIR}/URP-Update-testing/{project_folder} && utr {" ".join(utr_flags)}' + ] + +def cmd_editmode(project_folder, platform, api, test_platform, editor): + utr_args = utr_editmode_flags() + utr_args.extend(test_platform["extra_utr_flags"]) + if api["name"] != "": + utr_args.append(f'--extra-editor-arg="{api["cmd"]}"') + + return _cmd_base(project_folder, platform, utr_args, editor) + + +def cmd_playmode(project_folder, platform, api, test_platform, editor): + utr_args = utr_playmode_flags() + utr_args.extend(test_platform["extra_utr_flags"]) + if api["name"] != "": + utr_args.append(f'--extra-editor-arg="{api["cmd"]}"') + + return _cmd_base(project_folder, platform, utr_args, editor) + +def cmd_standalone(project_folder, platform, api, test_platform, editor): + utr_args = utr_standalone_split_flags("Windows64") + utr_args.extend(test_platform["extra_utr_flags"]) + utr_args.append(f'--timeout={get_timeout(test_platform, "Win")}') + + + base = [f'curl -s {UTR_INSTALL_URL}.bat --output {TEST_PROJECTS_DIR}/{project_folder}/utr.bat'] + base.append(f'cd {TEST_PROJECTS_DIR}/{project_folder} && utr {" ".join(utr_args)}') + + return base + + +def cmd_standalone_build(project_folder, platform, api, test_platform, editor): + utr_args = utr_standalone_build_flags("Windows64") + utr_args.extend(test_platform["extra_utr_flags_build"]) + utr_args.extend(['--extra-editor-arg="-executemethod"', f'--extra-editor-arg="CustomBuild.BuildWindows{api["name"]}Linear"']) + utr_args.append(f'--timeout={get_timeout(test_platform, "Win", build=True)}') + + + return _cmd_base(project_folder, platform, utr_args, editor) diff --git a/.yamato/ruamel/jobs/projects/commands/iphone.py b/.yamato/ruamel/jobs/projects/commands/iphone.py index c73cfceb1cf..77a65c4d213 100644 --- a/.yamato/ruamel/jobs/projects/commands/iphone.py +++ b/.yamato/ruamel/jobs/projects/commands/iphone.py @@ -1,9 +1,9 @@ -from ...shared.constants import TEST_PROJECTS_DIR, PATH_UNITY_REVISION, PATH_TEST_RESULTS, PATH_PLAYERS, UTR_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL, get_unity_downloader_cli_cmd +from ...shared.constants import TEST_PROJECTS_DIR, PATH_UNITY_REVISION, PATH_TEST_RESULTS, PATH_PLAYERS, UTR_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL, get_unity_downloader_cli_cmd, get_timeout from ruamel.yaml.scalarstring import PreservedScalarString as pss from ...shared.utr_utils import utr_editmode_flags, utr_playmode_flags, utr_standalone_split_flags,utr_standalone_not_split_flags, utr_standalone_build_flags -def _cmd_base(project_folder, components): +def _cmd_base(project_folder, platform, editor): return [] def cmd_editmode(project_folder, platform, api, test_platform, editor): @@ -16,6 +16,7 @@ def cmd_standalone(project_folder, platform, api, test_platform, editor): utr_args = utr_standalone_split_flags(platform_spec='', platform='iOS', player_load_path='players',player_conn_ip=None) utr_args.extend(test_platform["extra_utr_flags"]) + utr_args.append(f'--timeout={get_timeout(test_platform, "iOS")}') return [ f'curl -s {UTR_INSTALL_URL} --output utr', @@ -28,6 +29,7 @@ def cmd_standalone_build(project_folder, platform, api, test_platform, editor): utr_args = utr_standalone_build_flags(platform_spec='', platform='iOS', testproject=f'{TEST_PROJECTS_DIR}/{project_folder}', player_save_path=PATH_PLAYERS) utr_args.extend(test_platform["extra_utr_flags_build"]) + utr_args.append(f'--timeout={get_timeout(test_platform, "iOS", build=True)}') return [ f'pip install unity-downloader-cli --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade', diff --git a/.yamato/ruamel/jobs/projects/commands/linux.py b/.yamato/ruamel/jobs/projects/commands/linux.py index 991490f2248..e885168a903 100644 --- a/.yamato/ruamel/jobs/projects/commands/linux.py +++ b/.yamato/ruamel/jobs/projects/commands/linux.py @@ -1,4 +1,4 @@ -from ...shared.constants import TEST_PROJECTS_DIR,PATH_UNITY_REVISION, PATH_TEST_RESULTS, UNITY_DOWNLOADER_CLI_URL, UTR_INSTALL_URL,get_unity_downloader_cli_cmd, get_timeout +from ...shared.constants import TEST_PROJECTS_DIR,PATH_UNITY_REVISION, PATH_TEST_RESULTS, UNITY_DOWNLOADER_CLI_URL, UTR_INSTALL_URL, PATH_PLAYERS, get_unity_downloader_cli_cmd, get_timeout from ...shared.utr_utils import utr_editmode_flags, utr_playmode_flags, utr_standalone_split_flags,utr_standalone_not_split_flags, utr_standalone_build_flags @@ -31,18 +31,28 @@ def cmd_playmode(project_folder, platform, api, test_platform, editor): return _cmd_base(project_folder, platform, utr_args, editor) + def cmd_standalone(project_folder, platform, api, test_platform, editor): - try: - cmd_standalone_build(project_folder, platform, api, test_platform) - utr_args = utr_standalone_split_flags("Linux64") - except: - utr_args = utr_standalone_not_split_flags("Linux64") + utr_args = utr_standalone_split_flags("Linux64") utr_args.extend(test_platform["extra_utr_flags"]) - utr_args.extend(['--extra-editor-arg="-executemethod"', f'--extra-editor-arg="CustomBuild.BuildLinux{api["name"]}Linear"']) - + utr_args.append(f'--timeout={get_timeout(test_platform, "Linux")}') - return _cmd_base(project_folder, platform, utr_args, editor) + base = [f'curl -s {UTR_INSTALL_URL} --output {TEST_PROJECTS_DIR}/{project_folder}/utr'] + base.extend([ + f'chmod +x {TEST_PROJECTS_DIR}/{project_folder}/utr', + f'cd {TEST_PROJECTS_DIR}/{project_folder} && ./utr {" ".join(utr_args)}']) + + return base def cmd_standalone_build(project_folder, platform, api, test_platform, editor): - raise NotImplementedError('linux: split build not specified') + utr_args = utr_standalone_build_flags("Linux64") + utr_args.extend(test_platform["extra_utr_flags_build"]) + utr_args.extend(['--extra-editor-arg="-executemethod"']) + utr_args.append(f'--timeout={get_timeout(test_platform, "Linux", build=True)}') + + if not test_platform['is_performance']: + utr_args.extend([f'--extra-editor-arg="CustomBuild.BuildLinux{api["name"]}Linear"']) + + + return _cmd_base(project_folder, platform, utr_args, editor) \ No newline at end of file diff --git a/.yamato/ruamel/jobs/projects/commands/linux_split.py b/.yamato/ruamel/jobs/projects/commands/linux_split.py deleted file mode 100644 index a662b31840b..00000000000 --- a/.yamato/ruamel/jobs/projects/commands/linux_split.py +++ /dev/null @@ -1,37 +0,0 @@ -from ...shared.constants import TEST_PROJECTS_DIR,PATH_UNITY_REVISION, PATH_TEST_RESULTS, PATH_PLAYERS, UTR_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL, get_unity_downloader_cli_cmd,get_unity_downloader_cli_cmd - -def _cmd_base(project_folder, components): - return [ - f'sudo -H pip install --upgrade pip', - f'sudo -H pip install unity-downloader-cli --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade', - f'curl -s {UTR_INSTALL_URL} --output {TEST_PROJECTS_DIR}/{project_folder}/utr', - f'chmod +x {TEST_PROJECTS_DIR}/{project_folder}/utr', - f'cd {TEST_PROJECTS_DIR}/{project_folder} && unity-downloader-cli --source-file ../../{PATH_UNITY_REVISION} {"".join([f"-c {c} " for c in components])} --wait --published-only' - ] - - -def cmd_not_standalone(project_folder, platform, api, test_platform, editor): - base = _cmd_base(project_folder, platform, editor) - base.extend([ - f'cd {TEST_PROJECTS_DIR}/{project_folder} && DISPLAY=:0.0 utr {test_platform["extra_utr_flags"]} --testproject=. --editor-location=.Editor --artifacts_path={PATH_TEST_RESULTS}' - ]) - base[-1] += f' --extra-editor-arg="{platform["apis"][api]}"' if (api != "" and platform["apis"][api] != None) else '' - return base - -def cmd_standalone(project_folder, platform, api, test_platform, editor): - base = [ - f'curl -s {UTR_INSTALL_URL} --output {TEST_PROJECTS_DIR}/{project_folder}/utr', - f'chmod +x {TEST_PROJECTS_DIR}/{project_folder}/utr', - ] - base.extend([ - f'cd {TEST_PROJECTS_DIR}/{project_folder} && DISPLAY=:0.0 utr {test_platform["extra_utr_flags"]}Linux64 --artifacts_path={PATH_TEST_RESULTS} --timeout=1200 --player-load-path=.{PATH_PLAYERS} --player-connection-ip=auto' - ]) - return base - -def cmd_standalone_build(project_folder, platform, api, test_platform, editor): - base = _cmd_base(project_folder, platform, editor) - base.extend([ - f'cd {TEST_PROJECTS_DIR}/{project_folder} && DISPLAY=:0.0 utr {test_platform["extra_utr_flags_build"]}Linux64 --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinux{api["name"]}Linear" --testproject=. --editor-location=.Editor --artifacts_path={PATH_TEST_RESULTS} --timeout=1200 --player-save-path=.{PATH_PLAYERS} --build-only' - ]) - return base - diff --git a/.yamato/ruamel/jobs/projects/commands/osx_metal.py b/.yamato/ruamel/jobs/projects/commands/osx_metal.py index a4bdc0ab9a7..9a72b446afb 100644 --- a/.yamato/ruamel/jobs/projects/commands/osx_metal.py +++ b/.yamato/ruamel/jobs/projects/commands/osx_metal.py @@ -7,7 +7,7 @@ def _cmd_base(project_folder, platform, utr_flags, editor): return [ f'curl -s {UTR_INSTALL_URL} --output {TEST_PROJECTS_DIR}/{project_folder}/utr', f'chmod +x {TEST_PROJECTS_DIR}/{project_folder}/utr', - f'ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc \'pip3 install --user unity-downloader-cli --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade\'"', + f'ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc \'pip3 install unity-downloader-cli --user --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade\'"', f'scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/{REPOSITORY_NAME}', f'scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini', f'ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP \'$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli { get_unity_downloader_cli_cmd(editor, platform["os"], git_root=True) } {"".join([f"-c {c} " for c in platform["components"]])} --wait --published-only\'', diff --git a/.yamato/ruamel/jobs/projects/commands/osx_metal_split.py b/.yamato/ruamel/jobs/projects/commands/osx_metal_split.py deleted file mode 100644 index 6aefd38f673..00000000000 --- a/.yamato/ruamel/jobs/projects/commands/osx_metal_split.py +++ /dev/null @@ -1,57 +0,0 @@ - -from ruamel.yaml.scalarstring import PreservedScalarString as pss -from ...shared.constants import REPOSITORY_NAME, TEST_PROJECTS_DIR, PATH_UNITY_REVISION, PATH_TEST_RESULTS, PATH_PLAYERS, UNITY_DOWNLOADER_CLI_URL, UTR_INSTALL_URL - -def _cmd_base(project, components): - return [ ] - - -def cmd_not_standalone(project_folder, platform, api, test_platform_args): - return [ - #f'git clone git@github.cds.internal.unity3d.com:unity/utr.git {TEST_PROJECTS_DIR}/{project_folder}/utr', - f'curl -s {UTR_INSTALL_URL} --output {TEST_PROJECTS_DIR}/{project_folder}/utr', - f'chmod +x {TEST_PROJECTS_DIR}/{project_folder}/utr', - f'ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc \'pip3 install --user unity-downloader-cli --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade\'"', - f'scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/{REPOSITORY_NAME}', - f'scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini', - f'ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP \'$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/{REPOSITORY_NAME}/{PATH_UNITY_REVISION} {"".join([f"-c {c} " for c in platform["components"]])} --wait --published-only\'', - pss(f''' - set GIT_BRANCH=$GIT_BRANCH - set GIT_REVISION=$GIT_REVISION - set YAMATO_JOB_ID=$YAMATO_JOB_ID - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder} && ~/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder}/utr/utr { test_platform_args } --testproject=/Users/bokken/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder} --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder}/{PATH_TEST_RESULTS}' - - UTR_RESULT=$? - mkdir -p {TEST_PROJECTS_DIR}/{project_folder}/{PATH_TEST_RESULTS}/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder}/{PATH_TEST_RESULTS}/ {TEST_PROJECTS_DIR}/{project_folder}/{PATH_TEST_RESULTS}/ - exit $UTR_RESULT''') - ] - -def cmd_standalone(project_folder, platform, api, test_platform_args): - return [ - f'curl -s {UTR_INSTALL_URL} --output utr', - f'chmod +x ./utr', - f'scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r ../{REPOSITORY_NAME}/ bokken@$BOKKEN_DEVICE_IP:~/{REPOSITORY_NAME}', - f'scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini', - pss(f''' - export GIT_BRANCH=$GIT_BRANCH - export GIT_REVISION=$GIT_REVISION - export YAMATO_JOB_ID=$YAMATO_JOB_ID - export YAMATO_JOBDEFINITION_NAME=$YAMATO_JOBDEFINITION_NAME - export YAMATO_PROJECT_ID=$YAMATO_PROJECT_ID - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP -T "./utr {test_platform_args}OSX --player-load-path=~/{REPOSITORY_NAME}/{PATH_PLAYERS} --artifacts_path=~/{REPOSITORY_NAME}/build/{PATH_TEST_RESULTS} --player-connection-ip=127.0.0.1" - - UTR_RESULT=$? - mkdir -p build/{PATH_TEST_RESULTS}/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:~/{REPOSITORY_NAME}/build/{PATH_TEST_RESULTS}/ build/{PATH_TEST_RESULTS}/ - exit $UTR_RESULT''') - ] - -def cmd_standalone_build(project_folder, platform, api, test_platform_args): - return [ - f'git clone git@github.cds.internal.unity3d.com:unity/utr.git {TEST_PROJECTS_DIR}/{project_folder}/utr', - f'pip install unity-downloader-cli --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade', - f'cd {TEST_PROJECTS_DIR}/{project_folder} && unity-downloader-cli --source-file ../../{PATH_UNITY_REVISION} {"".join([f"-c {c} " for c in platform["components"]])} --wait --published-only', - f'cd {TEST_PROJECTS_DIR}/{project_folder} && utr/utr {test_platform_args}OSX --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildOSXMetal" --testproject=. --editor-location=.Editor --artifacts_path=build-results --timeout=3600 --player-save-path={PATH_PLAYERS} --build-only' - ] - diff --git a/.yamato/ruamel/jobs/projects/commands/osx_openglcore.py b/.yamato/ruamel/jobs/projects/commands/osx_openglcore.py index 64c15bd52a2..18377fbdee2 100644 --- a/.yamato/ruamel/jobs/projects/commands/osx_openglcore.py +++ b/.yamato/ruamel/jobs/projects/commands/osx_openglcore.py @@ -26,4 +26,4 @@ def cmd_standalone(project_folder, platform, api, test_platform, editor): return [] def cmd_standalone_build(project_folder, platform, api, test_platform, editor): - return [] + return [] \ No newline at end of file diff --git a/.yamato/ruamel/jobs/projects/project_all.py b/.yamato/ruamel/jobs/projects/project_all.py index a0b9b9f72a9..c053e85d4c5 100644 --- a/.yamato/ruamel/jobs/projects/project_all.py +++ b/.yamato/ruamel/jobs/projects/project_all.py @@ -6,7 +6,7 @@ class Project_AllJob(): def __init__(self, project, editor, dependencies_in_all): self.project = project - self.job_id = project_job_id_all(project, editor["version"]) + self.job_id = project_job_id_all(project, editor["name"]) self.yml = self.get_job_definition(project, editor, dependencies_in_all).get_yml() @@ -19,13 +19,13 @@ def get_job_definition(self, project, editor, dependencies_in_all): if dep.get("all"): dependencies.append({ - 'path': f'{project_filepath_all(project_dep)}#{project_job_id_all(project_dep, editor["version"])}', + 'path': f'{project_filepath_all(project_dep)}#{project_job_id_all(project_dep, editor["name"])}', 'rerun': editor["rerun_strategy"]}) else: for test_platform in dep["test_platforms"]: file = project_filepath_specific(project_dep, dep["platform"], dep["api"]) - job_id = project_job_id_test(project_dep,dep["platform"],dep["api"],test_platform,editor["version"]) + job_id = project_job_id_test(project_dep,dep["platform"],dep["api"],test_platform, editor["name"]) dependencies.append({ 'path' : f'{file}#{job_id}', @@ -33,9 +33,9 @@ def get_job_definition(self, project, editor, dependencies_in_all): # construct job job = YMLJob() - job.set_name(f'All {project} CI - {editor["version"]}') + job.set_name(f'All {project} CI - {editor["name"]}') job.add_dependencies(dependencies) - job.add_var_custom_revision(editor["version"]) + job.add_var_custom_revision(editor["track"]) return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/projects/project_not_standalone.py b/.yamato/ruamel/jobs/projects/project_not_standalone.py index 3916221a9a1..106baac2ce7 100644 --- a/.yamato/ruamel/jobs/projects/project_not_standalone.py +++ b/.yamato/ruamel/jobs/projects/project_not_standalone.py @@ -1,5 +1,6 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss from ..shared.namer import project_job_id_test +from ..shared.constants import get_editor_revision from .commands._cmd_mapper import get_cmd from ._project_base import _job @@ -7,14 +8,18 @@ class Project_NotStandaloneJob(): def __init__(self, project, editor, platform, api, test_platform): self.project_name = project["name"] - self.job_id = project_job_id_test(project["name"],platform["name"],api["name"],test_platform["name"],editor["version"]) + self.job_id = project_job_id_test(project["name"],platform["name"],api["name"],test_platform["name"], editor["name"]) self.yml = self.get_job_definition(project, editor, platform, api, test_platform).get_yml() def get_job_definition(self, project, editor, platform, api, test_platform): - - cmd = get_cmd(platform["name"], api, test_platform['type'], "") - job = _job(project["name"], test_platform["name"], editor, platform, api, cmd(project["folder"], platform, api, test_platform, editor)) - return job + if 'URPUpdate' in project["name"]: + cmd = get_cmd(platform["name"], api, test_platform['type'], 'internal') + job = _job(project, test_platform["name"], editor, platform, api, cmd(project["folder"], platform, api, test_platform, editor)) + return job + else: + cmd = get_cmd(platform["name"], api, test_platform['type'], "") + job = _job(project, test_platform["name"], editor, platform, api, cmd(project["folder"], platform, api, test_platform, editor)) + return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/projects/project_standalone.py b/.yamato/ruamel/jobs/projects/project_standalone.py index c9a26c2ac81..2e9517d2bc7 100644 --- a/.yamato/ruamel/jobs/projects/project_standalone.py +++ b/.yamato/ruamel/jobs/projects/project_standalone.py @@ -1,5 +1,6 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss from ..shared.namer import project_filepath_specific, project_job_id_build, project_job_id_test +from ..shared.constants import get_editor_revision from .commands._cmd_mapper import get_cmd from ._project_base import _job from .project_standalone_build import Project_StandaloneBuildJob @@ -10,14 +11,14 @@ def __init__(self, project, editor, platform, api, test_platform): self.build_job = self.get_StandaloneBuildJob(project, editor, platform, api, test_platform) self.project_name = project["name"] - self.job_id = project_job_id_test(project["name"],platform["name"],api["name"],test_platform["name"],editor["version"]) + self.job_id = project_job_id_test(project["name"],platform["name"],api["name"],test_platform["name"], editor["name"]) self.yml = self.get_job_definition(project, editor, platform, api, test_platform, self.build_job).get_yml() def get_StandaloneBuildJob(self, project, editor, platform, api, test_platform): try: return Project_StandaloneBuildJob(project, editor, platform, api, test_platform) - except NotImplementedError: + except NotImplementedError: return None @@ -25,7 +26,7 @@ def get_job_definition(self, project, editor, platform, api, test_platform, buil project_folder = project.get("folder_standalone", project["folder"]) cmd = get_cmd(platform["name"], api, 'standalone', "") - job = _job(project["name"], test_platform["name"], editor, platform, api, cmd(project_folder, platform, api, test_platform, editor)) + job = _job(project, test_platform["name"], editor, platform, api, cmd(project_folder, platform, api, test_platform, editor)) if build_job is not None: @@ -38,9 +39,3 @@ def get_job_definition(self, project, editor, platform, api, test_platform, buil job.set_skip_checkout(True) return job - - - - - - \ No newline at end of file diff --git a/.yamato/ruamel/jobs/projects/project_standalone_build.py b/.yamato/ruamel/jobs/projects/project_standalone_build.py index 506a6500b90..5118e21997b 100644 --- a/.yamato/ruamel/jobs/projects/project_standalone_build.py +++ b/.yamato/ruamel/jobs/projects/project_standalone_build.py @@ -1,5 +1,6 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss from ..shared.namer import project_job_id_build +from ..shared.constants import get_editor_revision from .commands._cmd_mapper import get_cmd from ._project_base import _job @@ -7,7 +8,7 @@ class Project_StandaloneBuildJob(): def __init__(self, project, editor, platform, api, test_platform): self.project_name = project["name"] - self.job_id = project_job_id_build(project["name"],platform["name"],api["name"],editor["version"]) + self.job_id = project_job_id_build(project["name"],platform["name"],api["name"], editor["name"]) self.yml = self.get_job_definition(project, editor, platform, api, test_platform).get_yml() @@ -15,8 +16,7 @@ def get_job_definition(self, project, editor, platform, api, test_platform): project_folder = project.get("folder_standalone", project["folder"]) cmd = get_cmd(platform["name"], api, 'standalone_build', "") - job = _job(project["name"], 'standalone_build', editor, platform, api, cmd(project_folder, platform, api, test_platform, editor)) + job = _job(project, 'standalone_build', editor, platform, api, cmd(project_folder, platform, api, test_platform, editor)) job.add_artifacts_players() - return job - \ No newline at end of file + return job \ No newline at end of file diff --git a/.yamato/ruamel/jobs/projects/yml_project.py b/.yamato/ruamel/jobs/projects/yml_project.py index fde2c002b9b..3c4179077c7 100644 --- a/.yamato/ruamel/jobs/projects/yml_project.py +++ b/.yamato/ruamel/jobs/projects/yml_project.py @@ -18,35 +18,30 @@ def create_project_ymls(metafile): yml_file = project_filepath_all(metafile["project"]["name"]) yml_files[yml_file] = yml - # run project specific jobs only if platforms are specified - if metafile.get('platforms') != None: - - # project platform_api specific yml files - project = metafile["project"] - - for platform in metafile['platforms']: - for api in platform['apis'] or [""]: - if platform["name"]=='Android': - m=5 - yml = {} - for editor in metafile['editors']: - for test_platform in metafile['test_platforms']: - - if test_platform['name'].lower() not in map(str.lower, api.get('exclude_test_platforms', [])): - - if test_platform['name'].lower() == 'standalone': - job = Project_StandaloneJob(project, editor, platform, api, test_platform) - yml[job.job_id] = job.yml - - if job.build_job is not None: - yml[job.build_job.job_id] = job.build_job.yml - - else: - job = Project_NotStandaloneJob(project, editor, platform, api, test_platform) - yml[job.job_id] = job.yml + # project platform_api specific yml files + project = metafile["project"] + for platform in metafile['platforms']: + for api in platform['apis'] or [""]: + + yml = {} + for editor in metafile['editors']: + for test_platform in metafile['test_platforms']: + + if test_platform['name'].lower() not in map(str.lower, api.get('exclude_test_platforms', [])): + + if test_platform['type'].lower() == 'standalone': + job = Project_StandaloneJob(project, editor, platform, api, test_platform) + yml[job.job_id] = job.yml + + if job.build_job is not None: + yml[job.build_job.job_id] = job.build_job.yml - # store yml per [project]-[platform]-[api] - yml_file = project_filepath_specific(project["name"], platform["name"], api["name"]) - yml_files[yml_file] = yml + else: + job = Project_NotStandaloneJob(project, editor, platform, api, test_platform) + yml[job.job_id] = job.yml + + # store yml per [project]-[platform]-[api] + yml_file = project_filepath_specific(project["name"], platform["name"], api["name"]) + yml_files[yml_file] = yml return yml_files \ No newline at end of file diff --git a/.yamato/ruamel/jobs/shared/constants.py b/.yamato/ruamel/jobs/shared/constants.py index c67bd11be98..7385f504241 100644 --- a/.yamato/ruamel/jobs/shared/constants.py +++ b/.yamato/ruamel/jobs/shared/constants.py @@ -17,18 +17,28 @@ DEFAULT_TIMEOUT = 1200 + +def get_editor_revision(editor, platform_os): + if str(editor['track']).lower()=='custom-revision': + return VAR_CUSTOM_REVISION + elif str(editor['track']).lower()=='trunk': + return editor["revisions"][f"{editor['track']}_latest_internal"][platform_os]["revision"] + else: + return editor["revisions"][f"{editor['track']}_staging"][platform_os]["revision"] + def get_unity_downloader_cli_cmd(editor, platform_os, cd=False, git_root=False): '''Returns the revision used by unity-downloader-cli. For custom revision, refers to --source-file flag. If cd, then revision file path is prepended by ../../; if git_root, then its prepended by ~/Graphics/. For normal tracks (not custom revision), retrieves the editor revision from latest_editor_versions file''' - - if cd: - return f'--source-file ../../{PATH_UNITY_REVISION}' - elif git_root: - return f'--source-file ~/Graphics/{PATH_UNITY_REVISION}' + if not editor["editor_pinning"]: + if cd: + return f'--source-file ../../{PATH_UNITY_REVISION}' + elif git_root: + return f'--source-file ~/Graphics/{PATH_UNITY_REVISION}' + else: + return f'--source-file {PATH_UNITY_REVISION}' else: - return f'--source-file {PATH_UNITY_REVISION}' - + return f'-u {get_editor_revision(editor, platform_os)}' def get_timeout(test_platform, os_name, build=False): '''Returns default timeout if testplatform does not specify otherwise. diff --git a/.yamato/ruamel/jobs/shared/namer.py b/.yamato/ruamel/jobs/shared/namer.py index 8eb1249c1a0..12e7ffd9e99 100644 --- a/.yamato/ruamel/jobs/shared/namer.py +++ b/.yamato/ruamel/jobs/shared/namer.py @@ -2,24 +2,39 @@ parent_dir = '.yamato' # editor specific -def editor_filepath(): - return f'{parent_dir}/_editor.yml'.lower() +def editor_priming_filepath(): + return f'{parent_dir}/_editor_priming.yml'.lower() -def editor_job_id(editor_version, platform_os): - return f'editor:priming:{editor_version}:{platform_os}' +def editor_pinning_filepath(): + return f'{parent_dir}/_editor_pinning.yml'.lower() + +def editor_job_id(editor_name, platform_os): + return f'editor:priming:{editor_name}:{platform_os}' def editor_job_id_test_min_editor(platform_os): return f'editor:priming:test_min_editor:{platform_os}' +def editor_job_id_update(): + return 'editor-pinning-update' + +def editor_job_id_target_to_ci(): + return 'editor-pinning-target-to-ci' + +def editor_job_id_merge_revisions(editor_track, abv): + return f'editor-pinning-merge-revisions-{editor_track}-abv' if abv else f'editor-pinning-merge-revisions-{editor_track}' + +def editor_job_id_merge_all(abv): + return f'editor-pinning-merge-all-abv' if abv else f'editor-pinning-merge-all' + # package specific def packages_filepath(): return f'{parent_dir}/_packages.yml'.lower() -def package_job_id_test(package_id, platform_os, editor_version): - return f'test_{ package_id }_{ platform_os }_{editor_version}' +def package_job_id_test(package_id, platform_os, editor_name): + return f'test_{ package_id }_{ platform_os }_{editor_name}' -def package_job_id_test_dependencies(package_id, platform_os, editor_version): - return f'test_{ package_id }_{ platform_os }_{editor_version}_dependencies' +def package_job_id_test_dependencies(package_id, platform_os, editor_name): + return f'test_{ package_id }_{ platform_os }_{editor_name}_dependencies' def package_job_id_pack(package_id): return f'pack_{package_id}' @@ -33,8 +48,11 @@ def package_job_id_publish_dry(package_id): def package_job_id_publish_all(): return f'publish_all' -def package_job_id_test_all(editor_version): - return f'all_package_ci_{editor_version}' +def package_job_id_publish_all_tag(): + return f'publish_all_tag' + +def package_job_id_test_all(editor_name): + return f'all_package_ci_{editor_name}' def projectcontext_filepath(): return f'{parent_dir}/_projectcontext.yml'.lower() @@ -42,8 +60,8 @@ def projectcontext_filepath(): def projectcontext_job_id_pack(): return f'pack_all_project' -def projectcontext_job_id_test(platform_os, editor_version): - return f'test_all_project_{ platform_os }_{editor_version}' +def projectcontext_job_id_test(platform_os, editor_name): + return f'test_all_project_{ platform_os }_{editor_name}' def projectcontext_job_id_test_min_editor(platform_os): return f'test_all_project_{ platform_os }_min_editor' @@ -57,8 +75,11 @@ def projectcontext_job_id_publish_dry(package_id): def projectcontext_job_id_publish_all(): return f'publish_all_project' -def projectcontext_job_id_test_all(editor_version): - return f'all_package_ci_project_{editor_version}' +def projectcontext_job_id_publish_all_tag(): + return f'publish_all_project_tag' + +def projectcontext_job_id_test_all(editor_name): + return f'all_package_ci_project_{editor_name}' def pb_projectcontext_job_id_promote(package_name): return f'promote_{package_name}_project' @@ -73,17 +94,17 @@ def pb_projectcontext_job_id_promote_all_preview(): def templates_filepath(): return f'{parent_dir}/_templates.yml'.lower() -def template_job_id_test(template_id, platform_os, editor_version): - return f'test_{ template_id }_{ platform_os }_{editor_version}' +def template_job_id_test(template_id, platform_os, editor_name): + return f'test_{ template_id }_{ platform_os }_{editor_name}' -def template_job_id_test_dependencies(template_id, platform_os, editor_version): - return f'test_{ template_id }_{ platform_os }_{editor_version}_dependencies' +def template_job_id_test_dependencies(template_id, platform_os, editor_name): + return f'test_{ template_id }_{ platform_os }_{editor_name}_dependencies' def template_job_id_pack(template_id): return f'pack_{template_id}' -def template_job_id_test_all(editor_version): - return f'all_template_ci_{editor_version}' +def template_job_id_test_all(editor_name): + return f'all_template_ci_{editor_name}' # project specific def project_filepath_specific(project_name, platform_name, api_name): @@ -94,34 +115,28 @@ def project_filepath_all(project_name): # return f'{parent_dir}/{project_name}/all-{project_name}.yml'.lower() return f'{parent_dir}/all-{project_name}.yml'.lower() -def project_job_id_test(project_name, platform_name, api_name, test_platform_name, editor_version): - return f'{project_name}_{platform_name}_{api_name}_{test_platform_name}_{editor_version}'.replace('__','_') +def project_job_id_test(project_name, platform_name, api_name, test_platform_name, editor_name): + return f'{project_name}_{platform_name}_{api_name}_{test_platform_name}_{editor_name}'.replace('__','_') -def project_job_id_build(project_name, platform_name, api_name, editor_version): - return f'Build_{project_name}_{platform_name}_{api_name}_Player_{editor_version}'.replace('__','_') +def project_job_id_build(project_name, platform_name, api_name, editor_name): + return f'Build_{project_name}_{platform_name}_{api_name}_Player_{editor_name}'.replace('__','_') -def project_job_id_all(project_name, editor_version): - return f'All_{project_name}_{ editor_version}' +def project_job_id_all(project_name, editor_name): + return f'All_{project_name}_{ editor_name}' # abv specific def abv_filepath(): return f'{parent_dir}/_abv.yml'.lower() -def abv_job_id_all_project_ci(editor_version): - return f'all_project_ci_{editor_version}' - -def abv_job_id_all_project_ci_nightly(editor_version): - return f'all_project_ci_nightly_{editor_version}' - -def abv_job_id_smoke_test(editor_version, test_platform_name): - return f'smoke_test_{test_platform_name}_{editor_version}' +def abv_job_id_all_project_ci(editor_name): + return f'all_project_ci_{editor_name}' -def abv_job_id_all_smoke_tests(editor_version): - return f'all_smoke_tests_{editor_version}' +def abv_job_id_all_project_ci_nightly(editor_name): + return f'all_project_ci_nightly_{editor_name}' -def abv_job_id_trunk_verification(editor_version): - return f'trunk_verification_{editor_version}' +def abv_job_id_trunk_verification(editor_name): + return f'trunk_verification_{editor_name}' # preview publish specific diff --git a/.yamato/ruamel/jobs/shared/utr_utils.py b/.yamato/ruamel/jobs/shared/utr_utils.py index c411bc880c7..74717e06cb1 100644 --- a/.yamato/ruamel/jobs/shared/utr_utils.py +++ b/.yamato/ruamel/jobs/shared/utr_utils.py @@ -7,7 +7,8 @@ def utr_playmode_flags(suite='playmode', testproject='.', editor_location='.Edit f'--suite={suite}', f'--testproject={testproject}', f'--editor-location={editor_location}', - f'--artifacts_path={artifacts_path}' + f'--artifacts_path={artifacts_path}', + f'--reruncount=2' ] return [f for f in flags if f] @@ -20,7 +21,8 @@ def utr_editmode_flags(suite='editor', platform='editmode', testproject='.', edi f'--platform={platform}', f'--testproject={testproject}', f'--editor-location={editor_location}', - f'--artifacts_path={artifacts_path}' + f'--artifacts_path={artifacts_path}', + f'--reruncount=2' ] return [f for f in flags if f] @@ -33,7 +35,8 @@ def utr_standalone_not_split_flags(platform_spec, suite='playmode', platform='St f'--platform={platform}{platform_spec}', f'--artifacts_path={artifacts_path}', f'--testproject={testproject}', - f'--editor-location={editor_location}' + f'--editor-location={editor_location}', + f'--reruncount=2' ] return [f for f in flags if f] @@ -46,7 +49,8 @@ def utr_standalone_split_flags(platform_spec, suite='playmode', platform='Standa f'--platform={platform}{platform_spec}', f'--artifacts_path={artifacts_path}', f'--player-load-path={player_load_path}' if player_load_path!=None else '', - f'--player-connection-ip={player_conn_ip}' if player_conn_ip!=None else '' + f'--player-connection-ip={player_conn_ip}' if player_conn_ip!=None else '', + f'--reruncount=2' ] return [f for f in flags if f] diff --git a/.yamato/ruamel/jobs/shared/yml_job.py b/.yamato/ruamel/jobs/shared/yml_job.py index b6302b0fdeb..2e0472024ca 100644 --- a/.yamato/ruamel/jobs/shared/yml_job.py +++ b/.yamato/ruamel/jobs/shared/yml_job.py @@ -40,10 +40,17 @@ def add_dependencies(self, dependencies): existing_dep = list(self.yml['dependencies']) existing_dep.extend(dependencies) self.yml['dependencies'] = existing_dep + + def replace_dependency(self, old_dep, new_dep): + self.yml['dependencies'][old_dep] = self.yml['dependencies'][new_dep] + def add_commands(self, commands): self.yml['commands'] = commands + def allow_failure(self): + self.yml['allow_failure'] = True + def add_var_custom_revision(self, editor_version): if editor_version == 'CUSTOM-REVISION': self.yml['variables']['CUSTOM_REVISION'] = 'custom_revision_not_set' @@ -58,6 +65,9 @@ def add_var_custom(self, var_key, var_value): # used by editor. allows to set ot def add_artifacts_test_results(self): self.yml['artifacts']['logs']['paths'].append(dss(PATH_TEST_RESULTS_padded)) + def add_artifacts_project_logs(self, project_folder): + self.yml['artifacts']['logs']['paths'].append(dss(f'TestProjects/{project_folder}/Logs/*.log')) + def add_artifacts_players(self): self.yml['artifacts']['players']['paths'].append(dss(PATH_PLAYERS_padded)) diff --git a/.yamato/ruamel/jobs/templates/template_test.py b/.yamato/ruamel/jobs/templates/template_test.py index bf43487fa04..ae4f6a004dc 100644 --- a/.yamato/ruamel/jobs/templates/template_test.py +++ b/.yamato/ruamel/jobs/templates/template_test.py @@ -1,32 +1,34 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss from ..shared.namer import * -from ..shared.constants import PATH_UNITY_REVISION, NPM_UPMCI_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL, PATH_PACKAGES_temp +from ..shared.constants import PATH_UNITY_REVISION, NPM_UPMCI_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL, PATH_PACKAGES_temp, get_editor_revision,get_unity_downloader_cli_cmd from ..shared.yml_job import YMLJob class Template_TestJob(): def __init__(self, template, platform, editor): - self.job_id = template_job_id_test(template["id"],platform["os"],editor["version"]) + self.job_id = template_job_id_test(template["id"],platform["os"],editor["name"]) self.yml = self.get_job_definition(template, platform, editor).get_yml() def get_job_definition(self, template, platform, editor): # define dependencies - dependencies = [f'{editor_filepath()}#{editor_job_id(editor["version"], platform["os"]) }'] - dependencies.extend([f'{templates_filepath()}#{template_job_id_pack(template["id"])}']) - dependencies.extend([f'{packages_filepath()}#{package_job_id_pack(dep)}' for dep in template["dependencies"]]) + dependencies = [f'{templates_filepath()}#{template_job_id_pack(template["id"])}'] + dependencies.extend([f'{packages_filepath()}#{package_job_id_pack(dep)}' for dep in template["dependencies"]]) + if not editor['editor_pinning']: + dependencies.extend([f'{editor_priming_filepath()}#{editor_job_id(editor["name"], platform["os"]) }']) - # define commands commands = [ f'npm install upm-ci-utils@stable -g --registry {NPM_UPMCI_INSTALL_URL}', f'pip install unity-downloader-cli --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade', - f'unity-downloader-cli --source-file {PATH_UNITY_REVISION} -c editor --wait --published-only'] + f'unity-downloader-cli {get_unity_downloader_cli_cmd(editor,platform["os"])} -c editor --wait --published-only'] + if platform["os"].lower() == 'windows': commands.append(f'for /r {PATH_PACKAGES_temp} %%x in (*.tgz) do copy %%x upm-ci~\packages') elif platform["os"].lower() == 'macos': commands.append(f'cp {PATH_PACKAGES_temp}/**/upm-ci~/packages/*.tgz upm-ci~/packages') + if template.get('hascodependencies', None) is not None: commands.append(platform["copycmd"]) commands.append(f'upm-ci template test -u {platform["editorpath"]} --project-path {template["packagename"]}') @@ -34,7 +36,7 @@ def get_job_definition(self, template, platform, editor): # construct job job = YMLJob() - job.set_name(f'Test { template["name"] } {platform["name"]} {editor["version"]}') + job.set_name(f'Test { template["name"] } {platform["name"]} {editor["name"]}') job.set_agent(platform['agent_package']) job.add_dependencies(dependencies) job.add_commands(commands) diff --git a/.yamato/ruamel/jobs/templates/template_test_dependencies.py b/.yamato/ruamel/jobs/templates/template_test_dependencies.py index 32f541d54de..98996055821 100644 --- a/.yamato/ruamel/jobs/templates/template_test_dependencies.py +++ b/.yamato/ruamel/jobs/templates/template_test_dependencies.py @@ -1,32 +1,34 @@ from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss from ..shared.namer import * -from ..shared.constants import PATH_UNITY_REVISION, NPM_UPMCI_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL, PATH_PACKAGES_temp +from ..shared.constants import PATH_UNITY_REVISION, NPM_UPMCI_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL, get_unity_downloader_cli_cmd, PATH_PACKAGES_temp from ..shared.yml_job import YMLJob class Template_TestDependenciesJob(): def __init__(self, template, platform, editor): - self.job_id = template_job_id_test_dependencies(template["id"],platform["os"],editor["version"]) + self.job_id = template_job_id_test_dependencies(template["id"],platform["os"],editor["name"]) self.yml = self.get_job_definition(template,platform, editor).get_yml() def get_job_definition(yml, template, platform, editor): # define dependencies - dependencies = [f'{editor_filepath()}#{editor_job_id(editor["version"], platform["os"]) }'] - dependencies.extend([f'{templates_filepath()}#{template_job_id_pack(template["id"])}']) + dependencies = [f'{templates_filepath()}#{template_job_id_pack(template["id"])}'] dependencies.extend([f'{packages_filepath()}#{package_job_id_pack(dep)}' for dep in template["dependencies"]]) - + if not editor["editor_pinning"]: + dependencies.extend([f'{editor_priming_filepath()}#{editor_job_id(editor["name"], platform["os"]) }']) # define commands commands = [ f'npm install upm-ci-utils@stable -g --registry {NPM_UPMCI_INSTALL_URL}', f'pip install unity-downloader-cli --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade', - f'unity-downloader-cli --source-file {PATH_UNITY_REVISION} -c editor --wait --published-only'] + f'unity-downloader-cli {get_unity_downloader_cli_cmd(editor, platform["os"])} -c editor --wait --published-only'] + if platform["os"].lower() == 'windows': commands.append(f'for /r {PATH_PACKAGES_temp} %%x in (*.tgz) do copy %%x upm-ci~\packages') elif platform["os"].lower() == 'macos': commands.append(f'cp {PATH_PACKAGES_temp}/**/upm-ci~/packages/*.tgz upm-ci~/packages') + if template.get('hascodependencies', None) is not None: commands.append(platform["copycmd"]) commands.append(f'upm-ci template test -u {platform["editorpath"]} --type updated-dependencies-tests --project-path {template["packagename"]}') @@ -34,7 +36,7 @@ def get_job_definition(yml, template, platform, editor): # construct job job = YMLJob() - job.set_name(f'Test { template["name"] } {platform["name"]} {editor["version"]} - dependencies') + job.set_name(f'Test { template["name"] } {platform["name"]} {editor["name"]} - dependencies') job.set_agent(platform['agent_package']) job.add_dependencies(dependencies) job.add_commands(commands) diff --git a/.yamato/ruamel/jobs/templates/test_all.py b/.yamato/ruamel/jobs/templates/test_all.py index 20a90466edc..3df2444abe7 100644 --- a/.yamato/ruamel/jobs/templates/test_all.py +++ b/.yamato/ruamel/jobs/templates/test_all.py @@ -6,7 +6,7 @@ class Template_AllTemplateCiJob(): def __init__(self, templates, agent, platforms, editor): - self.job_id = template_job_id_test_all(editor["version"]) + self.job_id = template_job_id_test_all(editor["name"]) self.yml = self.get_job_definition(templates, agent, platforms, editor).get_yml() @@ -16,12 +16,12 @@ def get_job_definition(self, templates, agent, platforms, editor): dependencies = [] for platform in platforms: for template in templates: - dependencies.append(f'{templates_filepath()}#{template_job_id_test(template["id"],platform["os"],editor["version"])}') - dependencies.append(f'{templates_filepath()}#{template_job_id_test_dependencies(template["id"],platform["os"],editor["version"])}') + dependencies.append(f'{templates_filepath()}#{template_job_id_test(template["id"],platform["os"],editor["name"])}') + dependencies.append(f'{templates_filepath()}#{template_job_id_test_dependencies(template["id"],platform["os"],editor["name"])}') # construct job job = YMLJob() - job.set_name(f'Pack and test all templates - { editor["version"] }') + job.set_name(f'Pack and test all templates - { editor["name"] }') job.set_agent(agent) job.add_dependencies(dependencies) job.add_commands([ diff --git a/.yamato/ruamel/metafile_parser.py b/.yamato/ruamel/metafile_parser.py index 41284bd7e1a..4ab0919d41d 100644 --- a/.yamato/ruamel/metafile_parser.py +++ b/.yamato/ruamel/metafile_parser.py @@ -1,19 +1,32 @@ from copy import deepcopy +import json -def format_metafile(metafile, shared, unfold_agents_root_keys=[], unfold_test_platforms_root_keys=[]): +def format_metafile(metafile, shared, latest_editor_versions, unfold_agents_root_keys=[], unfold_test_platforms_root_keys=[]): '''Formats the metafile by retrieving all missing information from the shared metafile. This includes unfolding platform details, agent aliases etc.''' - metafile['editors'] = _get_editors(metafile, shared) - metafile['target_editor'] = shared['target_editor'] - metafile['target_branch'] = shared['target_branch'] + metafile['editors'] = _get_editors(metafile, shared, latest_editor_versions) + metafile['target_editor'] = metafile.get('target_editor', shared.get('target_editor')) + metafile['target_branch'] = metafile.get('target_branch', shared.get('target_branch')) + metafile['target_branch_editor_ci'] = metafile.get('target_branch_editor_ci', shared.get('target_branch_editor_ci')) metafile['platforms'] = _unfold_platforms(metafile, shared) metafile = _unfold_individual_agents(metafile, shared, root_keys=unfold_agents_root_keys) metafile = _unfold_test_platforms(metafile, shared, root_keys=unfold_test_platforms_root_keys) return metafile -def _get_editors(metafile, shared): +def _get_editors(metafile, shared, latest_editor_versions): '''Retrieves the editors from shared metafile, if not overriden by 'override_editors' in metafile.''' - override_editors = metafile.get("override_editors", None) - return override_editors if override_editors is not None else shared['editors'] + editors = shared['editors'] + for editor in editors: + if editor["editor_pinning"]: + editor['revisions'] = {} + revisions = [{k:v} for k,v in latest_editor_versions[editor['track']]['editor_versions'].items() if str(editor['track']) in k] # get all revisions for this track + for rev in revisions: + for k,v in rev.items(): # TODO loops over the single dict value, see if there is a better way + editor['revisions'][k] = v + + #print(json.dumps(editors, indent=2)) + return editors + + def _unfold_individual_agents(metafile, shared, root_keys=[]): '''Unfolds all agents by their alias names corresponding to 'non_project_agents' in the shared metafile. @@ -100,4 +113,4 @@ def replace_test_platforms(target_dict): for root_key in root_keys: metafile[root_key] = replace_test_platforms(metafile[root_key]) - return metafile + return metafile \ No newline at end of file diff --git a/.yamato/shadergraph-linux-openglcore.yml b/.yamato/shadergraph-linux-openglcore.yml index e94ff0c8943..72da0bb0108 100644 --- a/.yamato/shadergraph-linux-openglcore.yml +++ b/.yamato/shadergraph-linux-openglcore.yml @@ -11,20 +11,21 @@ ShaderGraph_Linux_OpenGLCore_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision ShaderGraph_Linux_OpenGLCore_editmode_2020.1: name: ShaderGraph on Linux_OpenGLCore_editmode on version 2020.1 agent: @@ -33,20 +34,21 @@ ShaderGraph_Linux_OpenGLCore_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision ShaderGraph_Linux_OpenGLCore_playmode_fast-2020.1: name: ShaderGraph on Linux_OpenGLCore_playmode on version fast-2020.1 agent: @@ -55,20 +57,21 @@ ShaderGraph_Linux_OpenGLCore_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision ShaderGraph_Linux_OpenGLCore_editmode_fast-2020.1: name: ShaderGraph on Linux_OpenGLCore_editmode on version fast-2020.1 agent: @@ -77,20 +80,21 @@ ShaderGraph_Linux_OpenGLCore_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision ShaderGraph_Linux_OpenGLCore_playmode_CUSTOM-REVISION: name: ShaderGraph on Linux_OpenGLCore_playmode on version CUSTOM-REVISION agent: @@ -100,20 +104,21 @@ ShaderGraph_Linux_OpenGLCore_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always ShaderGraph_Linux_OpenGLCore_editmode_CUSTOM-REVISION: name: ShaderGraph on Linux_OpenGLCore_editmode on version CUSTOM-REVISION agent: @@ -123,17 +128,18 @@ ShaderGraph_Linux_OpenGLCore_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/shadergraph-linux-vulkan.yml b/.yamato/shadergraph-linux-vulkan.yml index 7a3efd19ebf..b9cd9973028 100644 --- a/.yamato/shadergraph-linux-vulkan.yml +++ b/.yamato/shadergraph-linux-vulkan.yml @@ -11,20 +11,47 @@ ShaderGraph_Linux_Vulkan_Standalone_2020.1: 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 --output TestProjects/ShaderGraph/utr + - chmod +x TestProjects/ShaderGraph/utr + - cd TestProjects/ShaderGraph && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision + - path: .yamato/shadergraph-linux-vulkan.yml#Build_ShaderGraph_Linux_Vulkan_Player_2020.1 rerun: on-new-revision + skip_checkout: true +Build_ShaderGraph_Linux_Vulkan_Player_2020.1: + name: Build ShaderGraph on Linux_Vulkan_Player on version 2020.1 + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision ShaderGraph_Linux_Vulkan_playmode_2020.1: name: ShaderGraph on Linux_Vulkan_playmode on version 2020.1 agent: @@ -33,20 +60,21 @@ ShaderGraph_Linux_Vulkan_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision ShaderGraph_Linux_Vulkan_editmode_2020.1: name: ShaderGraph on Linux_Vulkan_editmode on version 2020.1 agent: @@ -55,20 +83,21 @@ ShaderGraph_Linux_Vulkan_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision ShaderGraph_Linux_Vulkan_Standalone_fast-2020.1: name: ShaderGraph on Linux_Vulkan_Standalone on version fast-2020.1 agent: @@ -77,20 +106,47 @@ ShaderGraph_Linux_Vulkan_Standalone_fast-2020.1: 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 --output TestProjects/ShaderGraph/utr + - chmod +x TestProjects/ShaderGraph/utr + - cd TestProjects/ShaderGraph && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux rerun: on-new-revision + - path: .yamato/shadergraph-linux-vulkan.yml#Build_ShaderGraph_Linux_Vulkan_Player_fast-2020.1 + rerun: on-new-revision + skip_checkout: true +Build_ShaderGraph_Linux_Vulkan_Player_fast-2020.1: + name: Build ShaderGraph on Linux_Vulkan_Player on version fast-2020.1 + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision ShaderGraph_Linux_Vulkan_playmode_fast-2020.1: name: ShaderGraph on Linux_Vulkan_playmode on version fast-2020.1 agent: @@ -99,20 +155,21 @@ ShaderGraph_Linux_Vulkan_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision ShaderGraph_Linux_Vulkan_editmode_fast-2020.1: name: ShaderGraph on Linux_Vulkan_editmode on version fast-2020.1 agent: @@ -121,20 +178,21 @@ ShaderGraph_Linux_Vulkan_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision ShaderGraph_Linux_Vulkan_Standalone_CUSTOM-REVISION: name: ShaderGraph on Linux_Vulkan_Standalone on version CUSTOM-REVISION agent: @@ -144,20 +202,48 @@ ShaderGraph_Linux_Vulkan_Standalone_CUSTOM-REVISION: 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 --output TestProjects/ShaderGraph/utr + - chmod +x TestProjects/ShaderGraph/utr + - cd TestProjects/ShaderGraph && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux rerun: always + - path: .yamato/shadergraph-linux-vulkan.yml#Build_ShaderGraph_Linux_Vulkan_Player_CUSTOM-REVISION + rerun: always + skip_checkout: true +Build_ShaderGraph_Linux_Vulkan_Player_CUSTOM-REVISION: + name: Build ShaderGraph on Linux_Vulkan_Player on version CUSTOM-REVISION + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always ShaderGraph_Linux_Vulkan_playmode_CUSTOM-REVISION: name: ShaderGraph on Linux_Vulkan_playmode on version CUSTOM-REVISION agent: @@ -167,20 +253,21 @@ ShaderGraph_Linux_Vulkan_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always ShaderGraph_Linux_Vulkan_editmode_CUSTOM-REVISION: name: ShaderGraph on Linux_Vulkan_editmode on version CUSTOM-REVISION agent: @@ -190,17 +277,18 @@ ShaderGraph_Linux_Vulkan_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/shadergraph-osx-metal.yml b/.yamato/shadergraph-osx-metal.yml index 412fdd017ea..f5c6157e907 100644 --- a/.yamato/shadergraph-osx-metal.yml +++ b/.yamato/shadergraph-osx-metal.yml @@ -11,19 +11,16 @@ ShaderGraph_OSX_Metal_Standalone_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/ShaderGraph/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ @@ -32,6 +29,10 @@ ShaderGraph_OSX_Metal_Standalone_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision ShaderGraph_OSX_Metal_playmode_2020.1: name: ShaderGraph on OSX_Metal_playmode on version 2020.1 agent: @@ -40,19 +41,16 @@ ShaderGraph_OSX_Metal_playmode_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/ShaderGraph/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ @@ -61,35 +59,10 @@ ShaderGraph_OSX_Metal_playmode_2020.1: logs: paths: - "**/test-results/**" -ShaderGraph_OSX_Metal_editmode_2020.1: - name: ShaderGraph on OSX_Metal_editmode on version 2020.1 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + - "TestProjects/ShaderGraph/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos rerun: on-new-revision - commands: - - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - - chmod +x TestProjects/ShaderGraph/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - - |5- - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=editor --platform=editmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results" - UTR_RESULT=$? - mkdir -p TestProjects/ShaderGraph/test-results/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ - exit $UTR_RESULT - artifacts: - logs: - paths: - - "**/test-results/**" ShaderGraph_OSX_Metal_Standalone_fast-2020.1: name: ShaderGraph on OSX_Metal_Standalone on version fast-2020.1 agent: @@ -98,19 +71,16 @@ ShaderGraph_OSX_Metal_Standalone_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/ShaderGraph/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ @@ -119,6 +89,10 @@ ShaderGraph_OSX_Metal_Standalone_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision ShaderGraph_OSX_Metal_playmode_fast-2020.1: name: ShaderGraph on OSX_Metal_playmode on version fast-2020.1 agent: @@ -127,19 +101,16 @@ ShaderGraph_OSX_Metal_playmode_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/ShaderGraph/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ @@ -148,35 +119,10 @@ ShaderGraph_OSX_Metal_playmode_fast-2020.1: logs: paths: - "**/test-results/**" -ShaderGraph_OSX_Metal_editmode_fast-2020.1: - name: ShaderGraph on OSX_Metal_editmode on version fast-2020.1 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + - "TestProjects/ShaderGraph/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos rerun: on-new-revision - commands: - - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - - chmod +x TestProjects/ShaderGraph/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - - |5- - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=editor --platform=editmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results" - UTR_RESULT=$? - mkdir -p TestProjects/ShaderGraph/test-results/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ - exit $UTR_RESULT - artifacts: - logs: - paths: - - "**/test-results/**" ShaderGraph_OSX_Metal_Standalone_CUSTOM-REVISION: name: ShaderGraph on OSX_Metal_Standalone on version CUSTOM-REVISION agent: @@ -186,19 +132,16 @@ ShaderGraph_OSX_Metal_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/ShaderGraph/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ @@ -207,6 +150,10 @@ ShaderGraph_OSX_Metal_Standalone_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always ShaderGraph_OSX_Metal_playmode_CUSTOM-REVISION: name: ShaderGraph on OSX_Metal_playmode on version CUSTOM-REVISION agent: @@ -216,19 +163,16 @@ ShaderGraph_OSX_Metal_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/ShaderGraph/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ @@ -237,33 +181,7 @@ ShaderGraph_OSX_Metal_playmode_CUSTOM-REVISION: logs: paths: - "**/test-results/**" -ShaderGraph_OSX_Metal_editmode_CUSTOM-REVISION: - name: ShaderGraph on OSX_Metal_editmode on version CUSTOM-REVISION - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: custom_revision_not_set + - "TestProjects/ShaderGraph/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos rerun: always - commands: - - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - - chmod +x TestProjects/ShaderGraph/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - - |5- - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=editor --platform=editmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results" - UTR_RESULT=$? - mkdir -p TestProjects/ShaderGraph/test-results/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ - exit $UTR_RESULT - artifacts: - logs: - paths: - - "**/test-results/**" diff --git a/.yamato/shadergraph-osx-openglcore.yml b/.yamato/shadergraph-osx-openglcore.yml index d0e4b3ce13e..62844db0b33 100644 --- a/.yamato/shadergraph-osx-openglcore.yml +++ b/.yamato/shadergraph-osx-openglcore.yml @@ -11,19 +11,20 @@ ShaderGraph_OSX_OpenGLCore_playmode_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/ShaderGraph && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision ShaderGraph_OSX_OpenGLCore_editmode_2020.1: name: ShaderGraph on OSX_OpenGLCore_editmode on version 2020.1 agent: @@ -32,19 +33,20 @@ ShaderGraph_OSX_OpenGLCore_editmode_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/ShaderGraph && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision ShaderGraph_OSX_OpenGLCore_playmode_fast-2020.1: name: ShaderGraph on OSX_OpenGLCore_playmode on version fast-2020.1 agent: @@ -53,19 +55,20 @@ ShaderGraph_OSX_OpenGLCore_playmode_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/ShaderGraph && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision ShaderGraph_OSX_OpenGLCore_editmode_fast-2020.1: name: ShaderGraph on OSX_OpenGLCore_editmode on version fast-2020.1 agent: @@ -74,19 +77,20 @@ ShaderGraph_OSX_OpenGLCore_editmode_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/ShaderGraph && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision ShaderGraph_OSX_OpenGLCore_playmode_CUSTOM-REVISION: name: ShaderGraph on OSX_OpenGLCore_playmode on version CUSTOM-REVISION agent: @@ -96,19 +100,20 @@ ShaderGraph_OSX_OpenGLCore_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/ShaderGraph && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always ShaderGraph_OSX_OpenGLCore_editmode_CUSTOM-REVISION: name: ShaderGraph on OSX_OpenGLCore_editmode on version CUSTOM-REVISION agent: @@ -118,16 +123,17 @@ ShaderGraph_OSX_OpenGLCore_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/ShaderGraph && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always diff --git a/.yamato/shadergraph-win-dx11.yml b/.yamato/shadergraph-win-dx11.yml index 9812aa3e380..26eb01e9925 100644 --- a/.yamato/shadergraph-win-dx11.yml +++ b/.yamato/shadergraph-win-dx11.yml @@ -11,18 +11,19 @@ ShaderGraph_Win_DX11_Standalone_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/shadergraph-win-dx11.yml#Build_ShaderGraph_Win_DX11_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - - cd TestProjects/ShaderGraph && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/ShaderGraph && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/shadergraph-win-dx11.yml#Build_ShaderGraph_Win_DX11_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_ShaderGraph_Win_DX11_Player_2020.1: name: Build ShaderGraph on Win_DX11_Player on version 2020.1 @@ -32,9 +33,6 @@ Build_ShaderGraph_Win_DX11_Player_2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -44,9 +42,13 @@ Build_ShaderGraph_Win_DX11_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision ShaderGraph_Win_DX11_playmode_2020.1: name: ShaderGraph on Win_DX11_playmode on version 2020.1 agent: @@ -55,18 +57,19 @@ ShaderGraph_Win_DX11_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/ShaderGraph && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision ShaderGraph_Win_DX11_editmode_2020.1: name: ShaderGraph on Win_DX11_editmode on version 2020.1 agent: @@ -75,18 +78,19 @@ ShaderGraph_Win_DX11_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/ShaderGraph && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision ShaderGraph_Win_DX11_Standalone_fast-2020.1: name: ShaderGraph on Win_DX11_Standalone on version fast-2020.1 agent: @@ -95,18 +99,19 @@ ShaderGraph_Win_DX11_Standalone_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/shadergraph-win-dx11.yml#Build_ShaderGraph_Win_DX11_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - - cd TestProjects/ShaderGraph && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/ShaderGraph && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/shadergraph-win-dx11.yml#Build_ShaderGraph_Win_DX11_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_ShaderGraph_Win_DX11_Player_fast-2020.1: name: Build ShaderGraph on Win_DX11_Player on version fast-2020.1 @@ -116,9 +121,6 @@ Build_ShaderGraph_Win_DX11_Player_fast-2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -128,9 +130,13 @@ Build_ShaderGraph_Win_DX11_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision ShaderGraph_Win_DX11_playmode_fast-2020.1: name: ShaderGraph on Win_DX11_playmode on version fast-2020.1 agent: @@ -139,18 +145,19 @@ ShaderGraph_Win_DX11_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/ShaderGraph && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision ShaderGraph_Win_DX11_editmode_fast-2020.1: name: ShaderGraph on Win_DX11_editmode on version fast-2020.1 agent: @@ -159,18 +166,19 @@ ShaderGraph_Win_DX11_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/ShaderGraph && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision ShaderGraph_Win_DX11_Standalone_CUSTOM-REVISION: name: ShaderGraph on Win_DX11_Standalone on version CUSTOM-REVISION agent: @@ -180,18 +188,19 @@ ShaderGraph_Win_DX11_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/shadergraph-win-dx11.yml#Build_ShaderGraph_Win_DX11_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - - cd TestProjects/ShaderGraph && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/ShaderGraph && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/shadergraph-win-dx11.yml#Build_ShaderGraph_Win_DX11_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_ShaderGraph_Win_DX11_Player_CUSTOM-REVISION: name: Build ShaderGraph on Win_DX11_Player on version CUSTOM-REVISION @@ -202,9 +211,6 @@ Build_ShaderGraph_Win_DX11_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -214,9 +220,13 @@ Build_ShaderGraph_Win_DX11_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always ShaderGraph_Win_DX11_playmode_CUSTOM-REVISION: name: ShaderGraph on Win_DX11_playmode on version CUSTOM-REVISION agent: @@ -226,18 +236,19 @@ ShaderGraph_Win_DX11_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/ShaderGraph && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always ShaderGraph_Win_DX11_editmode_CUSTOM-REVISION: name: ShaderGraph on Win_DX11_editmode on version CUSTOM-REVISION agent: @@ -247,15 +258,16 @@ ShaderGraph_Win_DX11_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/ShaderGraph && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/shadergraph-win-vulkan.yml b/.yamato/shadergraph-win-vulkan.yml index 82e422c9672..4fb4a10a3e7 100644 --- a/.yamato/shadergraph-win-vulkan.yml +++ b/.yamato/shadergraph-win-vulkan.yml @@ -11,18 +11,19 @@ ShaderGraph_Win_Vulkan_Standalone_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/shadergraph-win-vulkan.yml#Build_ShaderGraph_Win_Vulkan_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - - cd TestProjects/ShaderGraph && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/ShaderGraph && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/shadergraph-win-vulkan.yml#Build_ShaderGraph_Win_Vulkan_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_ShaderGraph_Win_Vulkan_Player_2020.1: name: Build ShaderGraph on Win_Vulkan_Player on version 2020.1 @@ -32,9 +33,6 @@ Build_ShaderGraph_Win_Vulkan_Player_2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -44,9 +42,13 @@ Build_ShaderGraph_Win_Vulkan_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision ShaderGraph_Win_Vulkan_playmode_2020.1: name: ShaderGraph on Win_Vulkan_playmode on version 2020.1 agent: @@ -55,18 +57,19 @@ ShaderGraph_Win_Vulkan_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision ShaderGraph_Win_Vulkan_editmode_2020.1: name: ShaderGraph on Win_Vulkan_editmode on version 2020.1 agent: @@ -75,18 +78,19 @@ ShaderGraph_Win_Vulkan_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision ShaderGraph_Win_Vulkan_Standalone_fast-2020.1: name: ShaderGraph on Win_Vulkan_Standalone on version fast-2020.1 agent: @@ -95,18 +99,19 @@ ShaderGraph_Win_Vulkan_Standalone_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/shadergraph-win-vulkan.yml#Build_ShaderGraph_Win_Vulkan_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - - cd TestProjects/ShaderGraph && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/ShaderGraph && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/shadergraph-win-vulkan.yml#Build_ShaderGraph_Win_Vulkan_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_ShaderGraph_Win_Vulkan_Player_fast-2020.1: name: Build ShaderGraph on Win_Vulkan_Player on version fast-2020.1 @@ -116,9 +121,6 @@ Build_ShaderGraph_Win_Vulkan_Player_fast-2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -128,9 +130,13 @@ Build_ShaderGraph_Win_Vulkan_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision ShaderGraph_Win_Vulkan_playmode_fast-2020.1: name: ShaderGraph on Win_Vulkan_playmode on version fast-2020.1 agent: @@ -139,18 +145,19 @@ ShaderGraph_Win_Vulkan_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision ShaderGraph_Win_Vulkan_editmode_fast-2020.1: name: ShaderGraph on Win_Vulkan_editmode on version fast-2020.1 agent: @@ -159,18 +166,19 @@ ShaderGraph_Win_Vulkan_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision ShaderGraph_Win_Vulkan_Standalone_CUSTOM-REVISION: name: ShaderGraph on Win_Vulkan_Standalone on version CUSTOM-REVISION agent: @@ -180,18 +188,19 @@ ShaderGraph_Win_Vulkan_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/shadergraph-win-vulkan.yml#Build_ShaderGraph_Win_Vulkan_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - - cd TestProjects/ShaderGraph && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/ShaderGraph && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/shadergraph-win-vulkan.yml#Build_ShaderGraph_Win_Vulkan_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_ShaderGraph_Win_Vulkan_Player_CUSTOM-REVISION: name: Build ShaderGraph on Win_Vulkan_Player on version CUSTOM-REVISION @@ -202,9 +211,6 @@ Build_ShaderGraph_Win_Vulkan_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -214,9 +220,13 @@ Build_ShaderGraph_Win_Vulkan_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always ShaderGraph_Win_Vulkan_playmode_CUSTOM-REVISION: name: ShaderGraph on Win_Vulkan_playmode on version CUSTOM-REVISION agent: @@ -226,18 +236,19 @@ ShaderGraph_Win_Vulkan_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always ShaderGraph_Win_Vulkan_editmode_CUSTOM-REVISION: name: ShaderGraph on Win_Vulkan_editmode on version CUSTOM-REVISION agent: @@ -247,15 +258,16 @@ ShaderGraph_Win_Vulkan_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/shadergraph_stereo-win.yml b/.yamato/shadergraph_stereo-win.yml index a6ccf3e6cb1..98aaf6ca51a 100644 --- a/.yamato/shadergraph_stereo-win.yml +++ b/.yamato/shadergraph_stereo-win.yml @@ -11,18 +11,19 @@ ShaderGraph_Stereo_Win_Standalone_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/shadergraph_stereo-win.yml#Build_ShaderGraph_Stereo_Win_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraphUniversalStereo/utr.bat - - cd TestProjects/ShaderGraphUniversalStereo && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/ShaderGraphUniversalStereo && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraphUniversalStereo/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/shadergraph_stereo-win.yml#Build_ShaderGraph_Stereo_Win_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_ShaderGraph_Stereo_Win_Player_2020.1: name: Build ShaderGraph_Stereo on Win__Player on version 2020.1 @@ -32,9 +33,6 @@ Build_ShaderGraph_Stereo_Win_Player_2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraphUniversalStereo/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -44,9 +42,13 @@ Build_ShaderGraph_Stereo_Win_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraphUniversalStereo/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision ShaderGraph_Stereo_Win_editmode_2020.1: name: ShaderGraph_Stereo on Win__editmode on version 2020.1 agent: @@ -55,18 +57,19 @@ ShaderGraph_Stereo_Win_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraphUniversalStereo/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraphUniversalStereo && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraphUniversalStereo && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/ShaderGraphUniversalStereo && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraphUniversalStereo/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision ShaderGraph_Stereo_Win_Standalone_fast-2020.1: name: ShaderGraph_Stereo on Win__Standalone on version fast-2020.1 agent: @@ -75,18 +78,19 @@ ShaderGraph_Stereo_Win_Standalone_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/shadergraph_stereo-win.yml#Build_ShaderGraph_Stereo_Win_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraphUniversalStereo/utr.bat - - cd TestProjects/ShaderGraphUniversalStereo && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/ShaderGraphUniversalStereo && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraphUniversalStereo/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/shadergraph_stereo-win.yml#Build_ShaderGraph_Stereo_Win_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_ShaderGraph_Stereo_Win_Player_fast-2020.1: name: Build ShaderGraph_Stereo on Win__Player on version fast-2020.1 @@ -96,9 +100,6 @@ Build_ShaderGraph_Stereo_Win_Player_fast-2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraphUniversalStereo/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -108,9 +109,13 @@ Build_ShaderGraph_Stereo_Win_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraphUniversalStereo/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision ShaderGraph_Stereo_Win_editmode_fast-2020.1: name: ShaderGraph_Stereo on Win__editmode on version fast-2020.1 agent: @@ -119,18 +124,19 @@ ShaderGraph_Stereo_Win_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraphUniversalStereo/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraphUniversalStereo && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraphUniversalStereo && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/ShaderGraphUniversalStereo && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraphUniversalStereo/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision ShaderGraph_Stereo_Win_Standalone_CUSTOM-REVISION: name: ShaderGraph_Stereo on Win__Standalone on version CUSTOM-REVISION agent: @@ -140,18 +146,19 @@ ShaderGraph_Stereo_Win_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/shadergraph_stereo-win.yml#Build_ShaderGraph_Stereo_Win_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraphUniversalStereo/utr.bat - - cd TestProjects/ShaderGraphUniversalStereo && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/ShaderGraphUniversalStereo && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraphUniversalStereo/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/shadergraph_stereo-win.yml#Build_ShaderGraph_Stereo_Win_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_ShaderGraph_Stereo_Win_Player_CUSTOM-REVISION: name: Build ShaderGraph_Stereo on Win__Player on version CUSTOM-REVISION @@ -162,9 +169,6 @@ Build_ShaderGraph_Stereo_Win_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraphUniversalStereo/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -174,9 +178,13 @@ Build_ShaderGraph_Stereo_Win_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraphUniversalStereo/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always ShaderGraph_Stereo_Win_editmode_CUSTOM-REVISION: name: ShaderGraph_Stereo on Win__editmode on version CUSTOM-REVISION agent: @@ -186,15 +194,16 @@ ShaderGraph_Stereo_Win_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraphUniversalStereo/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraphUniversalStereo && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraphUniversalStereo && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/ShaderGraphUniversalStereo && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/ShaderGraphUniversalStereo/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/smoke_test-win-dx11.yml b/.yamato/smoke_test-win-dx11.yml new file mode 100644 index 00000000000..13d28ac4db6 --- /dev/null +++ b/.yamato/smoke_test-win-dx11.yml @@ -0,0 +1,273 @@ + +# 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 + +Smoke_Test_Win_DX11_playmode_2020.1: + name: Smoke_Test on Win_DX11_playmode on version 2020.1 + 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 -c il2cpp --wait --published-only + - cd TestProjects/SRP_SmokeTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/SRP_SmokeTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision +Smoke_Test_Win_DX11_editmode_2020.1: + name: Smoke_Test on Win_DX11_editmode on version 2020.1 + 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 -c il2cpp --wait --published-only + - cd TestProjects/SRP_SmokeTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/SRP_SmokeTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision +Smoke_Test_Win_DX11_Standalone_2020.1: + name: Smoke_Test on Win_DX11_Standalone on version 2020.1 + 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 + - cd TestProjects/SRP_SmokeTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/SRP_SmokeTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/smoke_test-win-dx11.yml#Build_Smoke_Test_Win_DX11_Player_2020.1 + rerun: on-new-revision + skip_checkout: true +Build_Smoke_Test_Win_DX11_Player_2020.1: + name: Build Smoke_Test on Win_DX11_Player on version 2020.1 + agent: + type: Unity::VM + image: sdet/gamecode_win10:stable + flavor: b1.xlarge + 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 -c il2cpp --wait --published-only + - cd TestProjects/SRP_SmokeTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildWindowsDX11Linear" + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/SRP_SmokeTest/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision +Smoke_Test_Win_DX11_playmode_fast-2020.1: + name: Smoke_Test on Win_DX11_playmode on version fast-2020.1 + 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 -c il2cpp --wait --published-only + - cd TestProjects/SRP_SmokeTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/SRP_SmokeTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision +Smoke_Test_Win_DX11_editmode_fast-2020.1: + name: Smoke_Test on Win_DX11_editmode on version fast-2020.1 + 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 -c il2cpp --wait --published-only + - cd TestProjects/SRP_SmokeTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/SRP_SmokeTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision +Smoke_Test_Win_DX11_Standalone_fast-2020.1: + name: Smoke_Test on Win_DX11_Standalone on version fast-2020.1 + 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 + - cd TestProjects/SRP_SmokeTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/SRP_SmokeTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/smoke_test-win-dx11.yml#Build_Smoke_Test_Win_DX11_Player_fast-2020.1 + rerun: on-new-revision + skip_checkout: true +Build_Smoke_Test_Win_DX11_Player_fast-2020.1: + name: Build Smoke_Test on Win_DX11_Player on version fast-2020.1 + agent: + type: Unity::VM + image: sdet/gamecode_win10:stable + flavor: b1.xlarge + 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 -c il2cpp --wait --published-only + - cd TestProjects/SRP_SmokeTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildWindowsDX11Linear" + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/SRP_SmokeTest/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision +Smoke_Test_Win_DX11_playmode_CUSTOM-REVISION: + name: Smoke_Test on Win_DX11_playmode on version 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 -c il2cpp --wait --published-only + - cd TestProjects/SRP_SmokeTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/SRP_SmokeTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always +Smoke_Test_Win_DX11_editmode_CUSTOM-REVISION: + name: Smoke_Test on Win_DX11_editmode on version 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 -c il2cpp --wait --published-only + - cd TestProjects/SRP_SmokeTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/SRP_SmokeTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always +Smoke_Test_Win_DX11_Standalone_CUSTOM-REVISION: + name: Smoke_Test on Win_DX11_Standalone on version 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 + - cd TestProjects/SRP_SmokeTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/SRP_SmokeTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/smoke_test-win-dx11.yml#Build_Smoke_Test_Win_DX11_Player_CUSTOM-REVISION + rerun: always + skip_checkout: true +Build_Smoke_Test_Win_DX11_Player_CUSTOM-REVISION: + name: Build Smoke_Test on Win_DX11_Player on version CUSTOM-REVISION + agent: + type: Unity::VM + image: sdet/gamecode_win10:stable + flavor: b1.xlarge + 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 -c il2cpp --wait --published-only + - cd TestProjects/SRP_SmokeTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildWindowsDX11Linear" + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/SRP_SmokeTest/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/universal-android-opengles3.yml b/.yamato/universal-android-opengles3.yml index a419ba40225..61b4c2d3205 100644 --- a/.yamato/universal-android-opengles3.yml +++ b/.yamato/universal-android-opengles3.yml @@ -11,11 +11,6 @@ Universal_Android_OpenGLES3_Standalone_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:android - rerun: on-new-revision - - path: .yamato/universal-android-opengles3.yml#Build_Universal_Android_OpenGLES3_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat - '%ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%' @@ -24,12 +19,18 @@ Universal_Android_OpenGLES3_Standalone_2020.1: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr --suite=playmode --platform=Android --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --editor-location=WindowsEditor --timeout=1200 + utr --suite=playmode --platform=Android --artifacts_path=test-results --player-load-path=players --reruncount=2 --scripting-backend=il2cpp --editor-location=WindowsEditor --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:android + rerun: on-new-revision + - path: .yamato/universal-android-opengles3.yml#Build_Universal_Android_OpenGLES3_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_Universal_Android_OpenGLES3_Player_2020.1: name: Build Universal on Android_OpenGLES3_Player on version 2020.1 @@ -39,9 +40,6 @@ Build_Universal_Android_OpenGLES3_Player_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:android - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -54,9 +52,13 @@ Build_Universal_Android_OpenGLES3_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:android + rerun: on-new-revision Universal_Android_OpenGLES3_Standalone_fast-2020.1: name: Universal on Android_OpenGLES3_Standalone on version fast-2020.1 agent: @@ -65,11 +67,6 @@ Universal_Android_OpenGLES3_Standalone_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:android - rerun: on-new-revision - - path: .yamato/universal-android-opengles3.yml#Build_Universal_Android_OpenGLES3_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat - '%ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%' @@ -78,12 +75,18 @@ Universal_Android_OpenGLES3_Standalone_fast-2020.1: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr --suite=playmode --platform=Android --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --editor-location=WindowsEditor --timeout=1200 + utr --suite=playmode --platform=Android --artifacts_path=test-results --player-load-path=players --reruncount=2 --scripting-backend=il2cpp --editor-location=WindowsEditor --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:android + rerun: on-new-revision + - path: .yamato/universal-android-opengles3.yml#Build_Universal_Android_OpenGLES3_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_Universal_Android_OpenGLES3_Player_fast-2020.1: name: Build Universal on Android_OpenGLES3_Player on version fast-2020.1 @@ -93,9 +96,6 @@ Build_Universal_Android_OpenGLES3_Player_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:android - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -108,9 +108,13 @@ Build_Universal_Android_OpenGLES3_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:android + rerun: on-new-revision Universal_Android_OpenGLES3_Standalone_CUSTOM-REVISION: name: Universal on Android_OpenGLES3_Standalone on version CUSTOM-REVISION agent: @@ -120,11 +124,6 @@ Universal_Android_OpenGLES3_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:android - rerun: always - - path: .yamato/universal-android-opengles3.yml#Build_Universal_Android_OpenGLES3_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat - '%ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%' @@ -133,12 +132,18 @@ Universal_Android_OpenGLES3_Standalone_CUSTOM-REVISION: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr --suite=playmode --platform=Android --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --editor-location=WindowsEditor --timeout=1200 + utr --suite=playmode --platform=Android --artifacts_path=test-results --player-load-path=players --reruncount=2 --scripting-backend=il2cpp --editor-location=WindowsEditor --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:android + rerun: always + - path: .yamato/universal-android-opengles3.yml#Build_Universal_Android_OpenGLES3_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_Universal_Android_OpenGLES3_Player_CUSTOM-REVISION: name: Build Universal on Android_OpenGLES3_Player on version CUSTOM-REVISION @@ -149,9 +154,6 @@ Build_Universal_Android_OpenGLES3_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:android - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -164,6 +166,10 @@ Build_Universal_Android_OpenGLES3_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:android + rerun: always diff --git a/.yamato/universal-android-vulkan.yml b/.yamato/universal-android-vulkan.yml index 28dffe6f204..45ba3f2731a 100644 --- a/.yamato/universal-android-vulkan.yml +++ b/.yamato/universal-android-vulkan.yml @@ -11,11 +11,6 @@ Universal_Android_Vulkan_Standalone_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:android - rerun: on-new-revision - - path: .yamato/universal-android-vulkan.yml#Build_Universal_Android_Vulkan_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat - '%ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%' @@ -24,12 +19,18 @@ Universal_Android_Vulkan_Standalone_2020.1: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr --suite=playmode --platform=Android --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --editor-location=WindowsEditor --timeout=1200 + utr --suite=playmode --platform=Android --artifacts_path=test-results --player-load-path=players --reruncount=2 --scripting-backend=il2cpp --editor-location=WindowsEditor --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:android + rerun: on-new-revision + - path: .yamato/universal-android-vulkan.yml#Build_Universal_Android_Vulkan_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_Universal_Android_Vulkan_Player_2020.1: name: Build Universal on Android_Vulkan_Player on version 2020.1 @@ -39,9 +40,6 @@ Build_Universal_Android_Vulkan_Player_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:android - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -54,9 +52,13 @@ Build_Universal_Android_Vulkan_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:android + rerun: on-new-revision Universal_Android_Vulkan_Standalone_fast-2020.1: name: Universal on Android_Vulkan_Standalone on version fast-2020.1 agent: @@ -65,11 +67,6 @@ Universal_Android_Vulkan_Standalone_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:android - rerun: on-new-revision - - path: .yamato/universal-android-vulkan.yml#Build_Universal_Android_Vulkan_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat - '%ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%' @@ -78,12 +75,18 @@ Universal_Android_Vulkan_Standalone_fast-2020.1: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr --suite=playmode --platform=Android --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --editor-location=WindowsEditor --timeout=1200 + utr --suite=playmode --platform=Android --artifacts_path=test-results --player-load-path=players --reruncount=2 --scripting-backend=il2cpp --editor-location=WindowsEditor --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:android + rerun: on-new-revision + - path: .yamato/universal-android-vulkan.yml#Build_Universal_Android_Vulkan_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_Universal_Android_Vulkan_Player_fast-2020.1: name: Build Universal on Android_Vulkan_Player on version fast-2020.1 @@ -93,9 +96,6 @@ Build_Universal_Android_Vulkan_Player_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:android - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -108,9 +108,13 @@ Build_Universal_Android_Vulkan_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:android + rerun: on-new-revision Universal_Android_Vulkan_Standalone_CUSTOM-REVISION: name: Universal on Android_Vulkan_Standalone on version CUSTOM-REVISION agent: @@ -120,11 +124,6 @@ Universal_Android_Vulkan_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:android - rerun: always - - path: .yamato/universal-android-vulkan.yml#Build_Universal_Android_Vulkan_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat - '%ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%' @@ -133,12 +132,18 @@ Universal_Android_Vulkan_Standalone_CUSTOM-REVISION: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr --suite=playmode --platform=Android --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --editor-location=WindowsEditor --timeout=1200 + utr --suite=playmode --platform=Android --artifacts_path=test-results --player-load-path=players --reruncount=2 --scripting-backend=il2cpp --editor-location=WindowsEditor --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:android + rerun: always + - path: .yamato/universal-android-vulkan.yml#Build_Universal_Android_Vulkan_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_Universal_Android_Vulkan_Player_CUSTOM-REVISION: name: Build Universal on Android_Vulkan_Player on version CUSTOM-REVISION @@ -149,9 +154,6 @@ Build_Universal_Android_Vulkan_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:android - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -164,6 +166,10 @@ Build_Universal_Android_Vulkan_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:android + rerun: always diff --git a/.yamato/universal-linux-openglcore.yml b/.yamato/universal-linux-openglcore.yml index 6a837e92f5a..fee58fd42b6 100644 --- a/.yamato/universal-linux-openglcore.yml +++ b/.yamato/universal-linux-openglcore.yml @@ -11,20 +11,21 @@ Universal_Linux_OpenGLCore_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision Universal_Linux_OpenGLCore_editmode_2020.1: name: Universal on Linux_OpenGLCore_editmode on version 2020.1 agent: @@ -33,20 +34,21 @@ Universal_Linux_OpenGLCore_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision Universal_Linux_OpenGLCore_playmode_fast-2020.1: name: Universal on Linux_OpenGLCore_playmode on version fast-2020.1 agent: @@ -55,20 +57,21 @@ Universal_Linux_OpenGLCore_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision Universal_Linux_OpenGLCore_editmode_fast-2020.1: name: Universal on Linux_OpenGLCore_editmode on version fast-2020.1 agent: @@ -77,20 +80,21 @@ Universal_Linux_OpenGLCore_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision Universal_Linux_OpenGLCore_playmode_CUSTOM-REVISION: name: Universal on Linux_OpenGLCore_playmode on version CUSTOM-REVISION agent: @@ -100,20 +104,21 @@ Universal_Linux_OpenGLCore_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always Universal_Linux_OpenGLCore_editmode_CUSTOM-REVISION: name: Universal on Linux_OpenGLCore_editmode on version CUSTOM-REVISION agent: @@ -123,17 +128,18 @@ Universal_Linux_OpenGLCore_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/universal-linux-vulkan.yml b/.yamato/universal-linux-vulkan.yml index 1e327c39379..8205ba31f88 100644 --- a/.yamato/universal-linux-vulkan.yml +++ b/.yamato/universal-linux-vulkan.yml @@ -11,20 +11,47 @@ Universal_Linux_Vulkan_Standalone_2020.1: 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 --output TestProjects/UniversalGraphicsTest/utr + - chmod +x TestProjects/UniversalGraphicsTest/utr + - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision + - path: .yamato/universal-linux-vulkan.yml#Build_Universal_Linux_Vulkan_Player_2020.1 rerun: on-new-revision + skip_checkout: true +Build_Universal_Linux_Vulkan_Player_2020.1: + name: Build Universal on Linux_Vulkan_Player on version 2020.1 + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision Universal_Linux_Vulkan_playmode_2020.1: name: Universal on Linux_Vulkan_playmode on version 2020.1 agent: @@ -33,20 +60,21 @@ Universal_Linux_Vulkan_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision Universal_Linux_Vulkan_editmode_2020.1: name: Universal on Linux_Vulkan_editmode on version 2020.1 agent: @@ -55,20 +83,21 @@ Universal_Linux_Vulkan_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision Universal_Linux_Vulkan_Standalone_fast-2020.1: name: Universal on Linux_Vulkan_Standalone on version fast-2020.1 agent: @@ -77,20 +106,47 @@ Universal_Linux_Vulkan_Standalone_fast-2020.1: 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 --output TestProjects/UniversalGraphicsTest/utr + - chmod +x TestProjects/UniversalGraphicsTest/utr + - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux rerun: on-new-revision + - path: .yamato/universal-linux-vulkan.yml#Build_Universal_Linux_Vulkan_Player_fast-2020.1 + rerun: on-new-revision + skip_checkout: true +Build_Universal_Linux_Vulkan_Player_fast-2020.1: + name: Build Universal on Linux_Vulkan_Player on version fast-2020.1 + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision Universal_Linux_Vulkan_playmode_fast-2020.1: name: Universal on Linux_Vulkan_playmode on version fast-2020.1 agent: @@ -99,20 +155,21 @@ Universal_Linux_Vulkan_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision Universal_Linux_Vulkan_editmode_fast-2020.1: name: Universal on Linux_Vulkan_editmode on version fast-2020.1 agent: @@ -121,20 +178,21 @@ Universal_Linux_Vulkan_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision Universal_Linux_Vulkan_Standalone_CUSTOM-REVISION: name: Universal on Linux_Vulkan_Standalone on version CUSTOM-REVISION agent: @@ -144,20 +202,48 @@ Universal_Linux_Vulkan_Standalone_CUSTOM-REVISION: 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 --output TestProjects/UniversalGraphicsTest/utr + - chmod +x TestProjects/UniversalGraphicsTest/utr + - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux rerun: always + - path: .yamato/universal-linux-vulkan.yml#Build_Universal_Linux_Vulkan_Player_CUSTOM-REVISION + rerun: always + skip_checkout: true +Build_Universal_Linux_Vulkan_Player_CUSTOM-REVISION: + name: Build Universal on Linux_Vulkan_Player on version CUSTOM-REVISION + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always Universal_Linux_Vulkan_playmode_CUSTOM-REVISION: name: Universal on Linux_Vulkan_playmode on version CUSTOM-REVISION agent: @@ -167,20 +253,21 @@ Universal_Linux_Vulkan_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always Universal_Linux_Vulkan_editmode_CUSTOM-REVISION: name: Universal on Linux_Vulkan_editmode on version CUSTOM-REVISION agent: @@ -190,17 +277,18 @@ Universal_Linux_Vulkan_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/universal-osx-metal.yml b/.yamato/universal-osx-metal.yml index 4a196bd80f5..1f065b56abe 100644 --- a/.yamato/universal-osx-metal.yml +++ b/.yamato/universal-osx-metal.yml @@ -11,19 +11,16 @@ Universal_OSX_Metal_Standalone_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/UniversalGraphicsTest/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/ @@ -32,6 +29,10 @@ Universal_OSX_Metal_Standalone_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision Universal_OSX_Metal_playmode_2020.1: name: Universal on OSX_Metal_playmode on version 2020.1 agent: @@ -40,19 +41,16 @@ Universal_OSX_Metal_playmode_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/UniversalGraphicsTest/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/ @@ -61,35 +59,10 @@ Universal_OSX_Metal_playmode_2020.1: logs: paths: - "**/test-results/**" -Universal_OSX_Metal_editmode_2020.1: - name: Universal on OSX_Metal_editmode on version 2020.1 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + - "TestProjects/UniversalGraphicsTest/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos rerun: on-new-revision - commands: - - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - - chmod +x TestProjects/UniversalGraphicsTest/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - - |5- - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=editor --platform=editmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results" - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest/test-results/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/ - exit $UTR_RESULT - artifacts: - logs: - paths: - - "**/test-results/**" Universal_OSX_Metal_playmode_XR_2020.1: name: Universal on OSX_Metal_playmode_XR on version 2020.1 agent: @@ -98,19 +71,16 @@ Universal_OSX_Metal_playmode_XR_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --extra-editor-arg="-xr-tests"" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --reruncount=2 --extra-editor-arg="-xr-tests"" UTR_RESULT=$? mkdir -p TestProjects/UniversalGraphicsTest/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/ @@ -119,6 +89,10 @@ Universal_OSX_Metal_playmode_XR_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision Universal_OSX_Metal_Standalone_fast-2020.1: name: Universal on OSX_Metal_Standalone on version fast-2020.1 agent: @@ -127,19 +101,16 @@ Universal_OSX_Metal_Standalone_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/UniversalGraphicsTest/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/ @@ -148,6 +119,10 @@ Universal_OSX_Metal_Standalone_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision Universal_OSX_Metal_playmode_fast-2020.1: name: Universal on OSX_Metal_playmode on version fast-2020.1 agent: @@ -156,19 +131,16 @@ Universal_OSX_Metal_playmode_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/UniversalGraphicsTest/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/ @@ -177,35 +149,10 @@ Universal_OSX_Metal_playmode_fast-2020.1: logs: paths: - "**/test-results/**" -Universal_OSX_Metal_editmode_fast-2020.1: - name: Universal on OSX_Metal_editmode on version fast-2020.1 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + - "TestProjects/UniversalGraphicsTest/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos rerun: on-new-revision - commands: - - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - - chmod +x TestProjects/UniversalGraphicsTest/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - - |5- - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=editor --platform=editmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results" - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest/test-results/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/ - exit $UTR_RESULT - artifacts: - logs: - paths: - - "**/test-results/**" Universal_OSX_Metal_playmode_XR_fast-2020.1: name: Universal on OSX_Metal_playmode_XR on version fast-2020.1 agent: @@ -214,19 +161,16 @@ Universal_OSX_Metal_playmode_XR_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --extra-editor-arg="-xr-tests"" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --reruncount=2 --extra-editor-arg="-xr-tests"" UTR_RESULT=$? mkdir -p TestProjects/UniversalGraphicsTest/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/ @@ -235,6 +179,10 @@ Universal_OSX_Metal_playmode_XR_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision Universal_OSX_Metal_Standalone_CUSTOM-REVISION: name: Universal on OSX_Metal_Standalone on version CUSTOM-REVISION agent: @@ -244,19 +192,16 @@ Universal_OSX_Metal_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/UniversalGraphicsTest/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/ @@ -265,6 +210,10 @@ Universal_OSX_Metal_Standalone_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always Universal_OSX_Metal_playmode_CUSTOM-REVISION: name: Universal on OSX_Metal_playmode on version CUSTOM-REVISION agent: @@ -274,19 +223,16 @@ Universal_OSX_Metal_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/UniversalGraphicsTest/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/ @@ -295,36 +241,10 @@ Universal_OSX_Metal_playmode_CUSTOM-REVISION: logs: paths: - "**/test-results/**" -Universal_OSX_Metal_editmode_CUSTOM-REVISION: - name: Universal on OSX_Metal_editmode on version CUSTOM-REVISION - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: custom_revision_not_set + - "TestProjects/UniversalGraphicsTest/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos rerun: always - commands: - - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - - chmod +x TestProjects/UniversalGraphicsTest/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - - |5- - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=editor --platform=editmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results" - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest/test-results/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/ - exit $UTR_RESULT - artifacts: - logs: - paths: - - "**/test-results/**" Universal_OSX_Metal_playmode_XR_CUSTOM-REVISION: name: Universal on OSX_Metal_playmode_XR on version CUSTOM-REVISION agent: @@ -334,19 +254,16 @@ Universal_OSX_Metal_playmode_XR_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --extra-editor-arg="-xr-tests"" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --reruncount=2 --extra-editor-arg="-xr-tests"" UTR_RESULT=$? mkdir -p TestProjects/UniversalGraphicsTest/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/ @@ -355,3 +272,7 @@ Universal_OSX_Metal_playmode_XR_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always diff --git a/.yamato/universal-osx-openglcore.yml b/.yamato/universal-osx-openglcore.yml index bb721f21851..102636247dd 100644 --- a/.yamato/universal-osx-openglcore.yml +++ b/.yamato/universal-osx-openglcore.yml @@ -11,19 +11,20 @@ Universal_OSX_OpenGLCore_playmode_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision Universal_OSX_OpenGLCore_editmode_2020.1: name: Universal on OSX_OpenGLCore_editmode on version 2020.1 agent: @@ -32,19 +33,20 @@ Universal_OSX_OpenGLCore_editmode_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/UniversalGraphicsTest && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision Universal_OSX_OpenGLCore_playmode_XR_2020.1: name: Universal on OSX_OpenGLCore_playmode_XR on version 2020.1 agent: @@ -53,19 +55,20 @@ Universal_OSX_OpenGLCore_playmode_XR_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" + - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision Universal_OSX_OpenGLCore_playmode_fast-2020.1: name: Universal on OSX_OpenGLCore_playmode on version fast-2020.1 agent: @@ -74,19 +77,20 @@ Universal_OSX_OpenGLCore_playmode_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision Universal_OSX_OpenGLCore_editmode_fast-2020.1: name: Universal on OSX_OpenGLCore_editmode on version fast-2020.1 agent: @@ -95,19 +99,20 @@ Universal_OSX_OpenGLCore_editmode_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/UniversalGraphicsTest && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision Universal_OSX_OpenGLCore_playmode_XR_fast-2020.1: name: Universal on OSX_OpenGLCore_playmode_XR on version fast-2020.1 agent: @@ -116,19 +121,20 @@ Universal_OSX_OpenGLCore_playmode_XR_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" + - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision Universal_OSX_OpenGLCore_playmode_CUSTOM-REVISION: name: Universal on OSX_OpenGLCore_playmode on version CUSTOM-REVISION agent: @@ -138,19 +144,20 @@ Universal_OSX_OpenGLCore_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always Universal_OSX_OpenGLCore_editmode_CUSTOM-REVISION: name: Universal on OSX_OpenGLCore_editmode on version CUSTOM-REVISION agent: @@ -160,19 +167,20 @@ Universal_OSX_OpenGLCore_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/UniversalGraphicsTest && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always Universal_OSX_OpenGLCore_playmode_XR_CUSTOM-REVISION: name: Universal on OSX_OpenGLCore_playmode_XR on version CUSTOM-REVISION agent: @@ -182,16 +190,17 @@ Universal_OSX_OpenGLCore_playmode_XR_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" + - cd TestProjects/UniversalGraphicsTest && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always diff --git a/.yamato/universal-win-dx11.yml b/.yamato/universal-win-dx11.yml index 5bbac01b2ec..04d4fb64789 100644 --- a/.yamato/universal-win-dx11.yml +++ b/.yamato/universal-win-dx11.yml @@ -11,19 +11,20 @@ Universal_Win_DX11_Standalone_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/universal-win-dx11.yml#Build_Universal_Win_DX11_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/universal-win-dx11.yml#Build_Universal_Win_DX11_Player_2020.1 + rerun: on-new-revision Build_Universal_Win_DX11_Player_2020.1: name: Build Universal on Win_DX11_Player on version 2020.1 agent: @@ -32,9 +33,6 @@ Build_Universal_Win_DX11_Player_2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -44,9 +42,13 @@ Build_Universal_Win_DX11_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision Universal_Win_DX11_playmode_2020.1: name: Universal on Win_DX11_playmode on version 2020.1 agent: @@ -55,18 +57,19 @@ Universal_Win_DX11_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision Universal_Win_DX11_editmode_2020.1: name: Universal on Win_DX11_editmode on version 2020.1 agent: @@ -75,18 +78,19 @@ Universal_Win_DX11_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/UniversalGraphicsTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision Universal_Win_DX11_playmode_XR_2020.1: name: Universal on Win_DX11_playmode_XR on version 2020.1 agent: @@ -95,18 +99,19 @@ Universal_Win_DX11_playmode_XR_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d11" + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision Universal_Win_DX11_Standalone_fast-2020.1: name: Universal on Win_DX11_Standalone on version fast-2020.1 agent: @@ -115,19 +120,20 @@ Universal_Win_DX11_Standalone_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/universal-win-dx11.yml#Build_Universal_Win_DX11_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/universal-win-dx11.yml#Build_Universal_Win_DX11_Player_fast-2020.1 + rerun: on-new-revision Build_Universal_Win_DX11_Player_fast-2020.1: name: Build Universal on Win_DX11_Player on version fast-2020.1 agent: @@ -136,9 +142,6 @@ Build_Universal_Win_DX11_Player_fast-2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -148,9 +151,13 @@ Build_Universal_Win_DX11_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision Universal_Win_DX11_playmode_fast-2020.1: name: Universal on Win_DX11_playmode on version fast-2020.1 agent: @@ -159,18 +166,19 @@ Universal_Win_DX11_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision Universal_Win_DX11_editmode_fast-2020.1: name: Universal on Win_DX11_editmode on version fast-2020.1 agent: @@ -179,18 +187,19 @@ Universal_Win_DX11_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/UniversalGraphicsTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision Universal_Win_DX11_playmode_XR_fast-2020.1: name: Universal on Win_DX11_playmode_XR on version fast-2020.1 agent: @@ -199,18 +208,19 @@ Universal_Win_DX11_playmode_XR_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d11" + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision Universal_Win_DX11_Standalone_CUSTOM-REVISION: name: Universal on Win_DX11_Standalone on version CUSTOM-REVISION agent: @@ -220,19 +230,20 @@ Universal_Win_DX11_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/universal-win-dx11.yml#Build_Universal_Win_DX11_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/universal-win-dx11.yml#Build_Universal_Win_DX11_Player_CUSTOM-REVISION + rerun: always Build_Universal_Win_DX11_Player_CUSTOM-REVISION: name: Build Universal on Win_DX11_Player on version CUSTOM-REVISION agent: @@ -242,9 +253,6 @@ Build_Universal_Win_DX11_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -254,9 +262,13 @@ Build_Universal_Win_DX11_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always Universal_Win_DX11_playmode_CUSTOM-REVISION: name: Universal on Win_DX11_playmode on version CUSTOM-REVISION agent: @@ -266,18 +278,19 @@ Universal_Win_DX11_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always Universal_Win_DX11_editmode_CUSTOM-REVISION: name: Universal on Win_DX11_editmode on version CUSTOM-REVISION agent: @@ -287,18 +300,19 @@ Universal_Win_DX11_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/UniversalGraphicsTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always Universal_Win_DX11_playmode_XR_CUSTOM-REVISION: name: Universal on Win_DX11_playmode_XR on version CUSTOM-REVISION agent: @@ -308,15 +322,16 @@ Universal_Win_DX11_playmode_XR_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d11" + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/universal-win-vulkan.yml b/.yamato/universal-win-vulkan.yml index d9b16032dc9..9626cac7ab3 100644 --- a/.yamato/universal-win-vulkan.yml +++ b/.yamato/universal-win-vulkan.yml @@ -11,19 +11,20 @@ Universal_Win_Vulkan_Standalone_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/universal-win-vulkan.yml#Build_Universal_Win_Vulkan_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/universal-win-vulkan.yml#Build_Universal_Win_Vulkan_Player_2020.1 + rerun: on-new-revision Build_Universal_Win_Vulkan_Player_2020.1: name: Build Universal on Win_Vulkan_Player on version 2020.1 agent: @@ -32,9 +33,6 @@ Build_Universal_Win_Vulkan_Player_2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -44,9 +42,13 @@ Build_Universal_Win_Vulkan_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision Universal_Win_Vulkan_playmode_2020.1: name: Universal on Win_Vulkan_playmode on version 2020.1 agent: @@ -55,18 +57,19 @@ Universal_Win_Vulkan_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision Universal_Win_Vulkan_editmode_2020.1: name: Universal on Win_Vulkan_editmode on version 2020.1 agent: @@ -75,18 +78,19 @@ Universal_Win_Vulkan_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision Universal_Win_Vulkan_playmode_XR_2020.1: name: Universal on Win_Vulkan_playmode_XR on version 2020.1 agent: @@ -95,18 +99,19 @@ Universal_Win_Vulkan_playmode_XR_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision Universal_Win_Vulkan_Standalone_fast-2020.1: name: Universal on Win_Vulkan_Standalone on version fast-2020.1 agent: @@ -115,19 +120,20 @@ Universal_Win_Vulkan_Standalone_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/universal-win-vulkan.yml#Build_Universal_Win_Vulkan_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/universal-win-vulkan.yml#Build_Universal_Win_Vulkan_Player_fast-2020.1 + rerun: on-new-revision Build_Universal_Win_Vulkan_Player_fast-2020.1: name: Build Universal on Win_Vulkan_Player on version fast-2020.1 agent: @@ -136,9 +142,6 @@ Build_Universal_Win_Vulkan_Player_fast-2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -148,9 +151,13 @@ Build_Universal_Win_Vulkan_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision Universal_Win_Vulkan_playmode_fast-2020.1: name: Universal on Win_Vulkan_playmode on version fast-2020.1 agent: @@ -159,18 +166,19 @@ Universal_Win_Vulkan_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision Universal_Win_Vulkan_editmode_fast-2020.1: name: Universal on Win_Vulkan_editmode on version fast-2020.1 agent: @@ -179,18 +187,19 @@ Universal_Win_Vulkan_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision Universal_Win_Vulkan_playmode_XR_fast-2020.1: name: Universal on Win_Vulkan_playmode_XR on version fast-2020.1 agent: @@ -199,18 +208,19 @@ Universal_Win_Vulkan_playmode_XR_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision Universal_Win_Vulkan_Standalone_CUSTOM-REVISION: name: Universal on Win_Vulkan_Standalone on version CUSTOM-REVISION agent: @@ -220,19 +230,20 @@ Universal_Win_Vulkan_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/universal-win-vulkan.yml#Build_Universal_Win_Vulkan_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/universal-win-vulkan.yml#Build_Universal_Win_Vulkan_Player_CUSTOM-REVISION + rerun: always Build_Universal_Win_Vulkan_Player_CUSTOM-REVISION: name: Build Universal on Win_Vulkan_Player on version CUSTOM-REVISION agent: @@ -242,9 +253,6 @@ Build_Universal_Win_Vulkan_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -254,9 +262,13 @@ Build_Universal_Win_Vulkan_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always Universal_Win_Vulkan_playmode_CUSTOM-REVISION: name: Universal on Win_Vulkan_playmode on version CUSTOM-REVISION agent: @@ -266,18 +278,19 @@ Universal_Win_Vulkan_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always Universal_Win_Vulkan_editmode_CUSTOM-REVISION: name: Universal on Win_Vulkan_editmode on version CUSTOM-REVISION agent: @@ -287,18 +300,19 @@ Universal_Win_Vulkan_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always Universal_Win_Vulkan_playmode_XR_CUSTOM-REVISION: name: Universal on Win_Vulkan_playmode_XR on version CUSTOM-REVISION agent: @@ -308,15 +322,16 @@ Universal_Win_Vulkan_playmode_XR_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-vulkan" + - cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-xr-tests" --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/universal_stereo-win.yml b/.yamato/universal_stereo-win.yml index f49ff776773..0ab0cbd931b 100644 --- a/.yamato/universal_stereo-win.yml +++ b/.yamato/universal_stereo-win.yml @@ -11,18 +11,19 @@ Universal_Stereo_Win_Standalone_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/universal_stereo-win.yml#Build_Universal_Stereo_Win_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGfxTestStereo/utr.bat - - cd TestProjects/UniversalGfxTestStereo && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/UniversalGfxTestStereo && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGfxTestStereo/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/universal_stereo-win.yml#Build_Universal_Stereo_Win_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_Universal_Stereo_Win_Player_2020.1: name: Build Universal_Stereo on Win__Player on version 2020.1 @@ -32,9 +33,6 @@ Build_Universal_Stereo_Win_Player_2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGfxTestStereo/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -44,9 +42,13 @@ Build_Universal_Stereo_Win_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGfxTestStereo/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision Universal_Stereo_Win_editmode_2020.1: name: Universal_Stereo on Win__editmode on version 2020.1 agent: @@ -55,18 +57,19 @@ Universal_Stereo_Win_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGfxTestStereo/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGfxTestStereo && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGfxTestStereo && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/UniversalGfxTestStereo && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGfxTestStereo/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision Universal_Stereo_Win_Standalone_fast-2020.1: name: Universal_Stereo on Win__Standalone on version fast-2020.1 agent: @@ -75,18 +78,19 @@ Universal_Stereo_Win_Standalone_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/universal_stereo-win.yml#Build_Universal_Stereo_Win_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGfxTestStereo/utr.bat - - cd TestProjects/UniversalGfxTestStereo && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/UniversalGfxTestStereo && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGfxTestStereo/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/universal_stereo-win.yml#Build_Universal_Stereo_Win_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_Universal_Stereo_Win_Player_fast-2020.1: name: Build Universal_Stereo on Win__Player on version fast-2020.1 @@ -96,9 +100,6 @@ Build_Universal_Stereo_Win_Player_fast-2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGfxTestStereo/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -108,9 +109,13 @@ Build_Universal_Stereo_Win_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGfxTestStereo/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision Universal_Stereo_Win_editmode_fast-2020.1: name: Universal_Stereo on Win__editmode on version fast-2020.1 agent: @@ -119,18 +124,19 @@ Universal_Stereo_Win_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGfxTestStereo/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGfxTestStereo && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGfxTestStereo && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/UniversalGfxTestStereo && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGfxTestStereo/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision Universal_Stereo_Win_Standalone_CUSTOM-REVISION: name: Universal_Stereo on Win__Standalone on version CUSTOM-REVISION agent: @@ -140,18 +146,19 @@ Universal_Stereo_Win_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/universal_stereo-win.yml#Build_Universal_Stereo_Win_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGfxTestStereo/utr.bat - - cd TestProjects/UniversalGfxTestStereo && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/UniversalGfxTestStereo && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGfxTestStereo/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/universal_stereo-win.yml#Build_Universal_Stereo_Win_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_Universal_Stereo_Win_Player_CUSTOM-REVISION: name: Build Universal_Stereo on Win__Player on version CUSTOM-REVISION @@ -162,9 +169,6 @@ Build_Universal_Stereo_Win_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGfxTestStereo/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -174,9 +178,13 @@ Build_Universal_Stereo_Win_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGfxTestStereo/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always Universal_Stereo_Win_editmode_CUSTOM-REVISION: name: Universal_Stereo on Win__editmode on version CUSTOM-REVISION agent: @@ -186,15 +194,16 @@ Universal_Stereo_Win_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGfxTestStereo/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/UniversalGfxTestStereo && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGfxTestStereo && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/UniversalGfxTestStereo && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/UniversalGfxTestStereo/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/vfx_hdrp-linux-vulkan.yml b/.yamato/vfx_hdrp-linux-vulkan.yml index 7deb9229954..24260219e5e 100644 --- a/.yamato/vfx_hdrp-linux-vulkan.yml +++ b/.yamato/vfx_hdrp-linux-vulkan.yml @@ -11,20 +11,47 @@ VFX_HDRP_Linux_Vulkan_Standalone_2020.1: 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 --output TestProjects/VisualEffectGraph_HDRP/utr + - chmod +x TestProjects/VisualEffectGraph_HDRP/utr + - cd TestProjects/VisualEffectGraph_HDRP && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision + - path: .yamato/vfx_hdrp-linux-vulkan.yml#Build_VFX_HDRP_Linux_Vulkan_Player_2020.1 rerun: on-new-revision + skip_checkout: true +Build_VFX_HDRP_Linux_Vulkan_Player_2020.1: + name: Build VFX_HDRP on Linux_Vulkan_Player on version 2020.1 + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - cd TestProjects/VisualEffectGraph_HDRP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision VFX_HDRP_Linux_Vulkan_playmode_2020.1: name: VFX_HDRP on Linux_Vulkan_playmode on version 2020.1 agent: @@ -33,20 +60,21 @@ VFX_HDRP_Linux_Vulkan_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - cd TestProjects/VisualEffectGraph_HDRP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision VFX_HDRP_Linux_Vulkan_editmode_2020.1: name: VFX_HDRP on Linux_Vulkan_editmode on version 2020.1 agent: @@ -55,20 +83,21 @@ VFX_HDRP_Linux_Vulkan_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - cd TestProjects/VisualEffectGraph_HDRP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision VFX_HDRP_Linux_Vulkan_Standalone_fast-2020.1: name: VFX_HDRP on Linux_Vulkan_Standalone on version fast-2020.1 agent: @@ -77,20 +106,47 @@ VFX_HDRP_Linux_Vulkan_Standalone_fast-2020.1: 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 --output TestProjects/VisualEffectGraph_HDRP/utr + - chmod +x TestProjects/VisualEffectGraph_HDRP/utr + - cd TestProjects/VisualEffectGraph_HDRP && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux rerun: on-new-revision + - path: .yamato/vfx_hdrp-linux-vulkan.yml#Build_VFX_HDRP_Linux_Vulkan_Player_fast-2020.1 + rerun: on-new-revision + skip_checkout: true +Build_VFX_HDRP_Linux_Vulkan_Player_fast-2020.1: + name: Build VFX_HDRP on Linux_Vulkan_Player on version fast-2020.1 + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - cd TestProjects/VisualEffectGraph_HDRP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision VFX_HDRP_Linux_Vulkan_playmode_fast-2020.1: name: VFX_HDRP on Linux_Vulkan_playmode on version fast-2020.1 agent: @@ -99,20 +155,21 @@ VFX_HDRP_Linux_Vulkan_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - cd TestProjects/VisualEffectGraph_HDRP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision VFX_HDRP_Linux_Vulkan_editmode_fast-2020.1: name: VFX_HDRP on Linux_Vulkan_editmode on version fast-2020.1 agent: @@ -121,20 +178,21 @@ VFX_HDRP_Linux_Vulkan_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - cd TestProjects/VisualEffectGraph_HDRP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision VFX_HDRP_Linux_Vulkan_Standalone_CUSTOM-REVISION: name: VFX_HDRP on Linux_Vulkan_Standalone on version CUSTOM-REVISION agent: @@ -144,20 +202,48 @@ VFX_HDRP_Linux_Vulkan_Standalone_CUSTOM-REVISION: 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 --output TestProjects/VisualEffectGraph_HDRP/utr + - chmod +x TestProjects/VisualEffectGraph_HDRP/utr + - cd TestProjects/VisualEffectGraph_HDRP && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux rerun: always + - path: .yamato/vfx_hdrp-linux-vulkan.yml#Build_VFX_HDRP_Linux_Vulkan_Player_CUSTOM-REVISION + rerun: always + skip_checkout: true +Build_VFX_HDRP_Linux_Vulkan_Player_CUSTOM-REVISION: + name: Build VFX_HDRP on Linux_Vulkan_Player on version CUSTOM-REVISION + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - cd TestProjects/VisualEffectGraph_HDRP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always VFX_HDRP_Linux_Vulkan_playmode_CUSTOM-REVISION: name: VFX_HDRP on Linux_Vulkan_playmode on version CUSTOM-REVISION agent: @@ -167,20 +253,21 @@ VFX_HDRP_Linux_Vulkan_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - cd TestProjects/VisualEffectGraph_HDRP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always VFX_HDRP_Linux_Vulkan_editmode_CUSTOM-REVISION: name: VFX_HDRP on Linux_Vulkan_editmode on version CUSTOM-REVISION agent: @@ -190,17 +277,18 @@ VFX_HDRP_Linux_Vulkan_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - cd TestProjects/VisualEffectGraph_HDRP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/vfx_hdrp-osx-metal.yml b/.yamato/vfx_hdrp-osx-metal.yml index 740b8c4e9c2..1d3481a1ffa 100644 --- a/.yamato/vfx_hdrp-osx-metal.yml +++ b/.yamato/vfx_hdrp-osx-metal.yml @@ -11,19 +11,16 @@ VFX_HDRP_OSX_Metal_Standalone_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ @@ -32,6 +29,10 @@ VFX_HDRP_OSX_Metal_Standalone_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision VFX_HDRP_OSX_Metal_playmode_2020.1: name: VFX_HDRP on OSX_Metal_playmode on version 2020.1 agent: @@ -40,19 +41,16 @@ VFX_HDRP_OSX_Metal_playmode_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ @@ -61,35 +59,10 @@ VFX_HDRP_OSX_Metal_playmode_2020.1: logs: paths: - "**/test-results/**" -VFX_HDRP_OSX_Metal_editmode_2020.1: - name: VFX_HDRP on OSX_Metal_editmode on version 2020.1 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos rerun: on-new-revision - commands: - - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - - |5- - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=editor --platform=editmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results" - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - artifacts: - logs: - paths: - - "**/test-results/**" VFX_HDRP_OSX_Metal_Standalone_fast-2020.1: name: VFX_HDRP on OSX_Metal_Standalone on version fast-2020.1 agent: @@ -98,19 +71,16 @@ VFX_HDRP_OSX_Metal_Standalone_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ @@ -119,6 +89,10 @@ VFX_HDRP_OSX_Metal_Standalone_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision VFX_HDRP_OSX_Metal_playmode_fast-2020.1: name: VFX_HDRP on OSX_Metal_playmode on version fast-2020.1 agent: @@ -127,19 +101,16 @@ VFX_HDRP_OSX_Metal_playmode_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ @@ -148,35 +119,10 @@ VFX_HDRP_OSX_Metal_playmode_fast-2020.1: logs: paths: - "**/test-results/**" -VFX_HDRP_OSX_Metal_editmode_fast-2020.1: - name: VFX_HDRP on OSX_Metal_editmode on version fast-2020.1 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos rerun: on-new-revision - commands: - - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - - |5- - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=editor --platform=editmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results" - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - artifacts: - logs: - paths: - - "**/test-results/**" VFX_HDRP_OSX_Metal_Standalone_CUSTOM-REVISION: name: VFX_HDRP on OSX_Metal_Standalone on version CUSTOM-REVISION agent: @@ -186,19 +132,16 @@ VFX_HDRP_OSX_Metal_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ @@ -207,6 +150,10 @@ VFX_HDRP_OSX_Metal_Standalone_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always VFX_HDRP_OSX_Metal_playmode_CUSTOM-REVISION: name: VFX_HDRP on OSX_Metal_playmode on version CUSTOM-REVISION agent: @@ -216,19 +163,16 @@ VFX_HDRP_OSX_Metal_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ @@ -237,33 +181,7 @@ VFX_HDRP_OSX_Metal_playmode_CUSTOM-REVISION: logs: paths: - "**/test-results/**" -VFX_HDRP_OSX_Metal_editmode_CUSTOM-REVISION: - name: VFX_HDRP on OSX_Metal_editmode on version CUSTOM-REVISION - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: custom_revision_not_set + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos rerun: always - commands: - - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - - |5- - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --suite=editor --platform=editmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results" - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - artifacts: - logs: - paths: - - "**/test-results/**" diff --git a/.yamato/vfx_hdrp-win-dx11.yml b/.yamato/vfx_hdrp-win-dx11.yml index b5136135d28..cd4ae8719e7 100644 --- a/.yamato/vfx_hdrp-win-dx11.yml +++ b/.yamato/vfx_hdrp-win-dx11.yml @@ -11,18 +11,19 @@ VFX_HDRP_Win_DX11_Standalone_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/vfx_hdrp-win-dx11.yml#Build_VFX_HDRP_Win_DX11_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/vfx_hdrp-win-dx11.yml#Build_VFX_HDRP_Win_DX11_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_VFX_HDRP_Win_DX11_Player_2020.1: name: Build VFX_HDRP on Win_DX11_Player on version 2020.1 @@ -32,9 +33,6 @@ Build_VFX_HDRP_Win_DX11_Player_2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -44,9 +42,13 @@ Build_VFX_HDRP_Win_DX11_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision VFX_HDRP_Win_DX11_playmode_2020.1: name: VFX_HDRP on Win_DX11_playmode on version 2020.1 agent: @@ -55,18 +57,19 @@ VFX_HDRP_Win_DX11_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_HDRP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision VFX_HDRP_Win_DX11_editmode_2020.1: name: VFX_HDRP on Win_DX11_editmode on version 2020.1 agent: @@ -75,18 +78,19 @@ VFX_HDRP_Win_DX11_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_HDRP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision VFX_HDRP_Win_DX11_Standalone_fast-2020.1: name: VFX_HDRP on Win_DX11_Standalone on version fast-2020.1 agent: @@ -95,18 +99,19 @@ VFX_HDRP_Win_DX11_Standalone_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/vfx_hdrp-win-dx11.yml#Build_VFX_HDRP_Win_DX11_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/vfx_hdrp-win-dx11.yml#Build_VFX_HDRP_Win_DX11_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_VFX_HDRP_Win_DX11_Player_fast-2020.1: name: Build VFX_HDRP on Win_DX11_Player on version fast-2020.1 @@ -116,9 +121,6 @@ Build_VFX_HDRP_Win_DX11_Player_fast-2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -128,9 +130,13 @@ Build_VFX_HDRP_Win_DX11_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision VFX_HDRP_Win_DX11_playmode_fast-2020.1: name: VFX_HDRP on Win_DX11_playmode on version fast-2020.1 agent: @@ -139,18 +145,19 @@ VFX_HDRP_Win_DX11_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_HDRP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision VFX_HDRP_Win_DX11_editmode_fast-2020.1: name: VFX_HDRP on Win_DX11_editmode on version fast-2020.1 agent: @@ -159,18 +166,19 @@ VFX_HDRP_Win_DX11_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_HDRP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision VFX_HDRP_Win_DX11_Standalone_CUSTOM-REVISION: name: VFX_HDRP on Win_DX11_Standalone on version CUSTOM-REVISION agent: @@ -180,18 +188,19 @@ VFX_HDRP_Win_DX11_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/vfx_hdrp-win-dx11.yml#Build_VFX_HDRP_Win_DX11_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/vfx_hdrp-win-dx11.yml#Build_VFX_HDRP_Win_DX11_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_VFX_HDRP_Win_DX11_Player_CUSTOM-REVISION: name: Build VFX_HDRP on Win_DX11_Player on version CUSTOM-REVISION @@ -202,9 +211,6 @@ Build_VFX_HDRP_Win_DX11_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -214,9 +220,13 @@ Build_VFX_HDRP_Win_DX11_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always VFX_HDRP_Win_DX11_playmode_CUSTOM-REVISION: name: VFX_HDRP on Win_DX11_playmode on version CUSTOM-REVISION agent: @@ -226,18 +236,19 @@ VFX_HDRP_Win_DX11_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_HDRP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always VFX_HDRP_Win_DX11_editmode_CUSTOM-REVISION: name: VFX_HDRP on Win_DX11_editmode on version CUSTOM-REVISION agent: @@ -247,15 +258,16 @@ VFX_HDRP_Win_DX11_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_HDRP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/vfx_hdrp-win-vulkan.yml b/.yamato/vfx_hdrp-win-vulkan.yml index a6a0c4ac703..8b7b9b4750a 100644 --- a/.yamato/vfx_hdrp-win-vulkan.yml +++ b/.yamato/vfx_hdrp-win-vulkan.yml @@ -11,18 +11,19 @@ VFX_HDRP_Win_Vulkan_Standalone_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/vfx_hdrp-win-vulkan.yml#Build_VFX_HDRP_Win_Vulkan_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/vfx_hdrp-win-vulkan.yml#Build_VFX_HDRP_Win_Vulkan_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_VFX_HDRP_Win_Vulkan_Player_2020.1: name: Build VFX_HDRP on Win_Vulkan_Player on version 2020.1 @@ -32,9 +33,6 @@ Build_VFX_HDRP_Win_Vulkan_Player_2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -44,9 +42,13 @@ Build_VFX_HDRP_Win_Vulkan_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision VFX_HDRP_Win_Vulkan_playmode_2020.1: name: VFX_HDRP on Win_Vulkan_playmode on version 2020.1 agent: @@ -55,18 +57,19 @@ VFX_HDRP_Win_Vulkan_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_HDRP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision VFX_HDRP_Win_Vulkan_editmode_2020.1: name: VFX_HDRP on Win_Vulkan_editmode on version 2020.1 agent: @@ -75,18 +78,19 @@ VFX_HDRP_Win_Vulkan_editmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_HDRP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision VFX_HDRP_Win_Vulkan_Standalone_fast-2020.1: name: VFX_HDRP on Win_Vulkan_Standalone on version fast-2020.1 agent: @@ -95,18 +99,19 @@ VFX_HDRP_Win_Vulkan_Standalone_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/vfx_hdrp-win-vulkan.yml#Build_VFX_HDRP_Win_Vulkan_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/vfx_hdrp-win-vulkan.yml#Build_VFX_HDRP_Win_Vulkan_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_VFX_HDRP_Win_Vulkan_Player_fast-2020.1: name: Build VFX_HDRP on Win_Vulkan_Player on version fast-2020.1 @@ -116,9 +121,6 @@ Build_VFX_HDRP_Win_Vulkan_Player_fast-2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -128,9 +130,13 @@ Build_VFX_HDRP_Win_Vulkan_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision VFX_HDRP_Win_Vulkan_playmode_fast-2020.1: name: VFX_HDRP on Win_Vulkan_playmode on version fast-2020.1 agent: @@ -139,18 +145,19 @@ VFX_HDRP_Win_Vulkan_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_HDRP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision VFX_HDRP_Win_Vulkan_editmode_fast-2020.1: name: VFX_HDRP on Win_Vulkan_editmode on version fast-2020.1 agent: @@ -159,18 +166,19 @@ VFX_HDRP_Win_Vulkan_editmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_HDRP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision VFX_HDRP_Win_Vulkan_Standalone_CUSTOM-REVISION: name: VFX_HDRP on Win_Vulkan_Standalone on version CUSTOM-REVISION agent: @@ -180,18 +188,19 @@ VFX_HDRP_Win_Vulkan_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/vfx_hdrp-win-vulkan.yml#Build_VFX_HDRP_Win_Vulkan_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/vfx_hdrp-win-vulkan.yml#Build_VFX_HDRP_Win_Vulkan_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_VFX_HDRP_Win_Vulkan_Player_CUSTOM-REVISION: name: Build VFX_HDRP on Win_Vulkan_Player on version CUSTOM-REVISION @@ -202,9 +211,6 @@ Build_VFX_HDRP_Win_Vulkan_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -214,9 +220,13 @@ Build_VFX_HDRP_Win_Vulkan_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always VFX_HDRP_Win_Vulkan_playmode_CUSTOM-REVISION: name: VFX_HDRP on Win_Vulkan_playmode on version CUSTOM-REVISION agent: @@ -226,18 +236,19 @@ VFX_HDRP_Win_Vulkan_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_HDRP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always VFX_HDRP_Win_Vulkan_editmode_CUSTOM-REVISION: name: VFX_HDRP on Win_Vulkan_editmode on version CUSTOM-REVISION agent: @@ -247,15 +258,16 @@ VFX_HDRP_Win_Vulkan_editmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_HDRP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_HDRP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_HDRP && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/vfx_urp-linux-openglcore.yml b/.yamato/vfx_urp-linux-openglcore.yml index c1d0d23cc06..174b79242e2 100644 --- a/.yamato/vfx_urp-linux-openglcore.yml +++ b/.yamato/vfx_urp-linux-openglcore.yml @@ -11,20 +11,21 @@ VFX_URP_Linux_OpenGLCore_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - cd TestProjects/VisualEffectGraph_URP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision VFX_URP_Linux_OpenGLCore_playmode_fast-2020.1: name: VFX_URP on Linux_OpenGLCore_playmode on version fast-2020.1 agent: @@ -33,20 +34,21 @@ VFX_URP_Linux_OpenGLCore_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - cd TestProjects/VisualEffectGraph_URP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision VFX_URP_Linux_OpenGLCore_playmode_CUSTOM-REVISION: name: VFX_URP on Linux_OpenGLCore_playmode on version CUSTOM-REVISION agent: @@ -56,17 +58,18 @@ VFX_URP_Linux_OpenGLCore_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - cd TestProjects/VisualEffectGraph_URP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-glcore" + - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-glcore" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/vfx_urp-linux-vulkan.yml b/.yamato/vfx_urp-linux-vulkan.yml index 6d12efdb9aa..177085710d1 100644 --- a/.yamato/vfx_urp-linux-vulkan.yml +++ b/.yamato/vfx_urp-linux-vulkan.yml @@ -11,20 +11,47 @@ VFX_URP_Linux_Vulkan_Standalone_2020.1: 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 --output TestProjects/VisualEffectGraph_URP/utr + - chmod +x TestProjects/VisualEffectGraph_URP/utr + - cd TestProjects/VisualEffectGraph_URP && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision + - path: .yamato/vfx_urp-linux-vulkan.yml#Build_VFX_URP_Linux_Vulkan_Player_2020.1 rerun: on-new-revision + skip_checkout: true +Build_VFX_URP_Linux_Vulkan_Player_2020.1: + name: Build VFX_URP on Linux_Vulkan_Player on version 2020.1 + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - cd TestProjects/VisualEffectGraph_URP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision VFX_URP_Linux_Vulkan_playmode_2020.1: name: VFX_URP on Linux_Vulkan_playmode on version 2020.1 agent: @@ -33,20 +60,21 @@ VFX_URP_Linux_Vulkan_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - cd TestProjects/VisualEffectGraph_URP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:linux + rerun: on-new-revision VFX_URP_Linux_Vulkan_Standalone_fast-2020.1: name: VFX_URP on Linux_Vulkan_Standalone on version fast-2020.1 agent: @@ -55,20 +83,47 @@ VFX_URP_Linux_Vulkan_Standalone_fast-2020.1: 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 --output TestProjects/VisualEffectGraph_URP/utr + - chmod +x TestProjects/VisualEffectGraph_URP/utr + - cd TestProjects/VisualEffectGraph_URP && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux rerun: on-new-revision + - path: .yamato/vfx_urp-linux-vulkan.yml#Build_VFX_URP_Linux_Vulkan_Player_fast-2020.1 + rerun: on-new-revision + skip_checkout: true +Build_VFX_URP_Linux_Vulkan_Player_fast-2020.1: + name: Build VFX_URP on Linux_Vulkan_Player on version fast-2020.1 + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - cd TestProjects/VisualEffectGraph_URP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision VFX_URP_Linux_Vulkan_playmode_fast-2020.1: name: VFX_URP on Linux_Vulkan_playmode on version fast-2020.1 agent: @@ -77,20 +132,21 @@ VFX_URP_Linux_Vulkan_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:linux - rerun: on-new-revision commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - cd TestProjects/VisualEffectGraph_URP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:linux + rerun: on-new-revision VFX_URP_Linux_Vulkan_Standalone_CUSTOM-REVISION: name: VFX_URP on Linux_Vulkan_Standalone on version CUSTOM-REVISION agent: @@ -100,20 +156,48 @@ VFX_URP_Linux_Vulkan_Standalone_CUSTOM-REVISION: 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 --output TestProjects/VisualEffectGraph_URP/utr + - chmod +x TestProjects/VisualEffectGraph_URP/utr + - cd TestProjects/VisualEffectGraph_URP && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always + - path: .yamato/vfx_urp-linux-vulkan.yml#Build_VFX_URP_Linux_Vulkan_Player_CUSTOM-REVISION rerun: always + skip_checkout: true +Build_VFX_URP_Linux_Vulkan_Player_CUSTOM-REVISION: + name: Build VFX_URP on Linux_Vulkan_Player on version CUSTOM-REVISION + agent: + type: Unity::VM + image: cds-ops/ubuntu-18.04-base:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - cd TestProjects/VisualEffectGraph_URP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --testproject=. --editor-location=.Editor --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + players: + paths: + - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always VFX_URP_Linux_Vulkan_playmode_CUSTOM-REVISION: name: VFX_URP on Linux_Vulkan_playmode on version CUSTOM-REVISION agent: @@ -123,17 +207,18 @@ VFX_URP_Linux_Vulkan_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux - rerun: always commands: - sudo -H pip install --upgrade pip - sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - cd TestProjects/VisualEffectGraph_URP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/vfx_urp-osx-metal.yml b/.yamato/vfx_urp-osx-metal.yml index 72120c363a1..c219fb22674 100644 --- a/.yamato/vfx_urp-osx-metal.yml +++ b/.yamato/vfx_urp-osx-metal.yml @@ -11,19 +11,16 @@ VFX_URP_OSX_Metal_Standalone_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ @@ -32,6 +29,10 @@ VFX_URP_OSX_Metal_Standalone_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision VFX_URP_OSX_Metal_playmode_2020.1: name: VFX_URP on OSX_Metal_playmode on version 2020.1 agent: @@ -40,19 +41,16 @@ VFX_URP_OSX_Metal_playmode_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ @@ -61,6 +59,10 @@ VFX_URP_OSX_Metal_playmode_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision VFX_URP_OSX_Metal_Standalone_fast-2020.1: name: VFX_URP on OSX_Metal_Standalone on version fast-2020.1 agent: @@ -69,19 +71,16 @@ VFX_URP_OSX_Metal_Standalone_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ @@ -90,6 +89,10 @@ VFX_URP_OSX_Metal_Standalone_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision VFX_URP_OSX_Metal_playmode_fast-2020.1: name: VFX_URP on OSX_Metal_playmode on version fast-2020.1 agent: @@ -98,19 +101,16 @@ VFX_URP_OSX_Metal_playmode_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ @@ -119,6 +119,10 @@ VFX_URP_OSX_Metal_playmode_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision VFX_URP_OSX_Metal_Standalone_CUSTOM-REVISION: name: VFX_URP on OSX_Metal_Standalone on version CUSTOM-REVISION agent: @@ -128,19 +132,16 @@ VFX_URP_OSX_Metal_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --editor-location=/Users/bokken/.Editor --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --editor-location=/Users/bokken/.Editor --reruncount=2 --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ @@ -149,6 +150,10 @@ VFX_URP_OSX_Metal_Standalone_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always VFX_URP_OSX_Metal_playmode_CUSTOM-REVISION: name: VFX_URP on OSX_Metal_playmode on version CUSTOM-REVISION agent: @@ -158,19 +163,16 @@ VFX_URP_OSX_Metal_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --reruncount=2" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ @@ -179,3 +181,7 @@ VFX_URP_OSX_Metal_playmode_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always diff --git a/.yamato/vfx_urp-osx-openglcore.yml b/.yamato/vfx_urp-osx-openglcore.yml index fe3a3393eb3..aa032858156 100644 --- a/.yamato/vfx_urp-osx-openglcore.yml +++ b/.yamato/vfx_urp-osx-openglcore.yml @@ -11,19 +11,20 @@ VFX_URP_OSX_OpenGLCore_playmode_2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_URP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/VisualEffectGraph_URP && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:macos + rerun: on-new-revision VFX_URP_OSX_OpenGLCore_playmode_fast-2020.1: name: VFX_URP on OSX_OpenGLCore_playmode on version fast-2020.1 agent: @@ -32,19 +33,20 @@ VFX_URP_OSX_OpenGLCore_playmode_fast-2020.1: flavor: m1.mac variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:macos - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_URP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/VisualEffectGraph_URP && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:macos + rerun: on-new-revision VFX_URP_OSX_OpenGLCore_playmode_CUSTOM-REVISION: name: VFX_URP on OSX_OpenGLCore_playmode on version CUSTOM-REVISION agent: @@ -54,16 +56,17 @@ VFX_URP_OSX_OpenGLCore_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_URP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results + - cd TestProjects/VisualEffectGraph_URP && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always diff --git a/.yamato/vfx_urp-win-dx11.yml b/.yamato/vfx_urp-win-dx11.yml index 10bdb96b981..189303f343f 100644 --- a/.yamato/vfx_urp-win-dx11.yml +++ b/.yamato/vfx_urp-win-dx11.yml @@ -11,18 +11,19 @@ VFX_URP_Win_DX11_Standalone_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/vfx_urp-win-dx11.yml#Build_VFX_URP_Win_DX11_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/vfx_urp-win-dx11.yml#Build_VFX_URP_Win_DX11_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_VFX_URP_Win_DX11_Player_2020.1: name: Build VFX_URP on Win_DX11_Player on version 2020.1 @@ -32,9 +33,6 @@ Build_VFX_URP_Win_DX11_Player_2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -44,9 +42,13 @@ Build_VFX_URP_Win_DX11_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision VFX_URP_Win_DX11_playmode_2020.1: name: VFX_URP on Win_DX11_playmode on version 2020.1 agent: @@ -55,18 +57,19 @@ VFX_URP_Win_DX11_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_URP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision VFX_URP_Win_DX11_Standalone_fast-2020.1: name: VFX_URP on Win_DX11_Standalone on version fast-2020.1 agent: @@ -75,18 +78,19 @@ VFX_URP_Win_DX11_Standalone_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/vfx_urp-win-dx11.yml#Build_VFX_URP_Win_DX11_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/vfx_urp-win-dx11.yml#Build_VFX_URP_Win_DX11_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_VFX_URP_Win_DX11_Player_fast-2020.1: name: Build VFX_URP on Win_DX11_Player on version fast-2020.1 @@ -96,9 +100,6 @@ Build_VFX_URP_Win_DX11_Player_fast-2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -108,9 +109,13 @@ Build_VFX_URP_Win_DX11_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision VFX_URP_Win_DX11_playmode_fast-2020.1: name: VFX_URP on Win_DX11_playmode on version fast-2020.1 agent: @@ -119,18 +124,19 @@ VFX_URP_Win_DX11_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_URP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision VFX_URP_Win_DX11_Standalone_CUSTOM-REVISION: name: VFX_URP on Win_DX11_Standalone on version CUSTOM-REVISION agent: @@ -140,18 +146,19 @@ VFX_URP_Win_DX11_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/vfx_urp-win-dx11.yml#Build_VFX_URP_Win_DX11_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/vfx_urp-win-dx11.yml#Build_VFX_URP_Win_DX11_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_VFX_URP_Win_DX11_Player_CUSTOM-REVISION: name: Build VFX_URP on Win_DX11_Player on version CUSTOM-REVISION @@ -162,9 +169,6 @@ Build_VFX_URP_Win_DX11_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -174,9 +178,13 @@ Build_VFX_URP_Win_DX11_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always VFX_URP_Win_DX11_playmode_CUSTOM-REVISION: name: VFX_URP on Win_DX11_playmode on version CUSTOM-REVISION agent: @@ -186,15 +194,16 @@ VFX_URP_Win_DX11_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_URP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" + - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-d3d11" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always diff --git a/.yamato/vfx_urp-win-vulkan.yml b/.yamato/vfx_urp-win-vulkan.yml index 01b287d0a05..db635bf5431 100644 --- a/.yamato/vfx_urp-win-vulkan.yml +++ b/.yamato/vfx_urp-win-vulkan.yml @@ -11,18 +11,19 @@ VFX_URP_Win_Vulkan_Standalone_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision - - path: .yamato/vfx_urp-win-vulkan.yml#Build_VFX_URP_Win_Vulkan_Player_2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision + - path: .yamato/vfx_urp-win-vulkan.yml#Build_VFX_URP_Win_Vulkan_Player_2020.1 + rerun: on-new-revision skip_checkout: true Build_VFX_URP_Win_Vulkan_Player_2020.1: name: Build VFX_URP on Win_Vulkan_Player on version 2020.1 @@ -32,9 +33,6 @@ Build_VFX_URP_Win_Vulkan_Player_2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -44,9 +42,13 @@ Build_VFX_URP_Win_Vulkan_Player_2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision VFX_URP_Win_Vulkan_playmode_2020.1: name: VFX_URP on Win_Vulkan_playmode on version 2020.1 agent: @@ -55,18 +57,19 @@ VFX_URP_Win_Vulkan_playmode_2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_URP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:2020.1:windows + rerun: on-new-revision VFX_URP_Win_Vulkan_Standalone_fast-2020.1: name: VFX_URP on Win_Vulkan_Standalone on version fast-2020.1 agent: @@ -75,18 +78,19 @@ VFX_URP_Win_Vulkan_Standalone_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision - - path: .yamato/vfx_urp-win-vulkan.yml#Build_VFX_URP_Win_Vulkan_Player_fast-2020.1 - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision + - path: .yamato/vfx_urp-win-vulkan.yml#Build_VFX_URP_Win_Vulkan_Player_fast-2020.1 + rerun: on-new-revision skip_checkout: true Build_VFX_URP_Win_Vulkan_Player_fast-2020.1: name: Build VFX_URP on Win_Vulkan_Player on version fast-2020.1 @@ -96,9 +100,6 @@ Build_VFX_URP_Win_Vulkan_Player_fast-2020.1: flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -108,9 +109,13 @@ Build_VFX_URP_Win_Vulkan_Player_fast-2020.1: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision VFX_URP_Win_Vulkan_playmode_fast-2020.1: name: VFX_URP on Win_Vulkan_playmode on version fast-2020.1 agent: @@ -119,18 +124,19 @@ VFX_URP_Win_Vulkan_playmode_fast-2020.1: flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - dependencies: - - path: .yamato/_editor.yml#editor:priming:fast-2020.1:windows - rerun: on-new-revision commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_URP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:fast-2020.1:windows + rerun: on-new-revision VFX_URP_Win_Vulkan_Standalone_CUSTOM-REVISION: name: VFX_URP on Win_Vulkan_Standalone on version CUSTOM-REVISION agent: @@ -140,18 +146,19 @@ VFX_URP_Win_Vulkan_Standalone_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always - - path: .yamato/vfx_urp-win-vulkan.yml#Build_VFX_URP_Win_Vulkan_Player_CUSTOM-REVISION - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --timeout=1200 + - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --reruncount=2 --timeout=1200 artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + - path: .yamato/vfx_urp-win-vulkan.yml#Build_VFX_URP_Win_Vulkan_Player_CUSTOM-REVISION + rerun: always skip_checkout: true Build_VFX_URP_Win_Vulkan_Player_CUSTOM-REVISION: name: Build VFX_URP on Win_Vulkan_Player on version CUSTOM-REVISION @@ -162,9 +169,6 @@ Build_VFX_URP_Win_Vulkan_Player_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -174,9 +178,13 @@ Build_VFX_URP_Win_Vulkan_Player_CUSTOM-REVISION: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" players: paths: - "players/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always VFX_URP_Win_Vulkan_playmode_CUSTOM-REVISION: name: VFX_URP on Win_Vulkan_playmode on version CUSTOM-REVISION agent: @@ -186,15 +194,16 @@ VFX_URP_Win_Vulkan_playmode_CUSTOM-REVISION: variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set - dependencies: - - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows - rerun: always commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/VisualEffectGraph_URP/utr.bat - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/VisualEffectGraph_URP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan" + - cd TestProjects/VisualEffectGraph_URP && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --reruncount=2 --extra-editor-arg="-force-vulkan" artifacts: logs: paths: - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always From 43070cc13b5270cb1791fcdee00d5f3a50ff4bb1 Mon Sep 17 00:00:00 2001 From: Liis Kivistik Date: Mon, 12 Oct 2020 15:54:44 +0200 Subject: [PATCH 2/4] add min revision tests back to package jobs --- .yamato/_projectcontext.yml | 6 ++++++ .yamato/ruamel/jobs/packages/project_test_all.py | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.yamato/_projectcontext.yml b/.yamato/_projectcontext.yml index 5e20208169b..088bbb8703b 100644 --- a/.yamato/_projectcontext.yml +++ b/.yamato/_projectcontext.yml @@ -410,7 +410,9 @@ all_package_ci_project_2020.1: flavor: b1.large dependencies: - .yamato/_projectcontext.yml#test_all_project_windows_2020.1 + - .yamato/_projectcontext.yml#test_all_project_windows_min_editor - .yamato/_projectcontext.yml#test_all_project_macos_2020.1 + - .yamato/_projectcontext.yml#test_all_project_macos_min_editor commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t @@ -423,7 +425,9 @@ all_package_ci_project_fast-2020.1: flavor: b1.large dependencies: - .yamato/_projectcontext.yml#test_all_project_windows_fast-2020.1 + - .yamato/_projectcontext.yml#test_all_project_windows_min_editor - .yamato/_projectcontext.yml#test_all_project_macos_fast-2020.1 + - .yamato/_projectcontext.yml#test_all_project_macos_min_editor commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t @@ -436,7 +440,9 @@ all_package_ci_project_CUSTOM-REVISION: flavor: b1.large dependencies: - .yamato/_projectcontext.yml#test_all_project_windows_CUSTOM-REVISION + - .yamato/_projectcontext.yml#test_all_project_windows_min_editor - .yamato/_projectcontext.yml#test_all_project_macos_CUSTOM-REVISION + - .yamato/_projectcontext.yml#test_all_project_macos_min_editor variables: CUSTOM_REVISION: custom_revision_not_set commands: diff --git a/.yamato/ruamel/jobs/packages/project_test_all.py b/.yamato/ruamel/jobs/packages/project_test_all.py index 07b0a18f9bb..7a5e6e9c324 100644 --- a/.yamato/ruamel/jobs/packages/project_test_all.py +++ b/.yamato/ruamel/jobs/packages/project_test_all.py @@ -17,9 +17,8 @@ def get_job_definition(self, packages, agent, platforms, target_branch, editor): dependencies = [] for platform in platforms: dependencies.append(f'{projectcontext_filepath()}#{projectcontext_job_id_test(platform["os"],editor["name"])}') - if str(editor["track"]).lower() == "trunk": - dependencies.append(f'{projectcontext_filepath()}#{projectcontext_job_id_test_min_editor(platform["os"])}') - #dependencies.append(f'{packages_filepath()}#{package_job_id_test_dependencies(package["id"],platform["os"],editor["track"])}') + dependencies.append(f'{projectcontext_filepath()}#{projectcontext_job_id_test_min_editor(platform["os"])}') + #dependencies.append(f'{packages_filepath()}#{package_job_id_test_dependencies(package["id"],platform["os"],editor["track"])}') # construct job job = YMLJob() From 74a1679a5f37f53a6027a3e48015aa5ff88e7c6c Mon Sep 17 00:00:00 2001 From: Liis Kivistik Date: Mon, 12 Oct 2020 17:39:43 +0200 Subject: [PATCH 3/4] remove osx metal playmode_xr for universal --- .yamato/all-universal.yml | 6 ------ .yamato/config/universal.metafile | 1 - 2 files changed, 7 deletions(-) diff --git a/.yamato/all-universal.yml b/.yamato/all-universal.yml index d32d41b3cac..b2f76ba91ed 100644 --- a/.yamato/all-universal.yml +++ b/.yamato/all-universal.yml @@ -18,8 +18,6 @@ All_Universal_2020.1: rerun: on-new-revision - path: .yamato/universal-osx-metal.yml#Universal_OSX_Metal_playmode_2020.1 rerun: on-new-revision - - path: .yamato/universal-osx-metal.yml#Universal_OSX_Metal_playmode_XR_2020.1 - rerun: on-new-revision - path: .yamato/universal-osx-openglcore.yml#Universal_OSX_OpenGLCore_editmode_2020.1 rerun: on-new-revision - path: .yamato/all-universal_stereo.yml#All_Universal_Stereo_2020.1 @@ -39,8 +37,6 @@ All_Universal_fast-2020.1: rerun: on-new-revision - path: .yamato/universal-osx-metal.yml#Universal_OSX_Metal_playmode_fast-2020.1 rerun: on-new-revision - - path: .yamato/universal-osx-metal.yml#Universal_OSX_Metal_playmode_XR_fast-2020.1 - rerun: on-new-revision - path: .yamato/universal-osx-openglcore.yml#Universal_OSX_OpenGLCore_editmode_fast-2020.1 rerun: on-new-revision - path: .yamato/all-universal_stereo.yml#All_Universal_Stereo_fast-2020.1 @@ -60,8 +56,6 @@ All_Universal_CUSTOM-REVISION: rerun: always - path: .yamato/universal-osx-metal.yml#Universal_OSX_Metal_playmode_CUSTOM-REVISION rerun: always - - path: .yamato/universal-osx-metal.yml#Universal_OSX_Metal_playmode_XR_CUSTOM-REVISION - rerun: always - path: .yamato/universal-osx-openglcore.yml#Universal_OSX_OpenGLCore_editmode_CUSTOM-REVISION rerun: always - path: .yamato/all-universal_stereo.yml#All_Universal_Stereo_CUSTOM-REVISION diff --git a/.yamato/config/universal.metafile b/.yamato/config/universal.metafile index eb587f99d71..b202d0a1502 100644 --- a/.yamato/config/universal.metafile +++ b/.yamato/config/universal.metafile @@ -44,7 +44,6 @@ all: test_platforms: - Standalone - playmode - - playmode_XR - platform: OSX api: OpenGLCore test_platforms: From 6193ef40d2a7495f4b7f29d7c637522be5372ee3 Mon Sep 17 00:00:00 2001 From: Liis Kivistik Date: Tue, 13 Oct 2020 08:47:36 +0200 Subject: [PATCH 4/4] minor fixes from review --- .yamato/config/_editor.metafile | 5 ----- .yamato/ruamel/build.py | 1 + .yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py | 6 +++--- .yamato/ruamel/jobs/abv/yml_abv.py | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.yamato/config/_editor.metafile b/.yamato/config/_editor.metafile index 915908173ed..ad928039e58 100644 --- a/.yamato/config/_editor.metafile +++ b/.yamato/config/_editor.metafile @@ -13,11 +13,6 @@ editor_priming_agent: cds_ops_ubuntu_small ### EDITOR PINNING editor_pin_agent: package_ci_ubuntu_small -# 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 - - ### Configuration required by update_revisions.py trunk_track: '2021.1' # 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 diff --git a/.yamato/ruamel/build.py b/.yamato/ruamel/build.py index 0981c8964db..936a7331e9e 100644 --- a/.yamato/ruamel/build.py +++ b/.yamato/ruamel/build.py @@ -93,6 +93,7 @@ def get_metafile(metafile_name, unfold_agents_root_keys=[], unfold_test_platform yml_dump_files(create_projectcontext_ymls(package_metafile)) # create abv + print(f'Running: ABV') abv_metafile = get_metafile(os.path.join(config_dir,'_abv.metafile')) yml_dump_files(create_abv_ymls(abv_metafile)) diff --git a/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py b/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py index 60a7e709df8..b0200794c6d 100644 --- a/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py +++ b/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py @@ -4,12 +4,12 @@ class ABV_AllProjectCiNightlyJob(): - def __init__(self, editor, test_platforms, nightly_config, target_branch): + def __init__(self, editor, nightly_config, target_branch): self.job_id = abv_job_id_all_project_ci_nightly(editor["name"]) - self.yml = self.get_job_definition(editor,test_platforms, nightly_config.get("extra_dependencies",[]), target_branch).get_yml() + self.yml = self.get_job_definition(editor, nightly_config.get("extra_dependencies",[]), target_branch).get_yml() - def get_job_definition(self, editor, test_platforms, extra_dependencies, target_branch): + def get_job_definition(self, editor, extra_dependencies, target_branch): # define dependencies dependencies = [ diff --git a/.yamato/ruamel/jobs/abv/yml_abv.py b/.yamato/ruamel/jobs/abv/yml_abv.py index 88c4f311a3c..22028b020ef 100644 --- a/.yamato/ruamel/jobs/abv/yml_abv.py +++ b/.yamato/ruamel/jobs/abv/yml_abv.py @@ -12,7 +12,7 @@ def create_abv_ymls(metafile): yml[job.job_id] = job.yml if editor.get("nightly"): - job = ABV_AllProjectCiNightlyJob(editor, metafile["abv"]["projects"], metafile["nightly"], metafile["target_branch"]) + job = ABV_AllProjectCiNightlyJob(editor, metafile["nightly"], metafile["target_branch"]) yml[job.job_id] = job.yml job = ABV_TrunkVerificationJob(editor, metafile["trunk_verification"]["dependencies"])