Skip to content

Start skipping helix ready tests on azdo runs #17109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 51 commits into from
Jan 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
b659fd2
Try skipping some tests if when on helix
HaoK Nov 14, 2019
5831b74
SkipHelixReadyTests
HaoK Nov 14, 2019
b39ebb5
Add SkipHelixReadyTests flag to test jobs
HaoK Nov 14, 2019
7a7b0e3
Update Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
HaoK Nov 14, 2019
afbbbee
Update Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Tes…
HaoK Nov 14, 2019
574d2d2
Update Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj
HaoK Nov 14, 2019
dfa0b0f
Update Microsoft.AspNetCore.Identity.FunctionalTests.csproj
HaoK Nov 14, 2019
f86f0b9
Update Microsoft.AspNetCore.Identity.Test.csproj
HaoK Nov 14, 2019
cb5a4c4
Update Microsoft.AspNetCore.Identity.InMemory.Test.csproj
HaoK Nov 14, 2019
e2443c7
Update Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj
HaoK Nov 14, 2019
590cd9a
Update Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj
HaoK Nov 14, 2019
bc5cec9
Skip all tests by default on azdo
HaoK Nov 14, 2019
77776de
Verify skiptests is doing what i expect
HaoK Nov 15, 2019
f8c273e
Try skipping tests here
HaoK Nov 15, 2019
7d13ba2
Update Build.props
HaoK Nov 15, 2019
fd89974
Reenable remaining skip helix projects
HaoK Nov 16, 2019
d6dabde
Update Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj
HaoK Nov 18, 2019
948bd2b
Update Microsoft.AspNetCore.Identity.InMemory.Test.csproj
HaoK Nov 18, 2019
6ca831f
Update Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj
HaoK Nov 18, 2019
b781399
Update Microsoft.AspNetCore.Identity.Test.csproj
HaoK Nov 19, 2019
81acecd
Update Microsoft.AspNetCore.Authentication.Core.Test.csproj
HaoK Nov 19, 2019
d9d29ab
Update Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj
HaoK Nov 19, 2019
161497d
Update Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Tes…
HaoK Nov 19, 2019
b0b8792
Update Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
HaoK Nov 19, 2019
a1d8b5c
Update Microsoft.AspNetCore.Identity.FunctionalTests.csproj
HaoK Nov 19, 2019
879302d
Make Win10/OSX14 required
HaoK Nov 20, 2019
37502d8
Cleanup helix queues file
HaoK Nov 20, 2019
508cdfa
Update Helix.Common.props
HaoK Nov 21, 2019
1dfcbe0
Update Helix.Common.props
HaoK Nov 21, 2019
33f54cd
Update Helix.Common.props
HaoK Nov 21, 2019
c2a9871
Update Helix.Common.props
HaoK Nov 21, 2019
38d2b72
Update Helix.Common.props
HaoK Nov 22, 2019
b5cedc3
Update Helix.Common.props
HaoK Nov 22, 2019
224a9d6
Update Helix.Common.props
HaoK Nov 22, 2019
a904fc4
Update Helix.Common.props
HaoK Nov 22, 2019
613100b
Update ci.yml
HaoK Nov 22, 2019
b17aec6
Update Helix.Common.props
HaoK Nov 22, 2019
9d15d44
Update Helix.Common.props
HaoK Nov 22, 2019
d7dae78
Delete helix-test.yml
HaoK Nov 22, 2019
8287998
Better skip tests default
HaoK Dec 4, 2019
948ee7c
Update ServerComparison.FunctionalTests.csproj
HaoK Dec 4, 2019
a482772
Update Microsoft.AspNetCore.Analyzers.Test.csproj
HaoK Dec 4, 2019
3ce0a16
Update Directory.Build.props
HaoK Dec 4, 2019
f773f26
Update Directory.Build.props
HaoK Dec 4, 2019
eddf36c
Update Microsoft.AspNetCore.Components.Analyzers.Tests.csproj
HaoK Dec 4, 2019
acef8ca
Update Microsoft.AspNetCore.FunctionalTests.csproj
HaoK Dec 4, 2019
61756c8
Update Microsoft.AspNetCore.App.UnitTests.csproj
HaoK Dec 4, 2019
b8eaef2
Update Mvc.Analyzers.Test.csproj
HaoK Dec 4, 2019
f3f1c29
Update Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
HaoK Dec 4, 2019
1582848
Update Mvc.Api.Analyzers.Test.csproj
HaoK Dec 4, 2019
f06153d
Update Interop.FunctionalTests.csproj
HaoK Dec 4, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .azure/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ stages:
jobDisplayName: "Test: Windows Server 2016 x64"
agentOs: Windows
isTestingJob: true
buildArgs: -all -pack -test -BuildNative "/p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false"
buildArgs: -all -pack -test -BuildNative "/p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false"
beforeBuild:
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
displayName: Setup IISExpress test certificates and schema
Expand Down Expand Up @@ -503,7 +503,7 @@ stages:
jobDisplayName: "Test: macOS 10.13"
agentOs: macOS
isTestingJob: true
buildArgs: --all --test "/p:RunTemplateTests=false"
buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true"
beforeBuild:
- bash: "./eng/scripts/install-nginx-mac.sh"
displayName: Installing Nginx
Expand Down Expand Up @@ -538,7 +538,7 @@ stages:
jobDisplayName: "Test: Ubuntu 16.04 x64"
agentOs: Linux
isTestingJob: true
buildArgs: --all --test "/p:RunTemplateTests=false"
buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true"
beforeBuild:
- bash: "./eng/scripts/install-nginx-linux.sh"
displayName: Installing Nginx
Expand Down Expand Up @@ -579,7 +579,7 @@ stages:
steps:
- script: .\restore.cmd -ci
displayName: Restore
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
displayName: Run build.cmd helix target
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
Expand Down
27 changes: 0 additions & 27 deletions .azure/pipelines/helix-test.yml

