diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2019-01-02 17:16:44 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-02 17:16:44 -0800 |
| commit | 0d128bc36e4de05da32aacca017574be812066df (patch) | |
| tree | 42b204430a9e8faf809b859b41c290ce2a28fee3 /tests/helixpublishwitharcade.proj | |
| parent | 472181f672b21774109f8d3cdcd077556d7393b2 (diff) | |
| download | coreclr-0d128bc36e4de05da32aacca017574be812066df.tar.gz coreclr-0d128bc36e4de05da32aacca017574be812066df.tar.bz2 coreclr-0d128bc36e4de05da32aacca017574be812066df.zip | |
Refactor Send to Helix step in Azure DevOps (#21700)
* Move all the test job submission logic into separate file eng/send-to-helix-step.yml.
* Pass IsExternal=true and Creator for public submissions.
* Pass IsExternal=false and HelixAccessToken for internal submissions.
* Pass the parameters to MSBuild via environment.
* Make all the properties names passed to MSBuild "from outside" starting with underscore.
* Specify HelixArchitecture and HelixConfiguration properties.
Diffstat (limited to 'tests/helixpublishwitharcade.proj')
| -rw-r--r-- | tests/helixpublishwitharcade.proj | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/tests/helixpublishwitharcade.proj b/tests/helixpublishwitharcade.proj index df0724a955..ce1bdd48b6 100644 --- a/tests/helixpublishwitharcade.proj +++ b/tests/helixpublishwitharcade.proj @@ -7,13 +7,27 @@ <Import Project="..\dir.props" /> <PropertyGroup> + <HelixArchitecture>$(BuildArch)</HelixArchitecture> + <HelixConfiguration>$(BuildType)</HelixConfiguration> + + <IsExternal>$(_IsExternal)</IsExternal> + <IsExternal Condition=" '$(IsExternal)' == '' ">true</IsExternal> + + <Creator Condition=" '$(IsExternal)' == 'true' ">$(_Creator)</Creator> + <HelixAccessToken Condition=" '$(IsExternal)' != 'true' ">$(_HelixAccessToken)</HelixAccessToken> + <HelixTargetQueues>$(_HelixTargetQueues)</HelixTargetQueues> + + <EnableAzurePipelinesReporter>$(_PublishTestResults)</EnableAzurePipelinesReporter> + <EnableAzurePipelinesReporter Condition=" '$(EnableAzurePipelinesReporter)' == '' ">false</EnableAzurePipelinesReporter> + + <HelixBuild>$(_HelixBuild)</HelixBuild> <HelixSource>$(_HelixSource)</HelixSource> <HelixType>$(_HelixType)</HelixType> - <HelixBuild>$(BUILD_BUILDNUMBER)</HelixBuild> - <EnableAzurePipelinesReporter Condition=" '$(EnableAzurePipelinesReporter)' != 'false' ">true</EnableAzurePipelinesReporter> + <TimeoutInMinutes>$(_TimeoutInMinutes)</TimeoutInMinutes> + <TimeoutInMinutes Condition=" '$(TimeoutInMinutes)' == '' ">5</TimeoutInMinutes> + <WaitForWorkItemCompletion>true</WaitForWorkItemCompletion> - <TimeoutInSeconds Condition=" '$(TimeoutInSeconds)' == '' ">1000</TimeoutInSeconds> <CoreRootDirectory>$(TestWorkingDir)\Tests\Core_Root</CoreRootDirectory> </PropertyGroup> @@ -32,23 +46,21 @@ <XUnitWrapperDlls Include="$(TestWorkingDir)\**\*.XUnitWrapper.dll" /> </ItemGroup> - <Target Name="CopyRunnerScript" BeforeTargets="SubmitTestsToHelix"> + <Target Name="CopyRunnerScriptToCoreRootDirectory" BeforeTargets="SubmitTestsToHelix"> <Copy SourceFiles="$(MSBuildThisFileDirectory)\runtest_helix.py" DestinationFolder="$(CoreRootDirectory)" /> </Target> <Target Name="SubmitTestsToHelix"> <ItemGroup> - <Scenarios Include="$(Scenarios.Split(','))" /> + <Scenarios Include="$(_Scenarios.Split(','))" /> <ProjectsToBuild Include="$(MSBuildProjectFile)"> - <Properties>Scenario=%(Scenarios.Identity)</Properties> + <Properties>Scenario=%(_Scenarios.Identity)</Properties> </ProjectsToBuild> </ItemGroup> - <PropertyGroup> <BuildInParallel>false</BuildInParallel> <BuildInParallel Condition=" '@(ProjectsToBuild->Count())' > '1' ">true</BuildInParallel> </PropertyGroup> - <MSBuild Projects="@(ProjectsToBuild)" Targets="Test" BuildInParallel="$(BuildInParallel)" StopOnFirstFailure="false" UnloadProjectsOnCompletion="true" /> </Target> @@ -64,11 +76,11 @@ <TestRunNamePrefix Condition=" '$(Scenario)' != '' ">$(BuildOS) $(BuildArch) $(BuildType) $(Scenario) @ </TestRunNamePrefix> </PropertyGroup> <ItemGroup> - <HelixWorkItem Include="@(XUnitWrapperDlls->'%(FileName)'->Replace('.XUnitWrapper', ''))" > + <HelixWorkItem Include="@(XUnitWrapperDlls->'%(FileName)'->Replace('.XUnitWrapper', ''))"> <PayloadDirectory>%(RootDir)%(Directory)</PayloadDirectory> <Command Condition=" '$(Scenario)' == '' ">$(HelixPythonPath) $(RunnerScript) -wrapper %(FileName)%(Extension)</Command> <Command Condition=" '$(Scenario)' != '' ">$(HelixPythonPath) $(RunnerScript) -wrapper %(FileName)%(Extension) -scenario $(Scenario)</Command> - <Timeout>$([System.TimeSpan]::FromSeconds($(TimeoutInSeconds)))</Timeout> + <Timeout>$([System.TimeSpan]::FromMinutes($(TimeoutInMinutes)))</Timeout> </HelixWorkItem> </ItemGroup> </Target> |