From 3a8dc007b898e7997329a43bb0431c90bd243198 Mon Sep 17 00:00:00 2001 From: Bruce Forstall Date: Wed, 19 Sep 2018 17:27:07 -0700 Subject: [PATCH] Fix arm64 Linux innerloop triggered jobs Only trigger flow job, not build job. Commit migrated from https://github.com/dotnet/coreclr/commit/0848eb109ba07fcddc20a45538d651f499222170 --- src/coreclr/netci.groovy | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy index b1979b3..4bc2f68 100755 --- a/src/coreclr/netci.groovy +++ b/src/coreclr/netci.groovy @@ -1309,8 +1309,11 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def // TEMPORARY: make arm64 Linux innerloop jobs push jobs, not default triggered jobs, until we have experience // with the machines running these jobs (and the jobs themselves), to understand how robust they are. // We should never get here (in the "innerloop cases) for non-PR jobs, except for this TEMPORARY exception. + // Only trigger the flow job, not the build job. assert (isInnerloopTestScenario(scenario) && (architecture == 'arm64') && (os == 'Ubuntu16.04') && (configuration == 'Checked')) - addGithubPushTriggerHelper(job) + if (isFlowJob) { + addGithubPushTriggerHelper(job) + } break case 'crossgen_comparison': @@ -3644,6 +3647,12 @@ def static shouldGenerateFlowJob(def scenario, def isPR, def architecture, def c // The various "innerloop" jobs are only available as PR triggered. if (!isPR) { + if (isInnerloopTestScenario(scenario) && (architecture == 'arm64') && (os == 'Ubuntu16.04') && (configuration == 'Checked')) { + // TEMPORARY: make arm64 Linux innerloop jobs push jobs, not default triggered jobs, until we have experience + // with the machines running these jobs (and the jobs themselves), to understand how robust they are. + return true + } + if (isInnerloopTestScenario(scenario)) { return false } -- 2.7.4