From e2511b4ad2c928200f8172e649c9f2a030e8768a Mon Sep 17 00:00:00 2001 From: leonardo Date: Thu, 23 Jul 2026 15:41:58 +0200 Subject: [PATCH] Upgrade wrench to 3.3.1 and regenerate CI job definitions Bump RecipeEngine.Modules.Wrench 2.3.1 -> 3.3.1 in the Cookbook project and regenerate all Yamato job YAML via the recipe engine. Notable regenerated changes from the 3.x upgrade: - Validation editor track moved 6000.4/staging -> 6000.5/staging - Local APV tool bumped 1-3-0 -> 1-3-3 - Job timeouts raised 10 -> 20 - Updated auto-generated header format with source provenance lines Co-Authored-By: Claude Opus 4.8 (1M context) --- .yamato/wrench/api-validation-jobs.yml | 13 +- .yamato/wrench/package-pack-jobs.yml | 9 +- .yamato/wrench/preview-a-p-v.yml | 209 +++++++++++++------------ .yamato/wrench/promotion-jobs.yml | 128 +++++++-------- .yamato/wrench/publish-trigger.yml | 7 +- .yamato/wrench/recipe-regeneration.yml | 9 +- .yamato/wrench/validation-jobs.yml | 205 ++++++++++++------------ .yamato/wrench/wrench_config.json | 2 +- Tools/CI/fbxexporter.Cookbook.csproj | 2 +- 9 files changed, 312 insertions(+), 272 deletions(-) diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index 8c278419..04481f41 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.ApiValidationJobs # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb all_api_validation_jobs: name: All API Validation Jobs @@ -13,7 +18,7 @@ api_validation_-_formats_fbx_-_6000_0_-_win10: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -55,8 +60,8 @@ api_validation_-_formats_fbx_-_6000_0_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index 016b2800..40168ca2 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.yamato/wrench/package-pack-jobs.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PackagePackJobs # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Pack FBX Exporter @@ -26,5 +31,5 @@ package_pack_-_formats_fbx: UPMCI_ACK_LARGE_PACKAGE: 1 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index 57d64026..042c0cba 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PreviewAPV # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Parent Preview APV Job. @@ -11,18 +16,18 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_macos13 - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_ubuntu2204 - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_win10 - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_macos13 - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_ubuntu2204 - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_win10 - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_macos13 - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_ubuntu2204 - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_win10 - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_macos13 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_macos13arm - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_ubuntu2204 - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_win10 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_7_-_macos13arm + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_7_-_ubuntu2204 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_7_-_win10 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS). preview_apv_-_6000_0_-_macos13: @@ -32,7 +37,7 @@ preview_apv_-_6000_0_-_macos13: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -77,10 +82,10 @@ preview_apv_-_6000_0_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). preview_apv_-_6000_0_-_ubuntu2204: @@ -90,7 +95,7 @@ preview_apv_-_6000_0_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -135,10 +140,10 @@ preview_apv_-_6000_0_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 # Functional tests for dependents found in the latest 6000.0 manifest (Windows). preview_apv_-_6000_0_-_win10: @@ -149,7 +154,7 @@ preview_apv_-_6000_0_-_win10: flavor: b1.large commands: - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -194,10 +199,10 @@ preview_apv_-_6000_0_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 # Functional tests for dependents found in the latest 6000.3 manifest (MacOS). preview_apv_-_6000_3_-_macos13: @@ -207,7 +212,7 @@ preview_apv_-_6000_3_-_macos13: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -252,10 +257,10 @@ preview_apv_-_6000_3_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 # Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu). preview_apv_-_6000_3_-_ubuntu2204: @@ -265,7 +270,7 @@ preview_apv_-_6000_3_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -310,10 +315,10 @@ preview_apv_-_6000_3_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 # Functional tests for dependents found in the latest 6000.3 manifest (Windows). preview_apv_-_6000_3_-_win10: @@ -324,7 +329,7 @@ preview_apv_-_6000_3_-_win10: flavor: b1.large commands: - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -369,30 +374,30 @@ preview_apv_-_6000_3_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 -# Functional tests for dependents found in the latest 6000.4 manifest (MacOS). -preview_apv_-_6000_4_-_macos13: - name: Preview APV - 6000.4 - macos13 +# Functional tests for dependents found in the latest 6000.5 manifest (MacOS). +preview_apv_-_6000_5_-_macos13: + name: Preview APV - 6000.5 - macos13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.4 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' after: - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh @@ -427,30 +432,30 @@ preview_apv_-_6000_4_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 -# Functional tests for dependents found in the latest 6000.4 manifest (Ubuntu). -preview_apv_-_6000_4_-_ubuntu2204: - name: Preview APV - 6000.4 - ubuntu2204 +# Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu). +preview_apv_-_6000_5_-_ubuntu2204: + name: Preview APV - 6000.5 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.4 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' after: - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh @@ -485,32 +490,32 @@ preview_apv_-_6000_4_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 -# Functional tests for dependents found in the latest 6000.4 manifest (Windows). -preview_apv_-_6000_4_-_win10: - name: Preview APV - 6000.4 - win10 +# Functional tests for dependents found in the latest 6000.5 manifest (Windows). +preview_apv_-_6000_5_-_win10: + name: Preview APV - 6000.5 - win10 agent: image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.4 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=6000.4 --wrench-config=.yamato/wrench/wrench_config.json + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/editor_manifest_validator.py --version=6000.5 --wrench-config=.yamato/wrench/wrench_config.json after: - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd artifacts: @@ -544,30 +549,31 @@ preview_apv_-_6000_4_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 -# Functional tests for dependents found in the latest 6000.5 manifest (MacOS). -preview_apv_-_6000_5_-_macos13: - name: Preview APV - 6000.5 - macos13 +# Functional tests for dependents found in the latest 6000.6 manifest (MacOS). +preview_apv_-_6000_6_-_macos13arm: + name: Preview APV - 6000.6 - macos13arm agent: - image: package-ci/macos-13:v4 + image: package-ci/macos-13-arm64:v4 type: Unity::VM::osx - flavor: b1.xlarge + flavor: m1.mac + model: M1 commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast --arch arm64 timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' after: - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh @@ -602,30 +608,30 @@ preview_apv_-_6000_5_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 -# Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu). -preview_apv_-_6000_5_-_ubuntu2204: - name: Preview APV - 6000.5 - ubuntu2204 +# Functional tests for dependents found in the latest 6000.6 manifest (Ubuntu). +preview_apv_-_6000_6_-_ubuntu2204: + name: Preview APV - 6000.6 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' after: - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh @@ -660,32 +666,32 @@ preview_apv_-_6000_5_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 -# Functional tests for dependents found in the latest 6000.5 manifest (Windows). -preview_apv_-_6000_5_-_win10: - name: Preview APV - 6000.5 - win10 +# Functional tests for dependents found in the latest 6000.6 manifest (Windows). +preview_apv_-_6000_6_-_win10: + name: Preview APV - 6000.6 - win10 agent: image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast + - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=6000.5 --wrench-config=.yamato/wrench/wrench_config.json + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/editor_manifest_validator.py --version=6000.6 --wrench-config=.yamato/wrench/wrench_config.json after: - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd artifacts: @@ -719,30 +725,31 @@ preview_apv_-_6000_5_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 -# Functional tests for dependents found in the latest 6000.6 manifest (MacOS). -preview_apv_-_6000_6_-_macos13: - name: Preview APV - 6000.6 - macos13 +# Functional tests for dependents found in the latest 6000.7 manifest (MacOS). +preview_apv_-_6000_7_-_macos13arm: + name: Preview APV - 6000.7 - macos13arm agent: - image: package-ci/macos-13:v4 + image: package-ci/macos-13-arm64:v4 type: Unity::VM::osx - flavor: b1.xlarge + flavor: m1.mac + model: M1 commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast + - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast --arch arm64 timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.7 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' after: - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh @@ -777,20 +784,20 @@ preview_apv_-_6000_6_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 -# Functional tests for dependents found in the latest 6000.6 manifest (Ubuntu). -preview_apv_-_6000_6_-_ubuntu2204: - name: Preview APV - 6000.6 - ubuntu2204 +# Functional tests for dependents found in the latest 6000.7 manifest (Ubuntu). +preview_apv_-_6000_7_-_ubuntu2204: + name: Preview APV - 6000.7 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -800,7 +807,7 @@ preview_apv_-_6000_6_-_ubuntu2204: - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.7 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' after: - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh @@ -835,21 +842,21 @@ preview_apv_-_6000_6_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 -# Functional tests for dependents found in the latest 6000.6 manifest (Windows). -preview_apv_-_6000_6_-_win10: - name: Preview APV - 6000.6 - win10 +# Functional tests for dependents found in the latest 6000.7 manifest (Windows). +preview_apv_-_6000_7_-_win10: + name: Preview APV - 6000.7 - win10 agent: image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -859,8 +866,8 @@ preview_apv_-_6000_6_-_win10: - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast timeout: 10 retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=6000.6 --wrench-config=.yamato/wrench/wrench_config.json + - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.7 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ + - command: python PythonScripts/editor_manifest_validator.py --version=6000.7 --wrench-config=.yamato/wrench/wrench_config.json after: - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd artifacts: @@ -894,8 +901,8 @@ preview_apv_-_6000_6_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 42bfff8e..00b895dc 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PromotionJobs # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Publish Dry Run for formats.fbx to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm @@ -9,7 +14,7 @@ publish_dry_run_formats_fbx: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -86,102 +91,102 @@ publish_dry_run_formats_fbx: UTR: location: results/UTR/validate-formats.fbx-6000.3-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_4_-_macos13 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_5_-_macos13 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.4-macos13 + location: results/pvp/validate-formats.fbx-6000.5-macos13 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.4-macos13 + location: results/UTR/validate-formats.fbx-6000.5-macos13 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_4_-_ubuntu2204 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_5_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.4-ubuntu2204 + location: results/pvp/validate-formats.fbx-6000.5-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.4-ubuntu2204 + location: results/UTR/validate-formats.fbx-6000.5-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_4_-_win10 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_5_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.4-win10 + location: results/pvp/validate-formats.fbx-6000.5-win10 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.4-win10 + location: results/UTR/validate-formats.fbx-6000.5-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_5_-_macos13 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_6_-_macos13arm specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.5-macos13 + location: results/pvp/validate-formats.fbx-6000.6-macos13arm unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.5-macos13 + location: results/UTR/validate-formats.fbx-6000.6-macos13arm unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_5_-_ubuntu2204 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_6_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.5-ubuntu2204 + location: results/pvp/validate-formats.fbx-6000.6-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.5-ubuntu2204 + location: results/UTR/validate-formats.fbx-6000.6-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_5_-_win10 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_6_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.5-win10 + location: results/pvp/validate-formats.fbx-6000.6-win10 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.5-win10 + location: results/UTR/validate-formats.fbx-6000.6-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_6_-_macos13 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_7_-_macos13arm specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.6-macos13 + location: results/pvp/validate-formats.fbx-6000.7-macos13arm unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.6-macos13 + location: results/UTR/validate-formats.fbx-6000.7-macos13arm unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_6_-_ubuntu2204 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_7_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.6-ubuntu2204 + location: results/pvp/validate-formats.fbx-6000.7-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.6-ubuntu2204 + location: results/UTR/validate-formats.fbx-6000.7-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_6_-_win10 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_7_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.6-win10 + location: results/pvp/validate-formats.fbx-6000.7-win10 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.6-win10 + location: results/UTR/validate-formats.fbx-6000.7-win10 unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 # Publish for formats.fbx to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_formats_fbx: @@ -191,7 +196,7 @@ publish_formats_fbx: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -268,100 +273,101 @@ publish_formats_fbx: UTR: location: results/UTR/validate-formats.fbx-6000.3-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_4_-_macos13 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_5_-_macos13 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.4-macos13 + location: results/pvp/validate-formats.fbx-6000.5-macos13 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.4-macos13 + location: results/UTR/validate-formats.fbx-6000.5-macos13 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_4_-_ubuntu2204 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_5_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.4-ubuntu2204 + location: results/pvp/validate-formats.fbx-6000.5-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.4-ubuntu2204 + location: results/UTR/validate-formats.fbx-6000.5-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_4_-_win10 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_5_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.4-win10 + location: results/pvp/validate-formats.fbx-6000.5-win10 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.4-win10 + location: results/UTR/validate-formats.fbx-6000.5-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_5_-_macos13 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_6_-_macos13arm specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.5-macos13 + location: results/pvp/validate-formats.fbx-6000.6-macos13arm unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.5-macos13 + location: results/UTR/validate-formats.fbx-6000.6-macos13arm unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_5_-_ubuntu2204 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_6_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.5-ubuntu2204 + location: results/pvp/validate-formats.fbx-6000.6-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.5-ubuntu2204 + location: results/UTR/validate-formats.fbx-6000.6-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_5_-_win10 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_6_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.5-win10 + location: results/pvp/validate-formats.fbx-6000.6-win10 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.5-win10 + location: results/UTR/validate-formats.fbx-6000.6-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_6_-_macos13 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_7_-_macos13arm specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.6-macos13 + location: results/pvp/validate-formats.fbx-6000.7-macos13arm unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.6-macos13 + location: results/UTR/validate-formats.fbx-6000.7-macos13arm unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_6_-_ubuntu2204 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_7_-_ubuntu2204 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.6-ubuntu2204 + location: results/pvp/validate-formats.fbx-6000.7-ubuntu2204 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.6-ubuntu2204 + location: results/UTR/validate-formats.fbx-6000.7-ubuntu2204 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_6_-_win10 + - path: .yamato/wrench/validation-jobs.yml#validate_-_formats_fbx_-_6000_7_-_win10 specific_options: packages: ignore_artifact: true pvp-results: - location: results/pvp/validate-formats.fbx-6000.6-win10 + location: results/pvp/validate-formats.fbx-6000.7-win10 unzip: true UTR: - location: results/UTR/validate-formats.fbx-6000.6-win10 + location: results/UTR/validate-formats.fbx-6000.7-win10 unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 + allow_on: branch match "^release/.*" metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 diff --git a/.yamato/wrench/publish-trigger.yml b/.yamato/wrench/publish-trigger.yml index 13d7447f..bdf13f5e 100644 --- a/.yamato/wrench/publish-trigger.yml +++ b/.yamato/wrench/publish-trigger.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PublishTrigger # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb all_promotion_related_jobs_promotiontrigger: name: All Promotion Related Jobs PromotionTrigger diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index 9ff0602a..8e349bb6 100644 --- a/.yamato/wrench/recipe-regeneration.yml +++ b/.yamato/wrench/recipe-regeneration.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.RecipeRegeneration # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Test that Generated Wrench Jobs are up to date. @@ -26,5 +31,5 @@ test_-_wrench_jobs_up_to_date: cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 47eac475..b457f9eb 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.ValidationJobs # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # PVP Editor and Playmode tests for Validate - formats.fbx - 6000.0 - macos13 (6000.0 - MacOS). @@ -9,12 +14,12 @@ validate_-_formats_fbx_-_6000_0_-_macos13: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -64,10 +69,10 @@ validate_-_formats_fbx_-_6000_0_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx @@ -79,12 +84,12 @@ validate_-_formats_fbx_-_6000_0_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -134,10 +139,10 @@ validate_-_formats_fbx_-_6000_0_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx @@ -149,12 +154,12 @@ validate_-_formats_fbx_-_6000_0_-_win10: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -204,10 +209,10 @@ validate_-_formats_fbx_-_6000_0_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx @@ -219,12 +224,12 @@ validate_-_formats_fbx_-_6000_3_-_macos13: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -274,10 +279,10 @@ validate_-_formats_fbx_-_6000_3_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx @@ -289,12 +294,12 @@ validate_-_formats_fbx_-_6000_3_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -344,10 +349,10 @@ validate_-_formats_fbx_-_6000_3_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx @@ -359,12 +364,12 @@ validate_-_formats_fbx_-_6000_3_-_win10: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -414,27 +419,27 @@ validate_-_formats_fbx_-_6000_3_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx -# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.4 - macos13 (6000.4 - MacOS). -validate_-_formats_fbx_-_6000_4_-_macos13: - name: Validate - formats.fbx - 6000.4 - macos13 +# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.5 - macos13 (6000.5 - MacOS). +validate_-_formats_fbx_-_6000_5_-_macos13: + name: Validate - formats.fbx - 6000.5 - macos13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast - timeout: 10 + - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -484,27 +489,27 @@ validate_-_formats_fbx_-_6000_4_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx -# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.4 - ubuntu2204 (6000.4 - Ubuntu). -validate_-_formats_fbx_-_6000_4_-_ubuntu2204: - name: Validate - formats.fbx - 6000.4 - ubuntu2204 +# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.5 - ubuntu2204 (6000.5 - Ubuntu). +validate_-_formats_fbx_-_6000_5_-_ubuntu2204: + name: Validate - formats.fbx - 6000.5 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast - timeout: 10 + - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -554,27 +559,27 @@ validate_-_formats_fbx_-_6000_4_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx -# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.4 - win10 (6000.4 - Windows). -validate_-_formats_fbx_-_6000_4_-_win10: - name: Validate - formats.fbx - 6000.4 - win10 +# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.5 - win10 (6000.5 - Windows). +validate_-_formats_fbx_-_6000_5_-_win10: + name: Validate - formats.fbx - 6000.5 - win10 agent: image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast - timeout: 10 + - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -624,27 +629,28 @@ validate_-_formats_fbx_-_6000_4_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx -# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.5 - macos13 (6000.5 - MacOS). -validate_-_formats_fbx_-_6000_5_-_macos13: - name: Validate - formats.fbx - 6000.5 - macos13 +# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.6 - macos13arm (6000.6 - MacOS). +validate_-_formats_fbx_-_6000_6_-_macos13arm: + name: Validate - formats.fbx - 6000.6 - macos13arm agent: - image: package-ci/macos-13:v4 + image: package-ci/macos-13-arm64:v4 type: Unity::VM::osx - flavor: b1.xlarge + flavor: m1.mac + model: M1 commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast - timeout: 10 + - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast --arch arm64 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -694,27 +700,27 @@ validate_-_formats_fbx_-_6000_5_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx -# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.5 - ubuntu2204 (6000.5 - Ubuntu). -validate_-_formats_fbx_-_6000_5_-_ubuntu2204: - name: Validate - formats.fbx - 6000.5 - ubuntu2204 +# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.6 - ubuntu2204 (6000.6 - Ubuntu). +validate_-_formats_fbx_-_6000_6_-_ubuntu2204: + name: Validate - formats.fbx - 6000.6 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast - timeout: 10 + - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -764,27 +770,27 @@ validate_-_formats_fbx_-_6000_5_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx -# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.5 - win10 (6000.5 - Windows). -validate_-_formats_fbx_-_6000_5_-_win10: - name: Validate - formats.fbx - 6000.5 - win10 +# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.6 - win10 (6000.6 - Windows). +validate_-_formats_fbx_-_6000_6_-_win10: + name: Validate - formats.fbx - 6000.6 - win10 agent: image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast - timeout: 10 + - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -834,27 +840,28 @@ validate_-_formats_fbx_-_6000_5_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx -# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.6 - macos13 (6000.6 - MacOS). -validate_-_formats_fbx_-_6000_6_-_macos13: - name: Validate - formats.fbx - 6000.6 - macos13 +# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.7 - macos13arm (6000.7 - MacOS). +validate_-_formats_fbx_-_6000_7_-_macos13arm: + name: Validate - formats.fbx - 6000.7 - macos13arm agent: - image: package-ci/macos-13:v4 + image: package-ci/macos-13-arm64:v4 type: Unity::VM::osx - flavor: b1.xlarge + flavor: m1.mac + model: M1 commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast - timeout: 10 + - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast --arch arm64 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -904,27 +911,27 @@ validate_-_formats_fbx_-_6000_6_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx -# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.6 - ubuntu2204 (6000.6 - Ubuntu). -validate_-_formats_fbx_-_6000_6_-_ubuntu2204: - name: Validate - formats.fbx - 6000.6 - ubuntu2204 +# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.7 - ubuntu2204 (6000.7 - Ubuntu). +validate_-_formats_fbx_-_6000_7_-_ubuntu2204: + name: Validate - formats.fbx - 6000.7 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -974,27 +981,27 @@ validate_-_formats_fbx_-_6000_6_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx -# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.6 - win10 (6000.6 - Windows). -validate_-_formats_fbx_-_6000_6_-_win10: - name: Validate - formats.fbx - 6000.6 - win10 +# PVP Editor and Playmode tests for Validate - formats.fbx - 6000.7 - win10 (6000.7 - Windows). +validate_-_formats_fbx_-_6000_7_-_win10: + name: Validate - formats.fbx - 6000.7 - win10 agent: image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-formats.fbx --packages "upm-ci~/packages/*.tgz" --filter "com.unity.formats.fbx com.unity.formats.fbx.tests" --unity .Editor timeout: 10 @@ -1044,10 +1051,10 @@ validate_-_formats_fbx_-_6000_6_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.3.1.0 + UPMPVP_CONTEXT_WRENCH: 3.3.1.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.3.1.0 + Wrench: 3.3.1.0 labels: - Packages:formats.fbx diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 7669e997..a8527089 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -41,7 +41,7 @@ }, "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_formats_fbx", "branch_pattern": "ReleaseSlash", - "wrench_version": "2.3.1.0", + "wrench_version": "3.3.1.0", "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json", "cs_project_path": "Tools/CI/fbxexporter.Cookbook.csproj" } \ No newline at end of file diff --git a/Tools/CI/fbxexporter.Cookbook.csproj b/Tools/CI/fbxexporter.Cookbook.csproj index 74162edb..55cf8390 100644 --- a/Tools/CI/fbxexporter.Cookbook.csproj +++ b/Tools/CI/fbxexporter.Cookbook.csproj @@ -8,7 +8,7 @@ - +