Merge branch 'develop' into backend-prompt-interrupts-asset-import

Author: ritamerkl

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

@@ -1,15 +1,15 @@
 # Auto-generated by Recipe Engine, do not modify manually.
-# This job is generated by the wrench recipe engine module, see find the docs here: https://internaldocs.unity.com/packageworks/wrench/gettingstarted/
+# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
 
 # upm-ci validation tests for API Validation - inputsystem - 2019.4 - windows (2019.4 - Windows).
 api_validation_-_inputsystem_-_2019_4_-_windows:
   name: API Validation - inputsystem - 2019.4 - windows
   agent:
-    image: package-ci/win10:default
+    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-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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
@@ -50,11 +50,11 @@ api_validation_-_inputsystem_-_2019_4_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.27.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.33.0
   triggers:
     expression: push.branch match "^release/.*"
     cancel_old_ci: true
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.27.0
+    Wrench: 0.10.33.0
 

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

@@ -1,18 +1,18 @@
 # Auto-generated by Recipe Engine, do not modify manually.
-# This job is generated by the wrench recipe engine module, see find the docs here: https://internaldocs.unity.com/packageworks/wrench/gettingstarted/
+# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
 
 # Pack and Sign Input System
 package_pack_-_inputsystem:
   name: Package Pack - inputsystem
   agent:
-    image: package-ci/ubuntu-20.04:default
+    image: package-ci/ubuntu-20.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - 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: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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
@@ -31,8 +31,8 @@ package_pack_-_inputsystem:
       - upm-ci~/packages/**/*
   variables:
     UPMCI_ACK_LARGE_PACKAGE: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.27.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.33.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.27.0
+    Wrench: 0.10.33.0