From c55ee5f1d3ff52025ceb1cff5b47c4f4ef59a147 Mon Sep 17 00:00:00 2001 From: Aaron Ogata Date: Mon, 21 Sep 2020 12:54:15 -0700 Subject: [PATCH] merge Jenkins node labels Looking at Jenkins node usage, we're seeing that rspec / normal docker executors can be sitting idle while waiting for a selenium executor. There shouldn't be a difference between their configurations, so let's see how it affects the queue times if we make all stages use the same type of node. refs DE-276 Change-Id: Ic8f9ffe8d148dc9119d1e456e689b46973a1fb3b Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/248114 Tested-by: Service Cloud Jenkins Reviewed-by: Kyle Rosenbaum QA-Review: Aaron Ogata Product-Review: Aaron Ogata --- build/new-jenkins/groovy/distribution.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/new-jenkins/groovy/distribution.groovy b/build/new-jenkins/groovy/distribution.groovy index f6d2a18c0fb..2299e1627e3 100644 --- a/build/new-jenkins/groovy/distribution.groovy +++ b/build/new-jenkins/groovy/distribution.groovy @@ -41,7 +41,7 @@ def appendStagesAsBuildNodes(nodes, def stage_name = "$stage_name_prefix ${(index + 1).toString().padLeft(2, '0')}" def timeStart = new Date() nodes[stage_name] = { - protectedNode("canvas-$test_label-docker") { + protectedNode("canvas-docker") { echo "Running on node ${env.NODE_NAME}" def duration = TimeCategory.minus(new Date(), timeStart).toMilliseconds() // make sure to unstash