From b34154424dd94b0ff16aec06d421932acdbc9c30 Mon Sep 17 00:00:00 2001
From: kazuki matsumoto <karasusan@gmail.com>
Date: Thu, 22 Aug 2019 15:08:00 +0900
Subject: [PATCH 1/5] fixed promotion.yml

---
 .yamato/promotion.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.yamato/promotion.yml b/.yamato/promotion.yml
index 24f0530..7524399 100644
--- a/.yamato/promotion.yml
+++ b/.yamato/promotion.yml
@@ -7,13 +7,16 @@ test_platforms:
     flavor: b1.large
 packages:
   - name: webrtc
+    packagename: com.unity.webrtc
   - name: renderstreaming
+    packagename: com.unity.renderstreaming
 ---
 
+{% for package in packages %}
 {% for editor in test_editors %}
 {% for platform in test_platforms %}
-promotion_test_{{ platform.name }}_{{ editor.version }}:
-  name : Promotion Test {{ editor.version }} on {{ platform.name }}
+promotion_test_{{ package.packagename }}_{{ platform.name }}_{{ editor.version }}:
+  name : Promotion Test {{ package.packagename }} {{ editor.version }} on {{ platform.name }}
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}
@@ -22,17 +25,15 @@ promotion_test_{{ platform.name }}_{{ editor.version }}:
     UPMCI_PROMOTION: 1
   commands:
     - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
-    - upm-ci package test --unity-version {{ editor.version }}
+    - upm-ci package test --unity-version {{ editor.version }} --package-path Packages/{{ package.packagename }}
   artifacts:
     logs:
       paths:
         - "upm-ci~/test-results/**/*"
   dependencies:
-{% for package in packages %}
     - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }}
 {% endfor %}
 {% endfor %}
-{% endfor %}
 
 promotion_test_trigger:
   name: Promotion Tests Trigger
@@ -50,7 +51,7 @@ promotion_test_trigger:
   dependencies:
 {% for editor in test_editors %}
 {% for platform in test_platforms %}
-    - .yamato/promotion.yml#promotion_test_{{platform.name}}_{{editor.version}}
+    - .yamato/promotion.yml#promotion_test_{{ package.packagename }}_{{ platform.name }}_{{ editor.version }}
 {% endfor %}
 {% endfor %}
 
@@ -64,7 +65,7 @@ promote:
     UPMCI_PROMOTION: 1
   commands:
     - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
-    - upm-ci package promote
+    - upm-ci package promote --package-path Packages/{{ package.packagename }}
   triggers:
     tags:
       only:
@@ -79,6 +80,7 @@ promote:
 {% endfor %}
 {% for editor in test_editors %}
 {% for platform in test_platforms %}
-    - .yamato/promotion.yml#promotion_test_{{ platform.name }}_{{ editor.version }}
+    - .yamato/promotion.yml#promotion_test_{{ package.packagename }}_{{ platform.name }}_{{ editor.version }}
+{% endfor %}
 {% endfor %}
 {% endfor %}
\ No newline at end of file
-- 
Gitee


From 43072c00e5710a4ea593e2e77a2e96dd04d87679 Mon Sep 17 00:00:00 2001
From: kazuki matsumoto <karasusan@gmail.com>
Date: Thu, 22 Aug 2019 15:13:55 +0900
Subject: [PATCH 2/5] fixed promotion.yml

---
 .yamato/promotion.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.yamato/promotion.yml b/.yamato/promotion.yml
index 7524399..17620b3 100644
--- a/.yamato/promotion.yml
+++ b/.yamato/promotion.yml
@@ -75,9 +75,7 @@ promote:
       paths:
         - "upm-ci~/packages/*.tgz"
   dependencies:
-{% for package in packages %}
     - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }}
-{% endfor %}
 {% for editor in test_editors %}
 {% for platform in test_platforms %}
     - .yamato/promotion.yml#promotion_test_{{ package.packagename }}_{{ platform.name }}_{{ editor.version }}
-- 
Gitee


From c85338247040238e5afd524e06d2283e5ca37679 Mon Sep 17 00:00:00 2001
From: kazuki matsumoto <karasusan@gmail.com>
Date: Thu, 22 Aug 2019 15:16:30 +0900
Subject: [PATCH 3/5] fixed promotion.yml

