From a7fd82a91fd8570660e4b22fbe8404c33268f3f9 Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:30:39 -0700
Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 1572
 (#21037)

* Update prepare pipelines template.

* Update prepare-pipelines as well.

* Remove default line.

Co-authored-by: Mitch Denny <midenn@microsoft.com>
---
 .../templates/steps/prepare-pipelines.yml          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eng/common/pipelines/templates/steps/prepare-pipelines.yml b/eng/common/pipelines/templates/steps/prepare-pipelines.yml
index a4b300dcaba4..47fc611316d1 100644
--- a/eng/common/pipelines/templates/steps/prepare-pipelines.yml
+++ b/eng/common/pipelines/templates/steps/prepare-pipelines.yml
@@ -16,7 +16,7 @@ parameters:
 
 steps:
   - template: install-pipeline-generation.yml
-
+  - template: /eng/common/pipelines/templates/steps/set-default-branch.yml
   # This covers our public repos.
   - ${{ if not(endsWith(parameters.Repository, '-pr'))}}:
     - script: >
@@ -30,7 +30,7 @@ steps:
         --repository ${{parameters.Repository}}
         --convention ci
         --agentpool Hosted
-        --branch refs/heads/master
+        --branch refs/heads/$(DefaultBranch)
         --patvar PATVAR
         --debug
         ${{parameters.CIConventionOptions}}
@@ -48,7 +48,7 @@ steps:
         --repository ${{parameters.Repository}}
         --convention up
         --agentpool Hosted
-        --branch refs/heads/master
+        --branch refs/heads/$(DefaultBranch)
         --patvar PATVAR
         --debug
         ${{parameters.UPConventionOptions}}
@@ -66,7 +66,7 @@ steps:
         --repository ${{parameters.Repository}}
         --convention tests
         --agentpool Hosted
-        --branch refs/heads/master
+        --branch refs/heads/$(DefaultBranch)
         --patvar PATVAR
         --debug
         ${{parameters.TestsConventionOptions}}
@@ -88,7 +88,7 @@ steps:
         --repository ${{parameters.Repository}}
         --convention ci
         --agentpool Hosted
-        --branch refs/heads/master
+        --branch refs/heads/$(DefaultBranch)
         --patvar PATVAR
         --debug
         --no-schedule
@@ -107,7 +107,7 @@ steps:
         --repository ${{parameters.Repository}}
         --convention up
         --agentpool Hosted
-        --branch refs/heads/master
+        --branch refs/heads/$(DefaultBranch)
         --patvar PATVAR
         --debug
         --no-schedule
@@ -126,7 +126,7 @@ steps:
         --repository ${{parameters.Repository}}
         --convention tests
         --agentpool Hosted
-        --branch refs/heads/master
+        --branch refs/heads/$(DefaultBranch)
         --patvar PATVAR
         --debug
         --no-schedule