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

fix rspecq_redis_password warning in Jenkins 

[use-rspecq]

Change-Id: I3d9e21acfc2252e5484807e3a65746f4985a55ac
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/274212
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: James Butters <jbutters@instructure.com>
QA-Review: Kyle Rosenbaum <krosenbaum@instructure.com>
Product-Review: Kyle Rosenbaum <krosenbaum@instructure.com>
This commit is contained in:
Kyle Rosenbaum 2021-09-22 14:59:27 -07:00
parent 50f3a1443d
commit 853637feda
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

@ -170,7 +170,7 @@ def runRspecqSuite() {
def rspecProcesses = env.RSPEC_PROCESSES.toInteger()
rspecProcesses.times { index ->
def workerName = "${env.JOB_NAME}_worker${CI_NODE_INDEX}-${index}"
def workerName = "${JOB_NAME}_worker${CI_NODE_INDEX}-${index}"
workers[workerName] = { ->
def workerStartTime = System.currentTimeMillis()
sh(script: "docker-compose exec -e ENABLE_AXE_SELENIUM \
@ -179,7 +179,7 @@ def runRspecqSuite() {
-e RAILS_DB_NAME_TEST=canvas_test_${index} \
-e RSPECQ_UPDATE_TIMINGS \
-T canvas bundle exec rspecq \
--build ${env.JOB_NAME}_build${BUILD_NUMBER} \
--build ${JOB_NAME}_build${BUILD_NUMBER} \
--worker ${workerName} \
--include-pattern '${TEST_PATTERN}' \
--exclude-pattern '${EXCLUDE_TESTS}' \
@ -192,7 +192,7 @@ def runRspecqSuite() {
def workerEndTime = System.currentTimeMillis()
//To Do: remove once data gathering exercise is complete and RspecQ is enabled by default.
def specCount = sh(script: "docker-compose exec -e ${env.RSPECQ_REDIS_PASSWORD} -T redis redis-cli -h ${env.TEST_QUEUE_HOST} -p 6379 llen ${env.JOB_NAME}_build${BUILD_NUMBER}:queue:jobs_per_worker:${workerName}", returnStdout: true).trim()
def specCount = sh(script: "docker-compose exec -e $RSPECQ_REDIS_PASSWORD -T redis redis-cli -h $TEST_QUEUE_HOST -p 6379 llen ${JOB_NAME}_build${BUILD_NUMBER}:queue:jobs_per_worker:${workerName}", returnStdout: true).trim()
reportToSplunk('test_queue_worker_ended', [
'workerName': workerName,