summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgor Chesakov <Egor.Chesakov@microsoft.com>2019-01-18 22:05:29 (GMT)
committerGitHub <noreply@github.com>2019-01-18 22:05:29 (GMT)
commit87fb9af12afb29087a818bd588037996a97bf000 (patch)
tree91843392898b77f2fe8423019a20f0cb3f237f7d
parent0684f9241dd9886c2e3d53383fbeb27d31e604f0 (diff)
downloadcoreclr-87fb9af12afb29087a818bd588037996a97bf000.zip
coreclr-87fb9af12afb29087a818bd588037996a97bf000.tar.gz
coreclr-87fb9af12afb29087a818bd588037996a97bf000.tar.bz2
Run Azure DevOps builds against pull requests in coreclr/master (#22051)
And disable Windows_NT and Ubuntu arm32 and arm64 default triggers in Jenkins CI
-rw-r--r--azure-pipelines.yml5
-rwxr-xr-xnetci.groovy24
-rw-r--r--tests/helixpublishwitharcade.proj2
3 files changed, 12 insertions, 19 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f40bbad..1b55807 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -23,6 +23,11 @@ resources:
- container: centos6_x64_build_image
image: microsoft/dotnet-buildtools-prereqs:centos-6-376e1a3-20174311014331
+trigger: none
+
+pr:
+- master
+
jobs:
## The following is the matrix of test runs that we have. This is
diff --git a/netci.groovy b/netci.groovy
index b1c19a3..14b9ef5 100755
--- a/netci.groovy
+++ b/netci.groovy
@@ -1923,18 +1923,10 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
break
}
- switch (scenario) {
- case 'innerloop':
- case 'no_tiered_compilation_innerloop':
- if (configuration == 'Checked') {
- isDefaultTrigger = true
- }
- break
- case 'crossgen_comparison':
- if (os == 'Ubuntu' && architecture == 'arm' && (configuration == 'Checked' || configuration == 'Release')) {
- isDefaultTrigger = true
- }
- break
+ if (scenario == 'crossgen_comparison') {
+ if (os == 'Ubuntu' && architecture == 'arm' && (configuration == 'Checked' || configuration == 'Release')) {
+ isDefaultTrigger = true
+ }
}
break
@@ -1951,13 +1943,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
switch (scenario) {
case 'innerloop':
- if (configuration == 'Debug') {
- // Add default PR trigger for Windows arm64 Debug builds. This is a build only -- no tests are run --
- // so the private test hardware is not used. Thus, it can be run by all users, not just arm64Users.
- // People in arm64Users will get both this and the Checked Build and Test job.
- isDefaultTrigger = true
- } else if (configuration == 'Checked') {
- isDefaultTrigger = true
+ if (configuration == 'Checked') {
isArm64PrivateJob = true
}
break
diff --git a/tests/helixpublishwitharcade.proj b/tests/helixpublishwitharcade.proj
index 65341d3..39ee7fe 100644
--- a/tests/helixpublishwitharcade.proj
+++ b/tests/helixpublishwitharcade.proj
@@ -69,6 +69,8 @@
<Target Name="BuildHelixWorkItem" BeforeTargets="Test">
<PropertyGroup>
+ <EnableXUnitReporter>true</EnableXUnitReporter>
+ <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
<TestRunNamePrefix Condition=" '$(Scenario)' == 'normal' ">$(BuildOS) $(BuildArch) $(BuildType) @ </TestRunNamePrefix>
<TestRunNamePrefix Condition=" '$(Scenario)' != 'normal' ">$(BuildOS) $(BuildArch) $(BuildType) $(Scenario) @ </TestRunNamePrefix>
<_XUnitRunnerArgs>-parallel collections -nocolor -noshadow -xml testResults.xml -notrait category=outerloop -notrait category=failing</_XUnitRunnerArgs>