Fixing names and references

.yamato/environments.yml

-
-
-publish_editors:
+  - version: 2020.1.1f1
+  - version: trunk
+  
+commit_hook_editors:
-
-publish_platforms:
-  - name: win
-    type: Unity::VM
-    image: package-ci/win10:stable
-    flavor: b1.large
-    extra-args: --force-d3d11
-    standalone-platform: StandaloneWindows64
-  - name: mac
-    type: Unity::VM::osx
-    image: package-ci/mac:stable
-    flavor: m1.mac
-    extra-args: --force-metal
-    standalone-platform: StandaloneOSX
-  - name: ubuntu
-    type: Unity::VM
-    image: package-ci/ubuntu:latest
-    flavor: b1.large
-
+  - version: 2020.1.1f1
+  
+nightly_editors:
+  - version: trunk
 
 test_platforms:
   - name: win
   - name: editmode
     display_name: editmode
     args: --suite=playmode --suite=editor --platform=Editor
-
-package_variants:
-  - name: Perception
 
 projects:
   - name: PerceptionHDRP

.yamato/publish.yml

       paths:
         - "upm-ci~/packages/*.tgz"
   dependencies:
-    - .yamato/upm-ci-full.yml#pack_Perception
-    {% for editor in publish_editors %}
-    {% for platform in publish_platforms %}
-    {% for suite in suites %}
-    {% for project in projects %}
-    - .yamato/upm-ci-full.yml#pkg_test_Perception_{{platform.name}}_{{editor.version}}
-    - .yamato/upm-ci-testprojects.yml#{{project.name}}_windows_{{suite.name}}_{{editor.version}}
-    {% endfor %}
-    {% endfor %}
-    {% endfor %}
-    {% endfor %}
+    - .yamato/upm-ci-full.yml#test_trigger
 

.yamato/promote.yml

 {% metadata_file .yamato/environments.yml %}
 
 ---
-{% for variant in package_variants %}
-  name : Package tests ({{variant.name}} pkg, {{ editor.version }}, {{ platform.name }})
+  name : Promotion tests, {{ editor.version }}, {{ platform.name }}
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}
       paths:
         - "upm-ci~/test-results/**/*"
   dependencies:
-    - .yamato/upm-ci-full.yml#pack_{{ variant.name }}
-{% endfor %}
+    - .yamato/upm-ci-full.yml#pack
-promotion_test_trigger:
-  name: Promotion Tests Trigger
-  dependencies:
-    {% for editor in publish_editors %}
-    {% for platform in publish_platforms %}
-    {% for suite in suites %}
-    {% for project in projects %}
-    - .yamato/promote.yml#promotion_test_{{platform.name}}_{{editor.version}}
-    - .yamato/upm-ci-full.yml#pkg_test_Perception_{{platform.name}}_{{editor.version}}
-    - .yamato/upm-ci-testprojects.yml#{{project.name}}_windows_{{suite.name}}_{{editor.version}}
-    {% endfor %}
-    {% endfor %}
-    {% endfor %}
-    {% endfor %}
-
-
 promote:
   name: Promote to Production
   agent:
       paths:
         - "upm-ci~/packages/*.tgz"
   dependencies:
-    {% for variant in package_variants %}
-    {% for editor in publish_editors %}
-    {% for platform in publish_platforms %}
-    - .yamato/upm-ci-full.yml#pack_{{ variant.name }}
+    {% for editor in test_editors %}
+    {% for platform in test_platforms %}
-    {% endfor %}
+    - .yamato/upm-ci-full.yml#test_trigger

.yamato/upm-ci-full.yml

 {% metadata_file .yamato/environments.yml %}
 
 ---
-{% for variant in package_variants %}
-pack_{{ variant.name }}:
-  name: Pack {{variant.name}} package
+pack:
+  name: Pack Perception package
   agent:
     type: Unity::VM
     image: package-ci/win10:stable
     packages:
       paths:
         - "upm-ci~/packages/**/*"
