diff --git a/Jenkinsfile b/Jenkinsfile index 030e00c257f..7393129283f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -589,6 +589,13 @@ pipeline { ], true, "testReport" ) + echo 'adding Javascript (Coffeescript)' + buildStage.makeFromJob('Javascript (Coffeescript)', '/Canvas/test-suites/JS', stages, buildParameters + [ + string(name: 'WEBPACK_BUILDER_TAG', value: env.WEBPACK_BUILDER_IMAGE), + string(name: 'TEST_SUITE', value: "coffee"), + ], true, "testReport" + ) + echo 'adding Javascript (Karma)' buildStage.makeFromJob('Javascript (Karma)', '/Canvas/test-suites/JS', stages, buildParameters + [ string(name: 'WEBPACK_BUILDER_TAG', value: env.WEBPACK_BUILDER_IMAGE), diff --git a/Jenkinsfile.js b/Jenkinsfile.js index 084977f189e..27e84b772da 100644 --- a/Jenkinsfile.js +++ b/Jenkinsfile.js @@ -20,7 +20,7 @@ library "canvas-builds-library@${env.CANVAS_BUILDS_REFSPEC}" -def COFFEE_NODE_COUNT = 1 +def COFFEE_NODE_COUNT = 4 def DEFAULT_NODE_COUNT = 1 def JSG_NODE_COUNT = 3 @@ -109,9 +109,11 @@ pipeline { } } } - } - - if(env.TEST_SUITE == 'karma') { + } else if(env.TEST_SUITE == 'coffee') { + for(int i = 0; i < COFFEE_NODE_COUNT; i++) { + tests["Karma - Spec Group - coffee${i}"] = makeKarmaStage('coffee', i, COFFEE_NODE_COUNT) + } + } else if(env.TEST_SUITE == 'karma') { tests['Packages'] = { withEnv(['CONTAINER_NAME=tests-packages']) { try { @@ -128,10 +130,6 @@ pipeline { sh 'build/new-jenkins/js/tests-quizzes.sh' } - for(int i = 0; i < COFFEE_NODE_COUNT; i++) { - tests["Karma - Spec Group - coffee${i}"] = makeKarmaStage('coffee', i, COFFEE_NODE_COUNT) - } - for(int i = 0; i < JSG_NODE_COUNT; i++) { tests["Karma - Spec Group - jsg${i}"] = makeKarmaStage('jsg', i, JSG_NODE_COUNT) }