From 28057389c3cc02560cd601e53fdb4760a883baf7 Mon Sep 17 00:00:00 2001
From: Marc <marc@greisen.org>
Date: Wed, 20 Jan 2021 10:21:50 -0800
Subject: [PATCH] Fix upload-tools yaml. (#116)

---
 ado/build-publish-deploy-test.yml         | 2 ++
 ado/rolling-build-publish-deploy-test.yml | 2 ++
 ado/stages/deploy/deploy.yml              | 6 ++++++
 ado/stages/deploy/steps/upload-tools.yml  | 8 ++++++--
 ado/staging-build-publish-deploy-test.yml | 2 ++
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ado/build-publish-deploy-test.yml b/ado/build-publish-deploy-test.yml
index 3521220..5916d29 100644
--- a/ado/build-publish-deploy-test.yml
+++ b/ado/build-publish-deploy-test.yml
@@ -39,6 +39,8 @@ stages:
     parameters: 
       BuildArtifactsLocation: ${{ parameters.BuildArtifactsLocation }}
   - template: stages/deploy/deploy.yml  
+    parameters: 
+      BuildArtifactsLocation: ${{ parameters.BuildArtifactsLocation }}
   - template: stages/test/test.yml
     parameters: 
       RunBvt: ${{ parameters.RunBvt }}
diff --git a/ado/rolling-build-publish-deploy-test.yml b/ado/rolling-build-publish-deploy-test.yml
index cf0f59d..41d1932 100644
--- a/ado/rolling-build-publish-deploy-test.yml
+++ b/ado/rolling-build-publish-deploy-test.yml
@@ -40,6 +40,8 @@ stages:
       BuildArtifactsLocation: ${{ parameters.BuildArtifactsLocation }}
   - template: stages/deploy/deploy-infrastructure.yml  
   - template: stages/deploy/deploy.yml  
+    parameters: 
+      BuildArtifactsLocation: ${{ parameters.BuildArtifactsLocation }}
   - template: stages/test/test.yml
     parameters: 
       RunBvt: ${{ parameters.RunBvt }}
diff --git a/ado/stages/deploy/deploy.yml b/ado/stages/deploy/deploy.yml
index d091d0d..51e9459 100644
--- a/ado/stages/deploy/deploy.yml
+++ b/ado/stages/deploy/deploy.yml
@@ -1,3 +1,7 @@
+parameters:
+  - name: BuildArtifactsLocation
+    type: string
+        
 stages:
   - stage: Deploy
     jobs:
@@ -6,3 +10,5 @@ stages:
           vmImage: 'ubuntu-latest'
         steps:
           - template: steps/upload-tools.yml
+            parameters: 
+              BuildArtifactsLocation: ${{ parameters.BuildArtifactsLocation }}
diff --git a/ado/stages/deploy/steps/upload-tools.yml b/ado/stages/deploy/steps/upload-tools.yml
index effd789..964c500 100644
--- a/ado/stages/deploy/steps/upload-tools.yml
+++ b/ado/stages/deploy/steps/upload-tools.yml
@@ -1,3 +1,7 @@
+parameters:
+  - name: BuildArtifactsLocation
+    type: string
+    
 steps:
   - task: UsePythonVersion@0
     inputs:
@@ -9,14 +13,14 @@ steps:
 
   - task: DownloadPipelineArtifact@2
     displayName: 'Download Local pipeline artifact'
-    condition: and(succeeded(), eq(variables.buildArtifactsLocation, 'current')) 
+    condition: and(succeeded(), eq('${{parameters.BuildArtifactsLocation}}', 'current')) 
     inputs:
       artifact: AzureAuth
       path: $(Build.SourcesDirectory)/artifacts/cli/raft-tools/auth/dotnet-core-3.1
     
   - task: DownloadPipelineArtifact@2
     displayName: 'Download Production pipeline artifact'
-    condition: and(always(), eq(variables.buildArtifactsLocation, 'production')) 
+    condition: and(always(), eq('${{parameters.BuildArtifactsLocation}}', 'production')) 
     inputs:
       source: 'specific'
       project: 'raft'
diff --git a/ado/staging-build-publish-deploy-test.yml b/ado/staging-build-publish-deploy-test.yml
index 37bf841..a1d68e2 100644
--- a/ado/staging-build-publish-deploy-test.yml
+++ b/ado/staging-build-publish-deploy-test.yml
@@ -38,6 +38,8 @@ stages:
       BuildArtifactsLocation: ${{ parameters.BuildArtifactsLocation }}
   - template: stages/deploy/deploy-infrastructure.yml  
   - template: stages/deploy/deploy.yml  
+    parameters: 
+      BuildArtifactsLocation: ${{ parameters.BuildArtifactsLocation }}
   - template: stages/test/test.yml
     parameters: 
       RunBvt: ${{ parameters.RunBvt }}