Fix Yamato CI

.yamato/_abv.yml

@@ -1,20 +1,15 @@
-
-# This file is generated by ant_yaml_generation package, don't edit this file manually.
-# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling).
-
-
----
-
-graphics_repo_nightly_6000.4:
-    name: Graphics repo nightly on 6000.4
+graphics_repo_nightly_trunk:
+    name: Graphics repo nightly on trunk on trunk
     variables:
-        CUSTOM_REVISION: '6000.4/staging'
+        CUSTOM_REVISION: 'trunk'
         TEST_FILTER: .*
         UTR_VERSION: "current"
     triggers:
         recurring:
           -  branch: master
              frequency: weekly
     dependencies:
-      -  path: .yamato/_templates.yml#all_template_ci_6000.4
-         rerun: always
+      -  path: .yamato/_templates.yml#all_template_ci_trunk
+         rerun: always
+      -  path: .yamato/all-postprocessing.yml#PostProcessing_trunk
+         rerun: always

.yamato/_editor_priming.yml

@@ -1,19 +1,12 @@
-
-# This file is generated by ant_yaml_generation package, don't edit this file manually.
-# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling).
-
-
----
-
-editor:priming:6000.4:Win:
-    name: '[6000.4,Win] Editor priming'
+editor:priming:trunk:Win:
+    name: '[trunk,Win] Editor priming'
     agent:
         type: Unity::VM
         image: package-ci/ubuntu-22.04:v4
         flavor: b1.small
     skip_checkout: true
     variables:
-        CUSTOM_REVISION: '6000.4/staging'
+        CUSTOM_REVISION: 'trunk'
         DISPLAY: ":0"
         PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
         UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
@@ -51,15 +44,15 @@ editor:priming:test_min_editor:Win:
         unity_revision.zip:
             paths:
               -  "unity_revision.txt"
-editor:priming:6000.4:OSX:
-    name: '[6000.4,OSX] Editor priming'
+editor:priming:trunk:OSX:
+    name: '[trunk,OSX] Editor priming'
     agent:
         type: Unity::VM
         image: package-ci/ubuntu-22.04:v4
         flavor: b1.small
     skip_checkout: true
     variables:
-        CUSTOM_REVISION: '6000.4/staging'
+        CUSTOM_REVISION: 'trunk'
         DISPLAY: ":0"
         PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
         UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
@@ -97,15 +90,15 @@ editor:priming:test_min_editor:OSX:
         unity_revision.zip:
             paths:
               -  "unity_revision.txt"
-editor:priming:6000.4:Linux:
-    name: '[6000.4,Linux] Editor priming'
+editor:priming:trunk:Linux:
+    name: '[trunk,Linux] Editor priming'
     agent:
         type: Unity::VM
         image: package-ci/ubuntu-22.04:v4
         flavor: b1.small
     skip_checkout: true
     variables:
-        CUSTOM_REVISION: '6000.4/staging'
+        CUSTOM_REVISION: 'trunk'
         DISPLAY: ":0"
         PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
         UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates

.yamato/_postprocessing_publish.yml

@@ -0,0 +1,115 @@
+
+# From https://github.com/Unity-Technologies/PostProcessing/blob/v2/.yamato/upm-ci.yml
+
+name: postprocessing
+test_editors:
+  # This should start from the earliest supported stream (specified in the package.json file). Right now this is 2019.4.
+  - 2019.4
+  - 2020.3
+  - 2021.3
+  - 2022.3
+  - 6000.0
+  - 6000.2
+  - 6000.3
+  - 6000.4
+  - trunk
+test_platforms:
+  - name: win
+    type: Unity::VM
+    image: package-ci/win10:v4
+    flavor: b1.large
+  - name: mac
+    type: Unity::VM::osx
+    image: package-ci/macos-13:v4
+    flavor: m1.mac
+---
+{{ name }}_pack:
+  name: {{ name }} - Pack
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:v4
+    flavor: b1.large
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - upm-ci package pack --package-path com.unity.postprocessing
+  artifacts:
+    packages:
+      paths:
+        - "upm-ci~/**/*"
+
+{% for editor in test_editors %}
+{% for platform in test_platforms %}
+{{ name }}_test_{{ platform.name }}_{{ editor }}:
+  name : {{ name }} - Test {{ editor }} on {{ platform.name }}
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor}}
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - upm-ci package test --unity-version {{ editor }} --package-path com.unity.postprocessing --extra-utr-arg="--compilation-errors-as-warnings"
+  artifacts:
+    logs:
+      paths:
+        - "upm-ci~/test-results/**/*"
+  dependencies:
+    - .yamato/_postprocessing_publish.yml#{{ name }}_pack
+{% endfor %}
+{% endfor %}
+
+{{ name }}_test_trigger:
+  name: {{ name }} - Tests Trigger
+  dependencies:
+    - .yamato/_postprocessing_publish.yml#{{ name }}_pack
+    {% for editor in test_editors %}
+    {% for platform in test_platforms %}
+    - .yamato/_postprocessing_publish.yml#{{ name }}_test_{{platform.name}}_{{editor}}
+    {% endfor %}
+    {% endfor %}
+
+{{ name }}_publish:
+  name: {{ name }} - Publish to Internal Registry
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:v4
+    flavor: b1.large
+  variables:
+    UPMCI_ENABLE_PACKAGE_SIGNING: 1
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - upm-ci package publish --package-path com.unity.postprocessing
+  artifacts:
+    artifacts:
+      paths:
+        - "upm-ci~/packages/*.tgz"
+  dependencies:
+    - .yamato/_postprocessing_publish.yml#{{ name }}_pack
+    {% for editor in test_editors %}
+    {% for platform in test_platforms %}
+    - .yamato/_postprocessing_publish.yml#{{ name }}_test_{{ platform.name }}_{{ editor }}
+    {% endfor %}
+    {% endfor %}
+
+
+{{ name }}_publish_dry_run:
+  name: {{ name }} - Publish to Internal Registry [dry-run]
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:v4
+    flavor: b1.large
+  variables:
+    UPMCI_ENABLE_PACKAGE_SIGNING: 1
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - upm-ci package publish --dry-run --package-path com.unity.postprocessing
+  artifacts:
+    artifacts:
+      paths:
+        - "upm-ci~/packages/*.tgz"
+  dependencies:
+    - .yamato/_postprocessing_publish.yml#{{ name }}_pack
+    {% for editor in test_editors %}
+    {% for platform in test_platforms %}
+    - .yamato/_postprocessing_publish.yml#{{ name }}_test_{{ platform.name }}_{{ editor }}
+    {% endfor %}
+    {% endfor %}