From 5cd1267d55fcbe5b6ba063d86fe22e442ac5d130 Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Mon, 7 Oct 2019 11:04:17 +1100
Subject: [PATCH 1/2] Setup template for UP.

---
 sdk/template/ci.yml | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/sdk/template/ci.yml b/sdk/template/ci.yml
index e475fd73946b..1ad7edb980d6 100644
--- a/sdk/template/ci.yml
+++ b/sdk/template/ci.yml
@@ -1,13 +1,28 @@
 # DO NOT EDIT THIS FILE
 # This file is generated automatically and any changes will be lost.
 
+resources:
+  repositories:
+    - repository: azure-sdk-tools
+      type: github
+      name: Azure/azure-sdk-tools
+      endpoint: azure
+    - repository: azure-sdk-build-tools
+      type: git
+      name: internal/azure-sdk-build-tools
+
 trigger:
   branches:
     include:
     - master
+    - feature/*
+    - hotfix/*
+    - release/*
+    - restapi*
   paths:
     include:
     - sdk/template/
+    - sdk/core/
 
 pr:
   branches:
@@ -20,15 +35,12 @@ pr:
   paths:
     include:
     - sdk/template/
+    - sdk/core/
 
-resources:
-  repositories:
-    - repository: azure-sdk-tools
-      type: github
-      name: Azure/azure-sdk-tools
-      endpoint: azure
-
-jobs:
-- template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml
+stages:
+- template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
-    ServiceDirectory: template
\ No newline at end of file
+    ServiceDirectory: storage
+    Artifacts:
+    - name: azure_template
+      safeName: azuretemplate

From 23bde7485d8d2a14e4b66492a66b84297d823c23 Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Mon, 7 Oct 2019 11:04:48 +1100
Subject: [PATCH 2/2] Fixed service directory.

---
 sdk/template/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/template/ci.yml b/sdk/template/ci.yml
index 1ad7edb980d6..df1b973f1777 100644
--- a/sdk/template/ci.yml
+++ b/sdk/template/ci.yml
@@ -40,7 +40,7 @@ pr:
 stages:
 - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
-    ServiceDirectory: storage
+    ServiceDirectory: template
     Artifacts:
     - name: azure_template
       safeName: azuretemplate