From 30f00101841de5c6709e5fb2b7f088e13a1f47d6 Mon Sep 17 00:00:00 2001
From: Manuel de la Pena <mandel@microsoft.com>
Date: Wed, 6 Jan 2021 15:33:57 -0500
Subject: [PATCH] [CI][VSTS] Ensure that xharness creates an index with the
 correct uris. (#10345)

The prefix of the location of the logs depends on the platform where it
was executed (else we step on them) but that was not added in the env
var use by xharness.

fixes: https://github.com/xamarin/maccore/issues/2349
---
 tools/devops/automation/templates/devices/build.yml  | 2 +-
 tools/devops/automation/templates/packages/build.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/devops/automation/templates/devices/build.yml b/tools/devops/automation/templates/devices/build.yml
index 085522a6d7..025936f048 100644
--- a/tools/devops/automation/templates/devices/build.yml
+++ b/tools/devops/automation/templates/devices/build.yml
@@ -215,7 +215,7 @@ steps:
     WORKING_DIR: $(System.DefaultWorkingDirectory) 
     TESTS_EXTRA_ARGUMENTS: ${{ parameters.testsLabels }}
     USE_XAMARIN_STORAGE: ${{ parameters.useXamarinStorage }}
-    VSDROPS_URI: '${{ parameters.vsdropsPrefix }}/$(Build.BuildNumber)/$(Build.BuildId);/tests/' # uri used to create the vsdrops index using full uri
+    VSDROPS_URI: '${{ parameters.vsdropsPrefix }}/$(Build.BuildNumber)/$(Build.BuildId)/${{ parameters.devicePrefix }};/tests/' # uri used to create the vsdrops index using full uri
     USE_TCP_TUNNEL: 'true'
   displayName: 'Run tests'
   name: runTests # not to be confused with the displayName, this is used to later use the name of the step to access the output variables from an other job
diff --git a/tools/devops/automation/templates/packages/build.yml b/tools/devops/automation/templates/packages/build.yml
index 21a50e02b4..c7ec4569f9 100644
--- a/tools/devops/automation/templates/packages/build.yml
+++ b/tools/devops/automation/templates/packages/build.yml
@@ -400,7 +400,7 @@ steps:
   env:
     BUILD_REVISION: jenkins
     TARGET: 'wrench-jenkins'
-    VSDROPS_URI: '${{ parameters.vsdropsPrefix }}/$(Build.BuildNumber)/$(Build.BuildId);/tests/' # uri used to create the vsdrops index using full uri
+    VSDROPS_URI: '${{ parameters.vsdropsPrefix }}/$(Build.BuildNumber)/$(Build.BuildId)/sim;/tests/' # uri used to create the vsdrops index using full uri
 
 # Upload TestSummary as an artifact.
 - task: PublishPipelineArtifact@1