From 728bd88531699493b621a69ed75140ccd32394fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Penavaire?= Date: Fri, 17 Jan 2025 10:29:44 +0100 Subject: [PATCH 1/6] Update yamato pipelines --- .yamato/_abv.yml | 12 +- .yamato/_editor_priming.yml | 18 +- .yamato/_postprocessing_publish.yml | 111 ---------- .yamato/_templates.yml | 196 +++++++++--------- .yamato/all-postprocessing.yml | 50 ----- .yamato/postprocessing-linux-vulkan.yml | 109 ---------- .yamato/postprocessing-osx-metal.yml | 83 -------- .yamato/postprocessing-win-dx11.yml | 89 -------- .yamato/postprocessing-win-dx12.yml | 89 -------- .yamato/postprocessing-win-vulkan.yml | 89 -------- .../.yamato/upm-ci.yml | 4 +- 11 files changed, 114 insertions(+), 736 deletions(-) delete mode 100644 .yamato/_postprocessing_publish.yml delete mode 100644 .yamato/all-postprocessing.yml delete mode 100644 .yamato/postprocessing-linux-vulkan.yml delete mode 100644 .yamato/postprocessing-osx-metal.yml delete mode 100644 .yamato/postprocessing-win-dx11.yml delete mode 100644 .yamato/postprocessing-win-dx12.yml delete mode 100644 .yamato/postprocessing-win-vulkan.yml diff --git a/.yamato/_abv.yml b/.yamato/_abv.yml index ffc8272f5fc..7c54f6915fc 100644 --- a/.yamato/_abv.yml +++ b/.yamato/_abv.yml @@ -5,18 +5,16 @@ --- -graphics_repo_nightly_trunk: - name: Graphics repo nightly on trunk on trunk +graphics_repo_nightly_6000.1: + name: Graphics repo nightly on 6000.1 on 6000.1 variables: - CUSTOM_REVISION: 'trunk' + CUSTOM_REVISION: '6000.1/staging' TEST_FILTER: .* UTR_VERSION: "current" triggers: recurring: - branch: master - frequency: 23 ? * 7 # At 11pm every Saturday + frequency: weekly dependencies: - - path: .yamato/_templates.yml#all_template_ci_trunk - rerun: always - - path: .yamato/all-postprocessing.yml#PostProcessing_trunk + - path: .yamato/_templates.yml#all_template_ci_6000.1 rerun: always diff --git a/.yamato/_editor_priming.yml b/.yamato/_editor_priming.yml index 9de1375f170..69ca6a44598 100644 --- a/.yamato/_editor_priming.yml +++ b/.yamato/_editor_priming.yml @@ -5,15 +5,15 @@ --- -editor:priming:trunk:Win: - name: '[trunk,Win] Editor priming' +editor:priming:6000.1:Win: + name: '[6000.1,Win] Editor priming' agent: type: Unity::VM image: package-ci/ubuntu-22.04:v4 flavor: b1.small skip_checkout: true variables: - CUSTOM_REVISION: 'trunk' + CUSTOM_REVISION: '6000.1/staging' DISPLAY: ":0" 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 UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -51,15 +51,15 @@ editor:priming:test_min_editor:Win: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:trunk:OSX: - name: '[trunk,OSX] Editor priming' +editor:priming:6000.1:OSX: + name: '[6000.1,OSX] Editor priming' agent: type: Unity::VM image: package-ci/ubuntu-22.04:v4 flavor: b1.small skip_checkout: true variables: - CUSTOM_REVISION: 'trunk' + CUSTOM_REVISION: '6000.1/staging' DISPLAY: ":0" 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 UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -97,15 +97,15 @@ editor:priming:test_min_editor:OSX: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:trunk:Linux: - name: '[trunk,Linux] Editor priming' +editor:priming:6000.1:Linux: + name: '[6000.1,Linux] Editor priming' agent: type: Unity::VM image: package-ci/ubuntu-22.04:v4 flavor: b1.small skip_checkout: true variables: - CUSTOM_REVISION: 'trunk' + CUSTOM_REVISION: '6000.1/staging' DISPLAY: ":0" 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 UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates diff --git a/.yamato/_postprocessing_publish.yml b/.yamato/_postprocessing_publish.yml deleted file mode 100644 index d9050e6477d..00000000000 --- a/.yamato/_postprocessing_publish.yml +++ /dev/null @@ -1,111 +0,0 @@ - -# From https://github.com/Unity-Technologies/PostProcessing/blob/v2/.yamato/upm-ci.yml - -name: postprocessing -test_editors: - - 2020.3 - - 2019.4 - - 2021.3 - - 2022.1 - - 2023.2 - - trunk -test_platforms: - - name: win - type: Unity::VM - image: package-ci/win10:v4 - flavor: b1.large - - name: mac - type: Unity::VM::osx - image: package-ci/macos-13:v4 - flavor: m1.mac ---- -{{ name }}_pack: - name: {{ name }} - Pack - agent: - type: Unity::VM - image: package-ci/win10:v4 - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci package pack --package-path com.unity.postprocessing - artifacts: - packages: - paths: - - "upm-ci~/**/*" - -{% for editor in test_editors %} -{% for platform in test_platforms %} -{{ name }}_test_{{ platform.name }}_{{ editor }}: - name : {{ name }} - Test {{ editor }} on {{ platform.name }} - agent: - type: {{ platform.type }} - image: {{ platform.image }} - flavor: {{ platform.flavor}} - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci package test --unity-version {{ editor }} --package-path com.unity.postprocessing --extra-utr-arg="--compilation-errors-as-warnings" - artifacts: - logs: - paths: - - "upm-ci~/test-results/**/*" - dependencies: - - .yamato/_postprocessing_publish.yml#{{ name }}_pack -{% endfor %} -{% endfor %} - -{{ name }}_test_trigger: - name: {{ name }} - Tests Trigger - dependencies: - - .yamato/_postprocessing_publish.yml#{{ name }}_pack - {% for editor in test_editors %} - {% for platform in test_platforms %} - - .yamato/_postprocessing_publish.yml#{{ name }}_test_{{platform.name}}_{{editor}} - {% endfor %} - {% endfor %} - -{{ name }}_publish: - name: {{ name }} - Publish to Internal Registry - agent: - type: Unity::VM - image: package-ci/win10:v4 - flavor: b1.large - variables: - UPMCI_ENABLE_PACKAGE_SIGNING: 1 - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci package publish --package-path com.unity.postprocessing - artifacts: - artifacts: - paths: - - "upm-ci~/packages/*.tgz" - dependencies: - - .yamato/_postprocessing_publish.yml#{{ name }}_pack - {% for editor in test_editors %} - {% for platform in test_platforms %} - - .yamato/_postprocessing_publish.yml#{{ name }}_test_{{ platform.name }}_{{ editor }} - {% endfor %} - {% endfor %} - - -{{ name }}_publish_dry_run: - name: {{ name }} - Publish to Internal Registry [dry-run] - agent: - type: Unity::VM - image: package-ci/win10:v4 - flavor: b1.large - variables: - UPMCI_ENABLE_PACKAGE_SIGNING: 1 - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci package publish --dry-run --package-path com.unity.postprocessing - artifacts: - artifacts: - paths: - - "upm-ci~/packages/*.tgz" - dependencies: - - .yamato/_postprocessing_publish.yml#{{ name }}_pack - {% for editor in test_editors %} - {% for platform in test_platforms %} - - .yamato/_postprocessing_publish.yml#{{ name }}_test_{{ platform.name }}_{{ editor }} - {% endfor %} - {% endfor %} diff --git a/.yamato/_templates.yml b/.yamato/_templates.yml index e72caaa1f02..3bc5dcedcbb 100644 --- a/.yamato/_templates.yml +++ b/.yamato/_templates.yml @@ -5,8 +5,8 @@ --- -pre_pack_hdrp_template_Win_trunk: - name: Pre-Pack HDRP Template Win trunk +pre_pack_hdrp_template_Win_6000.1: + name: Pre-Pack HDRP Template Win 6000.1 agent: type: Unity::VM image: package-ci/win11:v4 @@ -16,7 +16,7 @@ pre_pack_hdrp_template_Win_trunk: - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win + - path: .yamato/_editor_priming.yml#editor:priming:6000.1:Win return: always artifacts: primed: @@ -27,8 +27,8 @@ pre_pack_hdrp_template_Win_trunk: logs: paths: - "Editor.log" -pack_hdrp_template_Win_trunk: - name: Pack HDRP Template Win trunk +pack_hdrp_template_Win_6000.1: + name: Pack HDRP Template Win 6000.1 agent: type: Unity::VM image: package-ci/win10:v4 @@ -41,16 +41,16 @@ pack_hdrp_template_Win_trunk: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -test_hdrp_template_Win_trunk: - name: Test HDRP Template Win trunk +test_hdrp_template_Win_6000.1: + name: Test HDRP Template Win 6000.1 agent: type: Unity::VM image: package-ci/win11:v4 flavor: b1.large dependencies: - - path: .yamato/_templates.yml#pack_hdrp_template_Win_trunk + - path: .yamato/_templates.yml#pack_hdrp_template_Win_6000.1 return: always - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win + - path: .yamato/_editor_priming.yml#editor:priming:6000.1:Win return: always commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm @@ -61,8 +61,8 @@ test_hdrp_template_Win_trunk: logs: paths: - "**/test-results/**" -pre_pack_hdrp_template_OSX_trunk: - name: Pre-Pack HDRP Template OSX trunk +pre_pack_hdrp_template_OSX_6000.1: + name: Pre-Pack HDRP Template OSX 6000.1 agent: type: Unity::VM::osx image: package-ci/macos-13:v4 @@ -71,7 +71,7 @@ pre_pack_hdrp_template_OSX_trunk: - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX + - path: .yamato/_editor_priming.yml#editor:priming:6000.1:OSX return: always artifacts: primed: @@ -82,8 +82,8 @@ pre_pack_hdrp_template_OSX_trunk: logs: paths: - "Editor.log" -pack_hdrp_template_OSX_trunk: - name: Pack HDRP Template OSX trunk +pack_hdrp_template_OSX_6000.1: + name: Pack HDRP Template OSX 6000.1 agent: type: Unity::VM image: package-ci/win10:v4 @@ -96,16 +96,16 @@ pack_hdrp_template_OSX_trunk: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -test_hdrp_template_OSX_trunk: - name: Test HDRP Template OSX trunk +test_hdrp_template_OSX_6000.1: + name: Test HDRP Template OSX 6000.1 agent: type: Unity::VM::osx image: package-ci/macos-13:v4 flavor: m1.mac dependencies: - - path: .yamato/_templates.yml#pack_hdrp_template_OSX_trunk + - path: .yamato/_templates.yml#pack_hdrp_template_OSX_6000.1 return: always - - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX + - path: .yamato/_editor_priming.yml#editor:priming:6000.1:OSX return: always commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm @@ -115,54 +115,54 @@ test_hdrp_template_OSX_trunk: logs: paths: - "**/test-results/**" -publish_hdrp_template_trunk: +publish_hdrp_template_6000.1: agent: type: Unity::VM image: package-ci/win10:v4 flavor: b1.large - name: Publish HDRP Template trunk + name: Publish HDRP Template 6000.1 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-hd dependencies: - - path: .yamato/_templates.yml#test_hdrp_template_Win_trunk + - path: .yamato/_templates.yml#test_hdrp_template_Win_6000.1 return: always - - path: .yamato/_templates.yml#test_hdrp_template_OSX_trunk + - path: .yamato/_templates.yml#test_hdrp_template_OSX_6000.1 return: always - - path: .yamato/_templates.yml#pack_hdrp_template_Win_trunk + - path: .yamato/_templates.yml#pack_hdrp_template_Win_6000.1 return: always - - path: .yamato/_templates.yml#pack_hdrp_template_OSX_trunk + - path: .yamato/_templates.yml#pack_hdrp_template_OSX_6000.1 return: always artifacts: packages: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -publish_hdrp_template_trunk_dry_run: +publish_hdrp_template_6000.1_dry_run: agent: type: Unity::VM image: package-ci/win10:v4 flavor: b1.large - name: Publish HDRP Template trunk Dry Run + name: Publish HDRP Template 6000.1 Dry Run commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-hd --dry-run dependencies: - - path: .yamato/_templates.yml#test_hdrp_template_Win_trunk + - path: .yamato/_templates.yml#test_hdrp_template_Win_6000.1 return: always - - path: .yamato/_templates.yml#test_hdrp_template_OSX_trunk + - path: .yamato/_templates.yml#test_hdrp_template_OSX_6000.1 return: always - - path: .yamato/_templates.yml#pack_hdrp_template_Win_trunk + - path: .yamato/_templates.yml#pack_hdrp_template_Win_6000.1 return: always - - path: .yamato/_templates.yml#pack_hdrp_template_OSX_trunk + - path: .yamato/_templates.yml#pack_hdrp_template_OSX_6000.1 return: always artifacts: packages: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -pre_pack_hdrp_blank_template_Win_trunk: - name: Pre-Pack HDRP Blank Template Win trunk +pre_pack_hdrp_blank_template_Win_6000.1: + name: Pre-Pack HDRP Blank Template Win 6000.1 agent: type: Unity::VM image: package-ci/win11:v4 @@ -172,7 +172,7 @@ pre_pack_hdrp_blank_template_Win_trunk: - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - .Editor\Unity.exe -projectPath com.unity.template.hdrp-blank -batchmode -quit -logFile ./Editor.log dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win + - path: .yamato/_editor_priming.yml#editor:priming:6000.1:Win return: always artifacts: primed: @@ -183,8 +183,8 @@ pre_pack_hdrp_blank_template_Win_trunk: logs: paths: - "Editor.log" -pack_hdrp_blank_template_Win_trunk: - name: Pack HDRP Blank Template Win trunk +pack_hdrp_blank_template_Win_6000.1: + name: Pack HDRP Blank Template Win 6000.1 agent: type: Unity::VM image: package-ci/win10:v4 @@ -197,16 +197,16 @@ pack_hdrp_blank_template_Win_trunk: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -test_hdrp_blank_template_Win_trunk: - name: Test HDRP Blank Template Win trunk +test_hdrp_blank_template_Win_6000.1: + name: Test HDRP Blank Template Win 6000.1 agent: type: Unity::VM image: package-ci/win11:v4 flavor: b1.large dependencies: - - path: .yamato/_templates.yml#pack_hdrp_blank_template_Win_trunk + - path: .yamato/_templates.yml#pack_hdrp_blank_template_Win_6000.1 rerun: always - - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX + - path: .yamato/_editor_priming.yml#editor:priming:6000.1:OSX return: always commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm @@ -217,8 +217,8 @@ test_hdrp_blank_template_Win_trunk: logs: paths: - "**/test-results/**" -pre_pack_hdrp_blank_template_OSX_trunk: - name: Pre-Pack HDRP Blank Template OSX trunk +pre_pack_hdrp_blank_template_OSX_6000.1: + name: Pre-Pack HDRP Blank Template OSX 6000.1 agent: type: Unity::VM::osx image: package-ci/macos-13:v4 @@ -227,7 +227,7 @@ pre_pack_hdrp_blank_template_OSX_trunk: - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template.hdrp-blank -batchmode -quit -logFile ./Editor.log dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX + - path: .yamato/_editor_priming.yml#editor:priming:6000.1:OSX return: always artifacts: primed: @@ -238,8 +238,8 @@ pre_pack_hdrp_blank_template_OSX_trunk: logs: paths: - "Editor.log" -pack_hdrp_blank_template_OSX_trunk: - name: Pack HDRP Blank Template OSX trunk +pack_hdrp_blank_template_OSX_6000.1: + name: Pack HDRP Blank Template OSX 6000.1 agent: type: Unity::VM image: package-ci/win10:v4 @@ -252,16 +252,16 @@ pack_hdrp_blank_template_OSX_trunk: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -test_hdrp_blank_template_OSX_trunk: - name: Test HDRP Blank Template OSX trunk +test_hdrp_blank_template_OSX_6000.1: + name: Test HDRP Blank Template OSX 6000.1 agent: type: Unity::VM::osx image: package-ci/macos-13:v4 flavor: m1.mac dependencies: - - path: .yamato/_templates.yml#pack_hdrp_blank_template_OSX_trunk + - path: .yamato/_templates.yml#pack_hdrp_blank_template_OSX_6000.1 return: always - - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX + - path: .yamato/_editor_priming.yml#editor:priming:6000.1:OSX return: always commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm @@ -271,50 +271,50 @@ test_hdrp_blank_template_OSX_trunk: logs: paths: - "**/test-results/**" -publish_hdrp_blank_template_trunk: +publish_hdrp_blank_template_6000.1: agent: type: Unity::VM image: package-ci/win10:v4 flavor: b1.large - name: Publish HDRP Blank Template trunk + name: Publish HDRP Blank Template 6000.1 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template.hdrp-blank dependencies: - - .yamato/_templates.yml#test_hdrp_blank_template_Win_trunk - - .yamato/_templates.yml#test_hdrp_blank_template_OSX_trunk - - .yamato/_templates.yml#pack_hdrp_blank_template_Win_trunk - - .yamato/_templates.yml#pack_hdrp_blank_template_OSX_trunk + - .yamato/_templates.yml#test_hdrp_blank_template_Win_6000.1 + - .yamato/_templates.yml#test_hdrp_blank_template_OSX_6000.1 + - .yamato/_templates.yml#pack_hdrp_blank_template_Win_6000.1 + - .yamato/_templates.yml#pack_hdrp_blank_template_OSX_6000.1 artifacts: packages: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -publish_hdrp_blank_template_trunk_dry_run: +publish_hdrp_blank_template_6000.1_dry_run: agent: type: Unity::VM image: package-ci/win10:v4 flavor: b1.large - name: Publish HDRP Blank Template trunk Dry Run + name: Publish HDRP Blank Template 6000.1 Dry Run commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template.hdrp-blank --dry-run dependencies: - - path: .yamato/_templates.yml#test_hdrp_blank_template_Win_trunk + - path: .yamato/_templates.yml#test_hdrp_blank_template_Win_6000.1 return: always - - path: .yamato/_templates.yml#test_hdrp_blank_template_OSX_trunk + - path: .yamato/_templates.yml#test_hdrp_blank_template_OSX_6000.1 return: always - - path: .yamato/_templates.yml#pack_hdrp_blank_template_Win_trunk + - path: .yamato/_templates.yml#pack_hdrp_blank_template_Win_6000.1 return: always - - path: .yamato/_templates.yml#pack_hdrp_blank_template_OSX_trunk + - path: .yamato/_templates.yml#pack_hdrp_blank_template_OSX_6000.1 return: always artifacts: packages: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -pre_pack_universal_template_Win_trunk: - name: Pre-Pack Universal Template Win trunk +pre_pack_universal_template_Win_6000.1: + name: Pre-Pack Universal Template Win 6000.1 agent: type: Unity::VM image: package-ci/win11:v4 @@ -324,7 +324,7 @@ pre_pack_universal_template_Win_trunk: - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win + - path: .yamato/_editor_priming.yml#editor:priming:6000.1:Win return: always artifacts: primed: @@ -335,8 +335,8 @@ pre_pack_universal_template_Win_trunk: logs: paths: - "Editor.log" -pack_universal_template_Win_trunk: - name: Pack Universal Template Win trunk +pack_universal_template_Win_6000.1: + name: Pack Universal Template Win 6000.1 agent: type: Unity::VM image: package-ci/win10:v4 @@ -349,16 +349,16 @@ pack_universal_template_Win_trunk: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -test_universal_template_Win_trunk: - name: Test Universal Template Win trunk +test_universal_template_Win_6000.1: + name: Test Universal Template Win 6000.1 agent: type: Unity::VM image: package-ci/win11:v4 flavor: b1.large dependencies: - - path: .yamato/_templates.yml#pack_universal_template_Win_trunk + - path: .yamato/_templates.yml#pack_universal_template_Win_6000.1 return: always - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win + - path: .yamato/_editor_priming.yml#editor:priming:6000.1:Win return: always commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm @@ -369,8 +369,8 @@ test_universal_template_Win_trunk: logs: paths: - "**/test-results/**" -pre_pack_universal_template_OSX_trunk: - name: Pre-Pack Universal Template OSX trunk +pre_pack_universal_template_OSX_6000.1: + name: Pre-Pack Universal Template OSX 6000.1 agent: type: Unity::VM::osx image: package-ci/macos-13:v4 @@ -379,7 +379,7 @@ pre_pack_universal_template_OSX_trunk: - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX + - path: .yamato/_editor_priming.yml#editor:priming:6000.1:OSX return: always artifacts: primed: @@ -390,8 +390,8 @@ pre_pack_universal_template_OSX_trunk: logs: paths: - "Editor.log" -pack_universal_template_OSX_trunk: - name: Pack Universal Template OSX trunk +pack_universal_template_OSX_6000.1: + name: Pack Universal Template OSX 6000.1 agent: type: Unity::VM image: package-ci/win10:v4 @@ -404,16 +404,16 @@ pack_universal_template_OSX_trunk: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -test_universal_template_OSX_trunk: - name: Test Universal Template OSX trunk +test_universal_template_OSX_6000.1: + name: Test Universal Template OSX 6000.1 agent: type: Unity::VM::osx image: package-ci/macos-13:v4 flavor: m1.mac dependencies: - - path: .yamato/_templates.yml#pack_universal_template_OSX_trunk + - path: .yamato/_templates.yml#pack_universal_template_OSX_6000.1 return: always - - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX + - path: .yamato/_editor_priming.yml#editor:priming:6000.1:OSX return: always commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm @@ -423,66 +423,66 @@ test_universal_template_OSX_trunk: logs: paths: - "**/test-results/**" -publish_universal_template_trunk: +publish_universal_template_6000.1: agent: type: Unity::VM image: package-ci/win10:v4 flavor: b1.large - name: Publish Universal Template trunk + name: Publish Universal Template 6000.1 commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-universal dependencies: - - .yamato/_templates.yml#test_universal_template_Win_trunk - - .yamato/_templates.yml#test_universal_template_OSX_trunk - - .yamato/_templates.yml#pack_universal_template_Win_trunk - - .yamato/_templates.yml#pack_universal_template_OSX_trunk + - .yamato/_templates.yml#test_universal_template_Win_6000.1 + - .yamato/_templates.yml#test_universal_template_OSX_6000.1 + - .yamato/_templates.yml#pack_universal_template_Win_6000.1 + - .yamato/_templates.yml#pack_universal_template_OSX_6000.1 artifacts: packages: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -publish_universal_template_trunk_dry_run: +publish_universal_template_6000.1_dry_run: agent: type: Unity::VM image: package-ci/win10:v4 flavor: b1.large - name: Publish Universal Template trunk Dry Run + name: Publish Universal Template 6000.1 Dry Run commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template publish --project-path com.unity.template-universal --dry-run dependencies: - - path: .yamato/_templates.yml#test_universal_template_Win_trunk + - path: .yamato/_templates.yml#test_universal_template_Win_6000.1 return: always - - path: .yamato/_templates.yml#test_universal_template_OSX_trunk + - path: .yamato/_templates.yml#test_universal_template_OSX_6000.1 return: always - - path: .yamato/_templates.yml#pack_universal_template_Win_trunk + - path: .yamato/_templates.yml#pack_universal_template_Win_6000.1 return: always - - path: .yamato/_templates.yml#pack_universal_template_OSX_trunk + - path: .yamato/_templates.yml#pack_universal_template_OSX_6000.1 return: always artifacts: packages: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -all_template_ci_trunk: - name: Pack and test all templates - trunk +all_template_ci_6000.1: + name: Pack and test all templates - 6000.1 agent: type: Unity::VM image: package-ci/win10:v4 flavor: b1.large dependencies: - - path: .yamato/_templates.yml#test_hdrp_template_Win_trunk + - path: .yamato/_templates.yml#test_hdrp_template_Win_6000.1 rerun: always - - path: .yamato/_templates.yml#test_hdrp_blank_template_Win_trunk + - path: .yamato/_templates.yml#test_hdrp_blank_template_Win_6000.1 rerun: always - - path: .yamato/_templates.yml#test_universal_template_Win_trunk + - path: .yamato/_templates.yml#test_universal_template_Win_6000.1 rerun: always - - path: .yamato/_templates.yml#test_hdrp_template_OSX_trunk + - path: .yamato/_templates.yml#test_hdrp_template_OSX_6000.1 rerun: always - - path: .yamato/_templates.yml#test_hdrp_blank_template_OSX_trunk + - path: .yamato/_templates.yml#test_hdrp_blank_template_OSX_6000.1 rerun: always - - path: .yamato/_templates.yml#test_universal_template_OSX_trunk + - path: .yamato/_templates.yml#test_universal_template_OSX_6000.1 rerun: always commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm diff --git a/.yamato/all-postprocessing.yml b/.yamato/all-postprocessing.yml deleted file mode 100644 index b7f16282c18..00000000000 --- a/.yamato/all-postprocessing.yml +++ /dev/null @@ -1,50 +0,0 @@ - -# This file is generated by ant_yaml_generation package, don't edit this file manually. -# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling). - - ---- - -PR_PostProcessing_trunk: - name: PR PostProcessing on trunk - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UTR_VERSION: "current" - dependencies: - - path: .yamato/postprocessing-win-dx11.yml#PostProcessing_Win_DX11_Standalone_mono_Linear_trunk - rerun: on_new_revis - - path: .yamato/postprocessing-win-dx11.yml#PostProcessing_Win_DX11_playmode_mono_Linear_trunk - rerun: always - - path: .yamato/postprocessing-win-dx12.yml#PostProcessing_Win_DX12_playmode_mono_Linear_trunk - rerun: always - - path: .yamato/postprocessing-win-vulkan.yml#PostProcessing_Win_Vulkan_playmode_mono_Linear_trunk - rerun: always - - path: .yamato/postprocessing-osx-metal.yml#PostProcessing_OSX_Metal_playmode_mono_Linear_trunk - rerun: always - - path: .yamato/postprocessing-linux-vulkan.yml#PostProcessing_Linux_Vulkan_Standalone_mono_Linear_trunk - rerun: always - - path: .yamato/postprocessing-linux-vulkan.yml#PostProcessing_Linux_Vulkan_playmode_mono_Linear_trunk - rerun: always -Extra_PostProcessing_trunk: - name: Extra PostProcessing on trunk - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UTR_VERSION: "current" - dependencies: - - path: .yamato/postprocessing-win-dx12.yml#PostProcessing_Win_DX12_Standalone_mono_Linear_trunk - rerun: always - - path: .yamato/postprocessing-win-vulkan.yml#PostProcessing_Win_Vulkan_Standalone_mono_Linear_trunk - rerun: always -PostProcessing_trunk: - name: PostProcessing on trunk - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UTR_VERSION: "current" - dependencies: - - path: .yamato/all-postprocessing.yml#PR_PostProcessing_trunk - rerun: always - - path: .yamato/all-postprocessing.yml#Extra_PostProcessing_trunk - rerun: always diff --git a/.yamato/postprocessing-linux-vulkan.yml b/.yamato/postprocessing-linux-vulkan.yml deleted file mode 100644 index b6b284dba90..00000000000 --- a/.yamato/postprocessing-linux-vulkan.yml +++ /dev/null @@ -1,109 +0,0 @@ - -# This file is generated by ant_yaml_generation package, don't edit this file manually. -# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling). - - ---- - -PostProcessing_Linux_Vulkan_playmode_mono_Linear_trunk: - name: PostProcessing on Linux_Vulkan_playmode_mono_Linear on version trunk - agent: - type: Unity::VM::GPU - image: desktop/ubuntu-20.04-desktop:v2.1348791 - flavor: b1.large - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/PostProcessing_Tests - after: - - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - - command: find_instabilities || exit 0 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux - rerun: always -PostProcessing_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: PostProcessing on Linux_Vulkan_Standalone_mono_Linear on version trunk - agent: - type: Unity::VM::GPU - image: desktop/ubuntu-20.04-desktop:v2.1348791 - flavor: b1.large - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 - after: - - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - - command: find_instabilities || exit 0 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux - rerun: always - - path: .yamato/postprocessing-linux-vulkan.yml#Build_PostProcessing_Linux_Vulkan_Standalone_mono_Linear_trunk - rerun: always -Build_PostProcessing_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: Build PostProcessing on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk - agent: - type: Unity::VM - image: desktop/ubuntu-20.04-desktop:v2.1348791 - flavor: b1.xlarge - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/PostProcessing_Tests --timeout=1200 - after: - - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - - command: find_instabilities || exit 0 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux - rerun: always diff --git a/.yamato/postprocessing-osx-metal.yml b/.yamato/postprocessing-osx-metal.yml deleted file mode 100644 index 22fd9fea079..00000000000 --- a/.yamato/postprocessing-osx-metal.yml +++ /dev/null @@ -1,83 +0,0 @@ - -# This file is generated by ant_yaml_generation package, don't edit this file manually. -# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling). - - ---- - -PostProcessing_OSX_Metal_playmode_mono_Linear_trunk: - name: PostProcessing on OSX_Metal_playmode_mono_Linear on version trunk - agent: - type: Unity::metal::macmini - image: automation-tooling/macos-11:v2.1987114 - flavor: m1.mac - model: 2018-i3-macos11 - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - pip3 install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple - - unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: rsync -aq -e 'ssh -i ~/.ssh/id_rsa_macmini' --append --timeout=30 $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/ - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: |2- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results --editor-location=/Users/bokken/Graphics/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests " - UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results/ TestProjects/PostProcessing_Tests - exit $UTR_RESULT - after: - - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - - command: find_instabilities || exit 0 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX - rerun: always -PostProcessing_OSX_Metal_Standalone_mono_Linear_trunk: - name: PostProcessing on OSX_Metal_Standalone_mono_Linear on version trunk - agent: - type: Unity::metal::macmini - image: automation-tooling/macos-11:v2.1987114 - flavor: m1.mac - model: 2018-i3-macos11 - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - pip3 install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple - - unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: rsync -aq -e 'ssh -i ~/.ssh/id_rsa_macmini' --append --timeout=30 $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/ - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: |2- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests --timeout=2400 " - UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results/ TestProjects/PostProcessing_Tests - exit $UTR_RESULT - after: - - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - - command: find_instabilities || exit 0 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX - rerun: always diff --git a/.yamato/postprocessing-win-dx11.yml b/.yamato/postprocessing-win-dx11.yml deleted file mode 100644 index 5131cd03496..00000000000 --- a/.yamato/postprocessing-win-dx11.yml +++ /dev/null @@ -1,89 +0,0 @@ - -# This file is generated by ant_yaml_generation package, don't edit this file manually. -# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling). - - ---- - -PostProcessing_Win_DX11_playmode_mono_Linear_trunk: - name: PostProcessing on Win_DX11_playmode_mono_Linear on version trunk - agent: - type: Unity::VM::GPU - image: automation-tooling/win10-21H1:v2.2309361 - flavor: b1.large - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d11" --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/PostProcessing_Tests - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win - rerun: always -PostProcessing_Win_DX11_Standalone_mono_Linear_trunk: - name: PostProcessing on Win_DX11_Standalone_mono_Linear on version trunk - agent: - type: Unity::VM::GPU - image: automation-tooling/win10-21H1:v2.2309361 - flavor: b1.large - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --platform=StandaloneWindows64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win - rerun: always - - path: .yamato/postprocessing-win-dx11.yml#Build_PostProcessing_Win_DX11_Standalone_mono_Linear_trunk - rerun: always -Build_PostProcessing_Win_DX11_Standalone_mono_Linear_trunk: - name: Build PostProcessing on Win_DX11_mono_Linear_Standalone_build_Player on version trunk - agent: - type: Unity::VM - image: automation-tooling/win10-21H1:v2.2309361 - flavor: b1.xlarge - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="d3d11" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Direct3D11" --platform=StandaloneWindows64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/PostProcessing_Tests --timeout=1200 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win - rerun: always diff --git a/.yamato/postprocessing-win-dx12.yml b/.yamato/postprocessing-win-dx12.yml deleted file mode 100644 index 8b0133e0c72..00000000000 --- a/.yamato/postprocessing-win-dx12.yml +++ /dev/null @@ -1,89 +0,0 @@ - -# This file is generated by ant_yaml_generation package, don't edit this file manually. -# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling). - - ---- - -PostProcessing_Win_DX12_playmode_mono_Linear_trunk: - name: PostProcessing on Win_DX12_playmode_mono_Linear on version trunk - agent: - type: Unity::VM::GPU - image: automation-tooling/win10-21H1:v2.2309361 - flavor: b1.large - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d12" --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/PostProcessing_Tests - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win - rerun: always -PostProcessing_Win_DX12_Standalone_mono_Linear_trunk: - name: PostProcessing on Win_DX12_Standalone_mono_Linear on version trunk - agent: - type: Unity::VM::GPU - image: automation-tooling/win10-21H1:v2.2309361 - flavor: b1.large - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --platform=StandaloneWindows64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win - rerun: always - - path: .yamato/postprocessing-win-dx12.yml#Build_PostProcessing_Win_DX12_Standalone_mono_Linear_trunk - rerun: always -Build_PostProcessing_Win_DX12_Standalone_mono_Linear_trunk: - name: Build PostProcessing on Win_DX12_mono_Linear_Standalone_build_Player on version trunk - agent: - type: Unity::VM - image: automation-tooling/win10-21H1:v2.2309361 - flavor: b1.xlarge - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="d3d12" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Direct3D12" --platform=StandaloneWindows64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/PostProcessing_Tests --timeout=1200 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win - rerun: always diff --git a/.yamato/postprocessing-win-vulkan.yml b/.yamato/postprocessing-win-vulkan.yml deleted file mode 100644 index 2cc63cc171c..00000000000 --- a/.yamato/postprocessing-win-vulkan.yml +++ /dev/null @@ -1,89 +0,0 @@ - -# This file is generated by ant_yaml_generation package, don't edit this file manually. -# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling). - - ---- - -PostProcessing_Win_Vulkan_playmode_mono_Linear_trunk: - name: PostProcessing on Win_Vulkan_playmode_mono_Linear on version trunk - agent: - type: Unity::VM::GPU - image: automation-tooling/win10-21H1:v2.2309361 - flavor: b1.large - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/PostProcessing_Tests - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win - rerun: always -PostProcessing_Win_Vulkan_Standalone_mono_Linear_trunk: - name: PostProcessing on Win_Vulkan_Standalone_mono_Linear on version trunk - agent: - type: Unity::VM::GPU - image: automation-tooling/win10-21H1:v2.2309361 - flavor: b1.large - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --platform=StandaloneWindows64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win - rerun: always - - path: .yamato/postprocessing-win-vulkan.yml#Build_PostProcessing_Win_Vulkan_Standalone_mono_Linear_trunk - rerun: always -Build_PostProcessing_Win_Vulkan_Standalone_mono_Linear_trunk: - name: Build PostProcessing on Win_Vulkan_mono_Linear_Standalone_build_Player on version trunk - agent: - type: Unity::VM - image: automation-tooling/win10-21H1:v2.2309361 - flavor: b1.xlarge - variables: - CUSTOM_REVISION: 'trunk' - TEST_FILTER: .* - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - UTR_VERSION: "current" - commands: - - command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneWindows64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/PostProcessing_Tests --timeout=1200 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win - rerun: always diff --git a/com.unity.template.hdrp-blank/.yamato/upm-ci.yml b/com.unity.template.hdrp-blank/.yamato/upm-ci.yml index 552b44e9141..8390c170921 100644 --- a/com.unity.template.hdrp-blank/.yamato/upm-ci.yml +++ b/com.unity.template.hdrp-blank/.yamato/upm-ci.yml @@ -1,7 +1,7 @@ target_editor: version: 2023.3 test_editors: - - version: trunk + - version: 6000.1 test_platforms: - name: win type: Unity::VM @@ -100,4 +100,4 @@ publish: {% for platform in test_platforms %} - .yamato/upm-ci.yml#test_{{ platform.name }}_{{ editor.version }} {% endfor %} - {% endfor %} \ No newline at end of file + {% endfor %} From b4a087106c58dbcd37b0d006457348d1edfcb7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Penavaire?= Date: Fri, 17 Jan 2025 10:30:52 +0100 Subject: [PATCH 2/6] Revert unintended change --- com.unity.template.hdrp-blank/.yamato/upm-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.template.hdrp-blank/.yamato/upm-ci.yml b/com.unity.template.hdrp-blank/.yamato/upm-ci.yml index 8390c170921..552b44e9141 100644 --- a/com.unity.template.hdrp-blank/.yamato/upm-ci.yml +++ b/com.unity.template.hdrp-blank/.yamato/upm-ci.yml @@ -1,7 +1,7 @@ target_editor: version: 2023.3 test_editors: - - version: 6000.1 + - version: trunk test_platforms: - name: win type: Unity::VM @@ -100,4 +100,4 @@ publish: {% for platform in test_platforms %} - .yamato/upm-ci.yml#test_{{ platform.name }}_{{ editor.version }} {% endfor %} - {% endfor %} + {% endfor %} \ No newline at end of file From c34a0c36ffa9c3f5d068a727ff14196c0a4caf95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Penavaire?= Date: Fri, 17 Jan 2025 10:34:11 +0100 Subject: [PATCH 3/6] Turn nightly into weekly --- .yamato/_abv.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_abv.yml b/.yamato/_abv.yml index 7c54f6915fc..bc8266e88c1 100644 --- a/.yamato/_abv.yml +++ b/.yamato/_abv.yml @@ -5,8 +5,8 @@ --- -graphics_repo_nightly_6000.1: - name: Graphics repo nightly on 6000.1 on 6000.1 +graphics_repo_weekly_6000.1: + name: Graphics repo weekly on 6000.1 on 6000.1 variables: CUSTOM_REVISION: '6000.1/staging' TEST_FILTER: .* From 579579e3c864b1e73379d37df3904320e4b69d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Penavaire?= Date: Fri, 17 Jan 2025 13:23:31 +0100 Subject: [PATCH 4/6] Tryfix template errors --- .../Tests/Editor/InternalTests/ExpectedSettings.cs | 2 -- .../Packages/com.unity.template.hdrp-blank/CHANGELOG.md | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/ExpectedSettings.cs b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/ExpectedSettings.cs index abc52f9182e..e88690a6512 100644 --- a/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/ExpectedSettings.cs +++ b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/ExpectedSettings.cs @@ -18,7 +18,6 @@ static IEnumerable GraphicsJobsValidBuildTargets yield return new TestCaseData(BuildTarget.iOS); yield return new TestCaseData(BuildTarget.PS4); yield return new TestCaseData(BuildTarget.PS5); - yield return new TestCaseData(BuildTarget.Stadia); yield return new TestCaseData(BuildTarget.StandaloneLinux64); yield return new TestCaseData(BuildTarget.StandaloneOSX); yield return new TestCaseData(BuildTarget.StandaloneWindows); @@ -45,7 +44,6 @@ private static bool GraphicsJobsEnabledByDefault(BuildTarget buildTarget) return false; case BuildTarget.PS4: case BuildTarget.PS5: - case BuildTarget.Stadia: case BuildTarget.StandaloneLinux64: case BuildTarget.StandaloneWindows: case BuildTarget.StandaloneWindows64: diff --git a/com.unity.template.hdrp-blank/Packages/com.unity.template.hdrp-blank/CHANGELOG.md b/com.unity.template.hdrp-blank/Packages/com.unity.template.hdrp-blank/CHANGELOG.md index 5cb60e1217e..d8e03133846 100644 --- a/com.unity.template.hdrp-blank/Packages/com.unity.template.hdrp-blank/CHANGELOG.md +++ b/com.unity.template.hdrp-blank/Packages/com.unity.template.hdrp-blank/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [17.0.6] - 2024-10-09 -## Changed +### Changed - Fixed default managed stripping level From 5181d52bf6a2e522258da9154183cddd5b6bd635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Penavaire?= Date: Fri, 17 Jan 2025 14:19:22 +0100 Subject: [PATCH 5/6] Bump hdrp-blank (missed in previous PR) --- .../Packages/com.unity.template.hdrp-blank/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.template.hdrp-blank/Packages/com.unity.template.hdrp-blank/package.json b/com.unity.template.hdrp-blank/Packages/com.unity.template.hdrp-blank/package.json index 886da45f2d0..c9959aee442 100644 --- a/com.unity.template.hdrp-blank/Packages/com.unity.template.hdrp-blank/package.json +++ b/com.unity.template.hdrp-blank/Packages/com.unity.template.hdrp-blank/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.template.hdrp-blank", "displayName":"3D HDRP", - "version": "17.0.5", + "version": "17.0.6", "type": "template", "host": "hub", "unity": "2023.3", From 14e664e93c0e11292d68bd5e863bb76971c4ce9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Penavaire?= Date: Fri, 17 Jan 2025 14:55:46 +0100 Subject: [PATCH 6/6] Bump exception file --- .../com.unity.template.hdrp-blank/ValidationExceptions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.template.hdrp-blank/Packages/com.unity.template.hdrp-blank/ValidationExceptions.json b/com.unity.template.hdrp-blank/Packages/com.unity.template.hdrp-blank/ValidationExceptions.json index 39f31bfe43c..9c62357da95 100644 --- a/com.unity.template.hdrp-blank/Packages/com.unity.template.hdrp-blank/ValidationExceptions.json +++ b/com.unity.template.hdrp-blank/Packages/com.unity.template.hdrp-blank/ValidationExceptions.json @@ -2,7 +2,7 @@ "ErrorExceptions": [ { "ValidationTest": "Primed Library Validation", - "PackageVersion": "17.0.5" + "PackageVersion": "17.0.6" } ], "WarningExceptions": []