From dc3a505abc6786a5d057b89985d08206f93eb6e5 Mon Sep 17 00:00:00 2001
From: Chidozie Ononiwu <chononiw@microsoft.com>
Date: Wed, 21 Oct 2020 15:48:30 -0700
Subject: [PATCH] Fix create-pull-request bug

---
 eng/common/pipelines/templates/steps/create-pull-request.yml  | 4 ++--
 .../pipelines/templates/steps/docs-metadata-release.yml       | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/eng/common/pipelines/templates/steps/create-pull-request.yml b/eng/common/pipelines/templates/steps/create-pull-request.yml
index 3c0d6481198d..71128c18c220 100644
--- a/eng/common/pipelines/templates/steps/create-pull-request.yml
+++ b/eng/common/pipelines/templates/steps/create-pull-request.yml
@@ -19,7 +19,6 @@ parameters:
   # Multiple labels seperated by comma, e.g. "bug, APIView"
   PRLabels: ''
   SkipCheckingForChanges: false
-  CloseAfterOpenForTesting: false
 
 steps:
 
@@ -86,4 +85,5 @@ steps:
       -UserReviewers "${{ parameters.GHReviewersVariable }}"
       -TeamReviewers "${{ parameters.GHTeamReviewersVariable }}"
       -Assignees "${{ parameters.GHAssignessVariable }}"
-      -CloseAfterOpenForTesting $${{ parameters.CloseAfterOpenForTesting }}
+      -CloseAfterOpenForTesting: $(TestPipeline)
+      -CloseAfterOpenForTesting $${{ coalesce(variables.TestPipeline, 'false') }}
diff --git a/eng/common/pipelines/templates/steps/docs-metadata-release.yml b/eng/common/pipelines/templates/steps/docs-metadata-release.yml
index e1aec2bfb1ff..86358972e95e 100644
--- a/eng/common/pipelines/templates/steps/docs-metadata-release.yml
+++ b/eng/common/pipelines/templates/steps/docs-metadata-release.yml
@@ -83,7 +83,6 @@ steps:
     GHReviewersVariable: ${{ parameters.GHReviewersVariable }}
     GHTeamReviewersVariable: ${{ parameters.GHTeamReviewersVariable }} 
     PRLabels: ${{ parameters.PRLabels }}
-    CloseAfterOpenForTesting: $(TestPipeline)
 
 - ${{if ne( parameters['OnboardingBranch'], '')}}:
   - pwsh: |
@@ -124,4 +123,3 @@ steps:
       ScriptDirectory: ${{ parameters.WorkingDirectory }}/${{ parameters.ScriptDirectory }}
       GHReviewersVariable: ${{ parameters.GHReviewersVariable }}
       GHTeamReviewersVariable: ${{ parameters.GHTeamReviewersVariable }}
-      CloseAfterOpenForTesting: $(TestPipeline)