ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move RSpecQ node count, file split, and requeues to canvas-builds config 

[canvas-builds-refspec=467ec8d3c67450c44b02312c557233bb9b97a64c]

flag = none
refs: DE-849

Test Plan:
- Jenkins passes with corresponding canvas-builds sha

Change-Id: I3256d79173e9e64bdea952837e97996eb33fa87a
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/273554
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
Reviewed-by: Kyle Rosenbaum <krosenbaum@instructure.com>
This commit is contained in:
James Butters 2021-09-14 10:31:46 -06:00
parent b9c0c26541
commit 1233a0b886
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/new-jenkins/library/vars/rspecStage.groovy
View File

@ -19,7 +19,7 @@
def createDistribution(nestedStages) { def createDistribution(nestedStages) {
def rspecNodeTotal = configuration.getInteger('rspec-ci-node-total') def rspecNodeTotal = configuration.getInteger('rspec-ci-node-total')
def seleniumNodeTotal = configuration.getInteger('selenium-ci-node-total') def seleniumNodeTotal = configuration.getInteger('selenium-ci-node-total')
def rspecqNodeTotal = env.TEST_QUEUE_NODES.toInteger() def rspecqNodeTotal = configuration.getInteger('rspecq-ci-node-total')
def rspecqEnabled = env.RSPECQ_ENABLED == '1' || configuration.isRspecqEnabled() def rspecqEnabled = env.RSPECQ_ENABLED == '1' || configuration.isRspecqEnabled()
def setupNodeHook = this.&setupNode def setupNodeHook = this.&setupNode
@ -56,8 +56,8 @@ def createDistribution(nestedStages) {
"FORCE_FAILURE=${configuration.isForceFailureSelenium() ? '1' : ''}", "FORCE_FAILURE=${configuration.isForceFailureSelenium() ? '1' : ''}",
"RERUNS_RETRY=${configuration.getInteger('rspec-rerun-retry')}", "RERUNS_RETRY=${configuration.getInteger('rspec-rerun-retry')}",
"RSPEC_PROCESSES=${configuration.getInteger('rspecq-processes')}", "RSPEC_PROCESSES=${configuration.getInteger('rspecq-processes')}",
"RSPECQ_FILE_SPLIT_THRESHOLD=${env.GERRIT_EVENT_TYPE == 'change-merged' ? '999' : '150'}", "RSPECQ_FILE_SPLIT_THRESHOLD=${configuration.fileSplitThreshold()}",
'RSPECQ_MAX_REQUEUES=2', "RSPECQ_MAX_REQUEUES=${configuration.getInteger('rspecq-max-requeues')}",
'TEST_PATTERN=^./(spec|gems/plugins/.*/spec_canvas)/', 'TEST_PATTERN=^./(spec|gems/plugins/.*/spec_canvas)/',
"RSPECQ_UPDATE_TIMINGS=${env.GERRIT_EVENT_TYPE == 'change-merged' ? '1' : '0'}", "RSPECQ_UPDATE_TIMINGS=${env.GERRIT_EVENT_TYPE == 'change-merged' ? '1' : '0'}",
] ]