-{% endfor %}
-{% for variant in package_variants %}
-pkg_test_{{variant.name}}_{{ platform.name }}_{{ editor.version }}:
-  name : Package tests ({{variant.name}} pkg, {{ editor.version }}, {{ platform.name }})
+pkg_test_{{ platform.name }}_{{ editor.version }}:
+  name : Package tests, {{ editor.version }}, {{ platform.name }}
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}
       paths:
         - "upm-ci~/test-results/**/*"
   dependencies:
-    - .yamato/upm-ci-full.yml#pack_{{ variant.name }}
-{% endfor %}
+    - .yamato/upm-ci-full.yml#pack
 {% endfor %}
 {% endfor %}
 
       paths:
         - "upm-ci~/packages/**/*"
   dependencies:
-    {% for variant in package_variants %}
-    {% for editor in test_editors %}
+    {% for editor in commit_hook_editors %}
-    - .yamato/upm-ci-full.yml#pkg_test_{{variant.name}}_{{platform.name}}_{{editor.version}}
+    - .yamato/upm-ci-full.yml#pkg_test_{{platform.name}}_{{editor.version}}
+    {% endfor %}
+    {% endfor %}
+
+    # Disabling trigger of standalone tests which aren't working at the moment
+    {% for editor in commit_hook_editors %}
+    - .yamato/upm-ci-testprojects.yml#codecoverage_windows_editmode_{{editor.version}}
+    {% for project in projects %}
+    - .yamato/upm-ci-testprojects.yml#{{project.name}}_windows_standalone_{{editor.version}}
+    - .yamato/upm-ci-testprojects.yml#{{project.name}}_linux_standalone_{{editor.version}}
+    - .yamato/upm-ci-testprojects.yml#{{project.name}}_windows_editmode_{{editor.version}}
+    - .yamato/upm-ci-testprojects.yml#{{project.name}}_linux_editmode_{{editor.version}}
+    {% endfor %}
+
+
+nightly_trigger:
+  name: Nightly Additional Tests
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:stable
+    flavor: b1.small
+  commands:
+    - dir
+  triggers:
+    recurring:
+      - branch: master
+        frequency: daily # Should run between midnight and 6AM UTC
+    cancel_old_ci: true
+  artifacts:
+    logs:
+      paths:
+        - "upm-ci~/test-results/**/*"
+    packages:
+      paths:
+        - "upm-ci~/packages/**/*"
+  dependencies:
+    {% for editor in nightly_editors %}
+    {% for platform in test_platforms %}
+    - .yamato/upm-ci-full.yml#pkg_test_{{platform.name}}_{{editor.version}}
-    {% for editor in test_editors %}
+    {% for editor in nightly_editors %}
     - .yamato/upm-ci-testprojects.yml#codecoverage_windows_editmode_{{editor.version}}
     {% for project in projects %}
     - .yamato/upm-ci-testprojects.yml#{{project.name}}_windows_standalone_{{editor.version}}

.yamato/upm-ci-testprojects.yml

         - "test-results/**/*"
         - "TestProjects/PerceptionHDRP/test-results/**/*"
   dependencies:
-    - .yamato/upm-ci-full.yml#pack_Perception
+    - .yamato/upm-ci-full.yml#pack
 {% endfor %}
 {% endfor %}
 
 
 # Not including OSX because the only OSX platform on Bokken with a GPU is a Mac Mini, of which there are only a few and setting up Yamato jobs is very complicated.
 
-# {% for variant in package_variants %}
 # {% for editor in test_editors %}
 # code_coverage_win_{{editor.version}}:
 #   name: Code Coverage Report - Windows
 #       paths:
 #         - "upm-ci~/test-results/**/*"
 #   dependencies:
-#     - .yamato/upm-ci-full.yml#pack_{{ variant.name }}
-# {% endfor %}
+#     - .yamato/upm-ci-full.yml#pack
 # {% endfor %}