Merge branch 'develop-2.0.0' into reference/pvp-133-132-130-issues

Author: NoelStephensUnity

.yamato/wrench/api-validation-jobs.yml

@@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.47.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0
 

.yamato/wrench/package-pack-jobs.yml

@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
     UPMCI_ACK_LARGE_PACKAGE: 1
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0
 

.yamato/wrench/preview-a-p-v.yml

@@ -14,9 +14,12 @@ all_preview_apv_jobs:
   - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_macos
   - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_ubuntu
   - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_windows
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_macos
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_ubuntu
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_windows
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
 preview_apv_-_6000_0_-_macos:
@@ -67,10 +70,10 @@ preview_apv_-_6000_0_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.47.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
 preview_apv_-_6000_0_-_ubuntu:
@@ -121,10 +124,10 @@ preview_apv_-_6000_0_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.47.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (Windows).
 preview_apv_-_6000_0_-_windows:
@@ -176,10 +179,10 @@ preview_apv_-_6000_0_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.47.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0
 
 # Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
 preview_apv_-_6000_1_-_macos:
@@ -230,10 +233,10 @@ preview_apv_-_6000_1_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.47.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0
 
 # Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
 preview_apv_-_6000_1_-_ubuntu:
@@ -284,10 +287,10 @@ preview_apv_-_6000_1_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.47.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0
 
 # Functional tests for dependents found in the latest 6000.1 manifest (Windows).
 preview_apv_-_6000_1_-_windows:
@@ -339,10 +342,10 @@ preview_apv_-_6000_1_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.47.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0
 
 # Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
 preview_apv_-_6000_2_-_macos:
@@ -393,10 +396,10 @@ preview_apv_-_6000_2_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.47.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0
 
 # Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
 preview_apv_-_6000_2_-_ubuntu:
@@ -447,10 +450,10 @@ preview_apv_-_6000_2_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.47.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0
 
 # Functional tests for dependents found in the latest 6000.2 manifest (Windows).
 preview_apv_-_6000_2_-_windows:
@@ -502,8 +505,171 @@ preview_apv_-_6000_2_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.47.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0
+
+# Functional tests for dependents found in the latest 6000.3 manifest (MacOS).
+preview_apv_-_6000_3_-_macos:
+  name: Preview APV - 6000.3 - macos
+  agent:
+    image: package-ci/macos-13:default
+    type: Unity::VM::osx
+    flavor: b1.xlarge
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-61_6af0746012fdbe27c8d9841fcad8f97465d1943826d6884e6aabf0d289b83093.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.3 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --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
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.48.0
+
+# Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu).
+preview_apv_-_6000_3_-_ubuntu:
+  name: Preview APV - 6000.3 - ubuntu
+  agent:
+    image: package-ci/ubuntu-20.04:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-61_6af0746012fdbe27c8d9841fcad8f97465d1943826d6884e6aabf0d289b83093.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.3 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --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
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.48.0
+
+# Functional tests for dependents found in the latest 6000.3 manifest (Windows).
+preview_apv_-_6000_3_-_windows:
+  name: Preview APV - 6000.3 - windows
+  agent:
+    image: package-ci/win10:default
+    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-2-61_6af0746012fdbe27c8d9841fcad8f97465d1943826d6884e6aabf0d289b83093.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.3 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/editor_manifest_validator.py --version=6000.3 --wrench-config=.yamato/wrench/wrench_config.json
+  after:
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.48.0
 

.yamato/wrench/promotion-jobs.yml

@@ -116,12 +116,42 @@ publish_dry_run_netcode_gameobjects:
         unzip: true
       packages:
         ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_3_-_macos
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.3-macos
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.3-macos
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_3_-_ubuntu
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.3-ubuntu
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.3-ubuntu
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_3_-_windows
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.3-windows
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.3-windows
+        unzip: true
+      packages:
+        ignore_artifact: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.47.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0
 
 # Publish  for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
 publish_netcode_gameobjects:
@@ -238,10 +268,40 @@ publish_netcode_gameobjects:
         unzip: true
       packages:
         ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_3_-_macos
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.3-macos
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.3-macos
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_3_-_ubuntu
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.3-ubuntu
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.3-ubuntu
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_3_-_windows
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.3-windows
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.3-windows
+        unzip: true
+      packages:
+        ignore_artifact: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.47.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.48.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.47.0
+    Wrench: 0.10.48.0