From 2ea38264077af6d51bf016368c939b8885c0beb3 Mon Sep 17 00:00:00 2001 From: Jarret Shook Date: Tue, 19 Mar 2019 11:06:56 -0700 Subject: [PATCH] Disable Jenkins Innerloop Jobs (dotnet/coreclr#23287) * Disable Jenkins Innerloop Jobs This change will: 1) Remove default PR trigger jobs from being run in jenkins 2) Start submitting tests for linux arm32 in coreclr-ci It is worth noting that this change will not remove jobs from netci.groovy. This is to say that it is still possible to trigger innerloop and outerloop jobs in jenkins, they will just not be run automatically on each new PR. Past this point coreclr-ci will be the only PR triggered jobs to appear in Coreclr. To see test results, navigate to the coreclr-ci Azure Dev Ops page at: https://dev.azure.com/dnceng/public/_build?definitionId=228 and view the build related to your PR. There is a test tab which will report all test results. * Address PR feedback * Add queue to array syntax * Do not create push trigger jobs Commit migrated from https://github.com/dotnet/coreclr/commit/21075b3f0150084e341a7d37374de67c616b9870 --- eng/platform-matrix.yml | 6 +++--- src/coreclr/netci.groovy | 46 +++------------------------------------------- 2 files changed, 6 insertions(+), 46 deletions(-) diff --git a/eng/platform-matrix.yml b/eng/platform-matrix.yml index 69d4cbe..1c2b3ea 100644 --- a/eng/platform-matrix.yml +++ b/eng/platform-matrix.yml @@ -33,9 +33,9 @@ jobs: containerName: ubuntu_1404_arm_cross_build_image helixQueues: ${{ if eq(variables['System.TeamProject'], 'public') }}: - # TODO: add Ubuntu.1404.Arm32.Open once Jenkins has been shutdown - asString: '' - asArray: [] + asString: 'Ubuntu.1404.Arm32.Open' + asArray: + - Ubuntu.1404.Arm32.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: # We don't have any Linux/arm32 internal Helix queues asString: '' diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy index 6ab0437..d9f4281 100755 --- a/src/coreclr/netci.groovy +++ b/src/coreclr/netci.groovy @@ -169,58 +169,17 @@ class Constants { // Valid PR trigger combinations. def static prTriggeredValidInnerLoopCombos = [ 'Windows_NT': [ - 'x64': [ - 'Checked' - ], - 'x86': [ - 'Checked', - 'Release' - ], 'arm': [ - 'Debug', 'Checked' ], 'arm64': [ - 'Debug', 'Checked' ] ], 'Windows_NT_BuildOnly': [ - 'x64': [ - 'Checked', - 'Release' - ], - 'x86': [ - 'Checked', - 'Release' - ], 'arm': [ 'Checked' ], - ], - 'Ubuntu': [ - 'x64': [ - 'Checked' - ], - 'arm': [ - 'Checked' - ] - ], - 'Ubuntu16.04': [ - 'arm64': [ - 'Checked' - ] - ], - 'CentOS7.1': [ - 'x64': [ - 'Debug', - 'Checked' - ] - ], - 'OSX10.12': [ - 'x64': [ - 'Checked' - ] ] ] @@ -679,8 +638,9 @@ def static addPeriodicTriggerHelper(def job, String cronString, boolean alwaysRu } def static addGithubPushTriggerHelper(def job) { - addToMergeView(job) - Utilities.addGithubPushTrigger(job) + // Disable all Push trigger jobs. All jobs will need to be requested. + // addToMergeView(job) + // Utilities.addGithubPushTrigger(job) } -- 2.7.4