Merge pull request #337 from Unity-Technologies/ci-cleanups

Further integration of wrench

Author: aurimasc

.gitignore

@@ -4,6 +4,7 @@
 [Tt]emp/
 [Ll]ogs/
 DockerFile
+Tools/CI/bin/*
 .vs
 .vscode
 .DS_Store
@@ -16,4 +17,4 @@ android-sdk/*
 *.csproj
 *.suo
 *.sublime-project
-*.sublime-workspace
+*.sublime-workspace

.yamato/format.yml

@@ -6,7 +6,7 @@ check_format:
     flavor: b1.small
   commands:
     - git clone --branch stable [email protected]:unity/unity-meta.git --no-checkout
-    - git -C unity-meta checkout 6f6dd71b42f7fd3294032a6c89b1402ef3e46099
+    - git -C unity-meta checkout 05b2852f2e25f0b7155756c870f870b932c97ae9
     - perl unity-meta/Tools/Format/format.pl --dry-run ./com.unity.mobile.notifications
   triggers:
     branches:

.yamato/upm-ci.yml

@@ -1,5 +1,6 @@
 test_editors:
   - version: trunk
+  - version: 6000.2
   - version: 6000.1
   - version: 6000.0
   - version: 2022.3
@@ -20,29 +21,6 @@ utr:
 
 ---
 
-{% for editor in test_editors %}
-{% for platform in test_platforms %}
-test_{{ platform.name }}_{{ editor.version }}:
-  name : Test {{ editor.version }} 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 --package-path com.unity.mobile.notifications --unity-version {{ editor.version }} --platform editmode
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-    packages:
-      paths:
-        - "upm-ci~/packages/**/*"
-  dependencies:
-    - .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications
-{% endfor %}
-{% endfor %}
-
 {% for editor in test_editors %}
 test_Android_{{ editor.version }}:
   name: Test {{ editor.version }} on Android
@@ -116,38 +94,6 @@ test_trigger:
   dependencies:
     - .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications
     {% for editor in test_editors %}
-    {% for platform in test_platforms %}
-    - .yamato/upm-ci.yml#test_{{ platform.name }}_{{ editor.version }}
-    {% endfor %}
-    {% endfor %}
-    {% for editor in test_editors %}
     - .yamato/upm-ci.yml#test_Android_{{ editor.version }}
     - .yamato/upm-ci.yml#test_iOS_{{ editor.version }}
     {% endfor %}
-
-publish:
-  name: Publish to Internal Registry
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:stable
-    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.mobile.notifications
-  triggers:
-    tags:
-      only:
-        - /^(r|R)(c|C)-\d+\.\d+\.\d+(-preview(\.\d+)?)?$/
-  artifacts:
-    artifacts:
-      paths:
-        - "upm-ci~/packages/*.tgz"
-  dependencies:
-    - .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_notifications
-    {% for editor in test_editors %}
-    {% for platform in test_platforms %}
-    - .yamato/upm-ci.yml#test_{{ platform.name }}_{{ editor.version }}
-    {% endfor %}
-    {% endfor %}

.yamato/wrench/promotion-jobs.yml

@@ -1,6 +1,17 @@
 # Auto-generated by Recipe Engine, do not modify manually.
 # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
 
+# Trigger for mobile.notifications Custom Checks
+mobile_notifications_custom_checks:
+  name: mobile.notifications Custom Checks
+  dependencies:
+  - path: .yamato/upm-ci.yml#test_trigger
+  triggers:
+    expression: push.branch match "^release/.*"
+    cancel_old_ci: true
+  metadata:
+    Job Maintainers: '#release-management'
+
 # Publish Dry Run  for mobile.notifications to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
 publish_dry_run_mobile_notifications:
   name: Publish Dry Run mobile.notifications

.yamato/wrench/recipe-regeneration.yml

@@ -9,14 +9,14 @@ test_-_wrench_jobs_up_to_date:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: dotnet run --project \Tools\CI\UnityMobileNotifications.Cookbook.csproj
+  - command: dotnet run --project Tools/CI/UnityMobileNotifications.Cookbook.csproj
   - command: |-
       if [ -n "$(git status --porcelain)" ]; then
         git status
         echo "Your repo is not clean - diff output:"
         git diff
         echo "You must run recipe generation after updating recipes to update the generated YAML!"
-        echo "Run 'dotnet run --project \Tools\CI\UnityMobileNotifications.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
+        echo "Run 'dotnet run --project Tools/CI/UnityMobileNotifications.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
         exit 1
       fi
   variables:

.yamato/wrench/wrench_config.json

@@ -26,12 +26,13 @@
     "com.unity.mobile.notifications": [
       ".yamato/wrench/api-validation-jobs.yml#api_validation_-_mobile_notifications_-_2021_3_-_windows",
       ".yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs",
+      ".yamato/wrench/promotion-jobs.yml#mobile_notifications_custom_checks",
       ".yamato/wrench/promotion-jobs.yml#publish_dry_run_mobile_notifications"
     ]
   },
   "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_mobile_notifications",
   "branch_pattern": "ReleaseSlash",
   "wrench_version": "0.10.32.0",
   "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
-  "cs_project_path": "\\Tools\\CI\\UnityMobileNotifications.Cookbook.csproj"
+  "cs_project_path": "Tools/CI/UnityMobileNotifications.Cookbook.csproj"
 }

.yamato/xray-exemptions.json

@@ -1,4 +1,5 @@
-using RecipeEngine.Api.Settings;
+using RecipeEngine.Api.Dependencies;
+using RecipeEngine.Api.Settings;
 using RecipeEngine.Modules.Wrench.Models;
 using RecipeEngine.Modules.Wrench.Settings;
 
@@ -14,7 +15,11 @@ public class UnityMobileNotificationsSettings : AnnotatedSettingsBase
     {
         {
             "com.unity.mobile.notifications",
-            new PackageOptions() { ReleaseOptions = new ReleaseOptions() { IsReleasing = true } }
+            new PackageOptions()
+            {
+                ReleaseOptions = new ReleaseOptions() { IsReleasing = true },
+                CustomChecks = new HashSet<Dependency>() { new Dependency("upm-ci", "test_trigger") }
+            }
         }
     };
 

Tools/CI/Settings/UnityMobileNotificationsSettings.cs

@@ -1,2 +1,4 @@
+#!/bin/sh
+
 cd $(dirname "$0")/../../
-dotnet run --project Tools\CI\UnityMobileNotifications.Cookbook.csproj
+dotnet run --project Tools/CI/UnityMobileNotifications.Cookbook.csproj