---
 .yamato/promotion.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.yamato/promotion.yml b/.yamato/promotion.yml
index 17620b3..fc2e0ff 100644
--- a/.yamato/promotion.yml
+++ b/.yamato/promotion.yml
@@ -15,7 +15,7 @@ packages:
 {% for package in packages %}
 {% for editor in test_editors %}
 {% for platform in test_platforms %}
-promotion_test_{{ package.packagename }}_{{ platform.name }}_{{ editor.version }}:
+promotion_test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
   name : Promotion Test {{ package.packagename }} {{ editor.version }} on {{ platform.name }}
   agent:
     type: {{ platform.type }}
@@ -51,7 +51,7 @@ promotion_test_trigger:
   dependencies:
 {% for editor in test_editors %}
 {% for platform in test_platforms %}
-    - .yamato/promotion.yml#promotion_test_{{ package.packagename }}_{{ platform.name }}_{{ editor.version }}
+    - .yamato/promotion.yml#promotion_test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}
 {% endfor %}
 {% endfor %}
 
@@ -78,7 +78,7 @@ promote:
     - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }}
 {% for editor in test_editors %}
 {% for platform in test_platforms %}
-    - .yamato/promotion.yml#promotion_test_{{ package.packagename }}_{{ platform.name }}_{{ editor.version }}
+    - .yamato/promotion.yml#promotion_test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}
 {% endfor %}
 {% endfor %}
 {% endfor %}
\ No newline at end of file
-- 
Gitee


From 6b59cf32a036fed983d63f911005e1010cb2b5bf Mon Sep 17 00:00:00 2001
From: kazuki matsumoto <karasusan@gmail.com>
Date: Thu, 22 Aug 2019 15:18:15 +0900
Subject: [PATCH 4/5] fixed promotion.yml

---
 .yamato/promotion.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/promotion.yml b/.yamato/promotion.yml
index fc2e0ff..ac78c0a 100644
--- a/.yamato/promotion.yml
+++ b/.yamato/promotion.yml
@@ -10,8 +10,8 @@ packages:
     packagename: com.unity.webrtc
   - name: renderstreaming
     packagename: com.unity.renderstreaming
----
 
+---
 {% for package in packages %}
 {% for editor in test_editors %}
 {% for platform in test_platforms %}
-- 
Gitee


From 2394f89e96c58f08bc17e5b9db8f891fa7dabcda Mon Sep 17 00:00:00 2001
From: kazuki matsumoto <karasusan@gmail.com>
Date: Thu, 22 Aug 2019 15:25:15 +0900
Subject: [PATCH 5/5] test

---
 .yamato/promotion.yml | 47 -------------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/.yamato/promotion.yml b/.yamato/promotion.yml
index ac78c0a..4d2c6ae 100644
--- a/.yamato/promotion.yml
+++ b/.yamato/promotion.yml
@@ -34,51 +34,4 @@ promotion_test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
     - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }}
 {% endfor %}
 {% endfor %}
-
-promotion_test_trigger:
-  name: Promotion Tests Trigger
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:stable
-    flavor: b1.large
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-    packages:
-      paths:
-        - "upm-ci~/packages/**/*"
-  dependencies:
-{% for editor in test_editors %}
-{% for platform in test_platforms %}
-    - .yamato/promotion.yml#promotion_test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}
-{% endfor %}
-{% endfor %}
-
-promote:
-  name: Promote to Production
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:stable
-    flavor: b1.large
-  variables:
-    UPMCI_PROMOTION: 1
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
-    - upm-ci package promote --package-path Packages/{{ package.packagename }}
-  triggers:
-    tags:
-      only:
-        - /^(r|R)elease-\d+\.\d+\.\d+(-preview(\.\d+)?)?$/
-  artifacts:
-    artifacts:
-      paths:
-        - "upm-ci~/packages/*.tgz"
-  dependencies:
-    - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }}
-{% for editor in test_editors %}
-{% for platform in test_platforms %}
-    - .yamato/promotion.yml#promotion_test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}
-{% endfor %}
-{% endfor %}
 {% endfor %}
\ No newline at end of file
-- 
Gitee