<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <PropertyGroup>
+ <__BuildArch>$(Platform)</__BuildArch>
+ </PropertyGroup>
+
<Import Project="..\dir.props" />
<!-- CoreClr-Specific Helix test submission project. -->
<!-- Finally, these archives represent the zips of tests that are OSPlatform specific
This is used by CloudTest.Helix.Targets to generate relative blob paths for archives. -->
- <ArchivesRoot>$(TestWorkingDir)/archive</ArchivesRoot>
- <TestArchivesRoot>$(ArchivesRoot)/tests</TestArchivesRoot>
+ <ArchivesRoot>$(TestWorkingDir)/archive/</ArchivesRoot>
+ <TestArchivesRoot>$(ArchivesRoot)tests</TestArchivesRoot>
<RunnerScript Condition="'$(RunnerScript)' == ''">$(TestRunnerScript)</RunnerScript>
<SupplementalPayloadDir Condition="'$(SupplementalPayloadDir)' == ''">$(TestWorkingDir)SupplementalPayload/</SupplementalPayloadDir>
<HelixJobType Condition="'$(HelixJobType)'==''">test/functional/cli/</HelixJobType>
+ <!-- Detect whether we are on a product construction build via ProductBuildId. If so, set source appropriately -->
+ <HelixSource Condition="'$(HelixSource)'=='' And '$(IsOfficial)'!='' And '$(TestProduct)'!='' And '$(Branch)'!='' And '$(ProductBuildId)'!=''">prodcon/$(TestProduct)/$(Branch)/</HelixSource>
<HelixSource Condition="'$(HelixSource)'=='' And '$(IsOfficial)'!='' And '$(TestProduct)'!='' And '$(Branch)'!=''">official/$(TestProduct)/$(Branch)/</HelixSource>
<HelixSource Condition="'$(HelixSource)'=='' And '$(IsOfficial)'=='' And '$(TestProduct)'!='' And '$(Branch)'!=''">pr/$(TestProduct)/$(Branch)/</HelixSource>
<HelixSource Condition="'$(HelixSource)'==''">pr/unknown/</HelixSource>
<!-- Local path for storing submission-related files -->
- <HelixLogFolder>$(ArchivesRoot)/</HelixLogFolder>
+ <HelixLogFolder>$(ArchivesRoot)</HelixLogFolder>
<!-- Properties used for submission by CloudTest.Helix.Targets-->
<BuildMoniker>$(CurrentDate)</BuildMoniker>
- <BuildMoniker Condition="'$(IsOfficial)'=='true'">$(OfficialBuildId)</BuildMoniker>
+ <BuildMoniker Condition="'$(IsOfficial)'=='true' And '$(ProductBuildId)'==''">$(OfficialBuildId)</BuildMoniker>
+ <BuildMoniker Condition="'$(IsOfficial)'=='true' And '$(ProductBuildId)'!=''">$(ProductBuildId)</BuildMoniker>
<HelixArchLabel>$(Platform)</HelixArchLabel>
- <HelixConfigLabel>$(ConfigurationGroup)</HelixConfigLabel>
+ <HelixConfigLabel>$(BuildType)</HelixConfigLabel>
+ <TestListFilename>$(Rid)-$(BuildType)-TestList.json</TestListFilename>
</PropertyGroup>
<!-- Set Helix environment vars based on target platform -->
If you change binplacing behavior and official runs break,
this is a good place to check.-->
<ItemGroup>
- <HelixWorkItem Include="$(TestArchivesRoot)/*.zip" />
+ <HelixWorkItem Include="$(TestArchivesRoot)/*.zip" />
</ItemGroup>
<Message Text="Full test archive collection : @(HelixWorkItem)" Importance="Low" />
<Warning Condition="'@(HelixWorkItem->Count())' == '0'" Text="Didn't find any test archives in supplied folders!!! Review logs to see where test archive(s) were placed and fix." />
<ItemGroup>
- <HelixCorrelationPayloadFile Include="$(ArchivesRoot)\Core_Root*\*.zip">
- <RelativeBlobPath>$(Platform)$(ConfigurationGroup)/%(Identity)</RelativeBlobPath>
+ <HelixCorrelationPayloadFile Include="$(ArchivesRoot)Core_Root*/*.zip">
+ <RelativeBlobPath>$(Platform)$(BuildType)/%(Identity)</RelativeBlobPath>
</HelixCorrelationPayloadFile>
<HelixWorkItem>
<Command Condition="'$(TargetsWindows)' == 'true'">$(HelixPythonPath) $(RunnerScript) --script %HELIX_WORKITEM_PAYLOAD%\runtests.cmd</Command>
<PayloadFile>%(Identity)</PayloadFile>
<WorkItemId>%(Filename)</WorkItemId>
<TimeoutInSeconds>$(TimeoutInSeconds)</TimeoutInSeconds>
- <RelativeBlobPath>$(Platform)-$(ConfigurationGroup)/Tests/$([System.String]::Copy('%(RecursiveDir)').Replace('\', '/'))%(Filename)%(Extension)</RelativeBlobPath>
+ <RelativeBlobPath>$(Platform)-$(BuildType)-$(Rid)/Tests/$([System.String]::Copy('%(RecursiveDir)').Replace('\', '/'))%(Filename)%(Extension)</RelativeBlobPath>
</HelixWorkItem>
</ItemGroup>
</Target>
<CallTarget Condition="'$(EnableCloudTest)' != 'false'" Targets="CoreClrPreCloudBuild;HelixCloudBuild" />
</Target>
-</Project>
\ No newline at end of file
+</Project>