From 658e017cb3d1ca2938b41493fa54df6126f4463c Mon Sep 17 00:00:00 2001 From: Egor Chesakov Date: Tue, 5 Feb 2019 12:04:40 -0800 Subject: [PATCH] Use Jenkins for Linux/arm32 testing (#22429) --- eng/platform-matrix.yml | 6 +++--- netci.groovy | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/eng/platform-matrix.yml b/eng/platform-matrix.yml index d7d6b43..f699177 100644 --- a/eng/platform-matrix.yml +++ b/eng/platform-matrix.yml @@ -19,9 +19,9 @@ jobs: containerName: ubuntu_1404_arm_cross_build_image helixQueues: ${{ if eq(variables['System.TeamProject'], 'public') }}: - asString: 'Ubuntu.1404.Arm32.Open' - asArray: - - Ubuntu.1404.Arm32.Open + # TODO: add Ubuntu.1404.Arm32.Open once Jenkins has been shutdown + asString: '' + asArray: [] ${{ if eq(variables['System.TeamProject'], 'internal') }}: # We don't have any Linux/arm32 internal Helix queues asString: '' diff --git a/netci.groovy b/netci.groovy index 00d42d1..75089c6 100755 --- a/netci.groovy +++ b/netci.groovy @@ -1928,10 +1928,19 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os, needsTrigger = false break } - - if (scenario == 'crossgen_comparison') { - if (os == 'Ubuntu' && architecture == 'arm' && (configuration == 'Checked' || configuration == 'Release')) { - isDefaultTrigger = true + if (os == 'Ubuntu' && architecture == 'arm') { + switch (scenario) { + case 'innerloop': + case 'no_tiered_compilation_innerloop': + if (configuration == 'Checked') { + isDefaultTrigger = true + } + break + case 'crossgen_comparison': + if (configuration == 'Checked' || configuration == 'Release') { + isDefaultTrigger = true + } + break } } break -- 2.7.4