This file was deleted.

1 change: 1 addition & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
<IsPackable Condition="'$(IsPackable)' == '' ">false</IsPackable>

<BuildHelixPayload Condition="'$(BuildHelixPayload)' == '' AND '$(IsTestProject)' == 'true'">true</BuildHelixPayload>
<SkipTests Condition="'$(SkipHelixReadyTests)' == 'true' AND '$(BuildHelixPayload)' == 'true'">true</SkipTests>
</PropertyGroup>

<ItemGroup Condition="'$(Language)' == 'C#' AND '$(IsReferenceAssemblyProject)' == 'true'">
Expand Down
43 changes: 17 additions & 26 deletions eng/targets/Helix.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,28 @@
<HelixAvailablePlatform Include="Linux" />
</ItemGroup>

<!-- required for green PR queues -->
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(IsRequiredCheck)' == 'true'">
<ItemGroup Condition="'$(IsWindowsOnlyTest)' == 'true'">
<HelixAvailablePlatform Include="Windows" />

<HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\update_schema.ps1" />
<HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\UpdateIISExpressCertificate.ps1" />
<HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\TestCert.pfx" />
<HelixContent Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" />

<HelixPreCommand Include="call RunPowershell.cmd update_schema.ps1 || exit /b 1" />
<HelixPreCommand Include="call RunPowershell.cmd UpdateIISExpressCertificate.ps1 || exit /b 1" />
</ItemGroup>

<!-- ubuntu and win10 required for green PR queues -->
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64'">
<HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Open" Platform="Windows" />
</ItemGroup>

<!-- daily scheduled only queues -->
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true'">
<HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
<HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" />
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="Linux" />
<HelixAvailableTargetQueue Include="Centos.7.Amd64.Open" Platform="Linux" />
Expand All @@ -31,28 +46,4 @@
<HelixAvailableTargetQueue Include="(Ubuntu-1804.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-6f28fa9-20190606004102" Platform="Linux" />
-->
</ItemGroup>

<!-- non required queues run on every PR -->
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(IsRequiredCheck)' != 'true'">
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Open" Platform="Windows" />
<HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
<HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" />
</ItemGroup>

<ItemGroup Condition="'$(IsWindowsOnlyTest)' == 'true' AND '$(IsRequiredCheck)' != 'true'">
<HelixAvailablePlatform Include="Windows" />

<HelixAvailableTargetQueue Include="Windows.10.Amd64.Open" Platform="Windows" />
<HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
<HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" />

<HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\update_schema.ps1" />
<HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\UpdateIISExpressCertificate.ps1" />
<HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\TestCert.pfx" />
<HelixContent Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" />

<HelixPreCommand Include="call RunPowershell.cmd update_schema.ps1 || exit /b 1" />
<HelixPreCommand Include="call RunPowershell.cmd UpdateIISExpressCertificate.ps1 || exit /b 1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<!-- Run on platforms where we support Selenium -->
<SkipTests Condition="'$(SeleniumE2ETestsSupported)' != 'true'">true</SkipTests>
<SkipTests Condition="'$(SeleniumE2ETestsSupported)' == 'true'">false</SkipTests>

<!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
Expand Down
1 change: 1 addition & 0 deletions src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<!-- https://github.com/dotnet/aspnetcore/issues/6857 -->
<BuildHelixPayload>false</BuildHelixPayload>
<SkipTests Condition="'$(RunTemplateTests)' == 'true'">false</SkipTests>
<BaseOutputPath />
<OutputPath />

Expand Down