<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>
<!-- 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>$(BuildType)</HelixConfigLabel>
+ <TestListFilename>$(Rid)-$(BuildType)-TestList.json</TestListFilename>
</PropertyGroup>
<!-- Set Helix environment vars based on target platform -->
<ItemGroup>
<HelixCorrelationPayloadFile Include="$(ArchivesRoot)Core_Root*/*.zip">
- <RelativeBlobPath>$(Platform)$(ConfigurationGroup)/%(Identity)</RelativeBlobPath>
+ <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>