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

use docker-with-flakey-network-protection 

Change-Id: I3428fe1de818813aad448a631e16fb5d08d30475
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/276855
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
This commit is contained in:
James Butters 2021-10-26 13:20:07 -06:00
parent ff416aeb59
commit 0df511b6a7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,6 +103,7 @@ def createDistribution(nestedStages) {
def setupNode() {
env.AUTO_CANCELLED = 'false'
distribution.unstashBuildScripts()
if (queue_empty()) {
catchError([buildResult: 'SUCCESS', stageResult: 'ABORTED']) {
env.AUTO_CANCELLED = 'true'
@ -110,7 +111,6 @@ def setupNode() {
}
return
}
distribution.unstashBuildScripts()
libraryScript.execute 'bash/print-env-excluding-secrets.sh'
if (env.RSPECQ_ENABLED == '1') {
def redisPassword = URLEncoder.encode("${env.RSPECQ_REDIS_PASSWORD ?: ''}", 'UTF-8')
@ -248,7 +248,7 @@ def runReporter() {
def queue_empty() {
env.REGISTRY_BASE = 'starlord.inscloudgate.net/jenkins'
sh "docker pull $REGISTRY_BASE/redis:alpine"
sh "./build/new-jenkins/docker-with-flakey-network-protection.sh pull $REGISTRY_BASE/redis:alpine"
def queueSize = sh(script: "docker run -e REDISCLI_AUTH=${RSPECQ_REDIS_PASSWORD} -e TEST_QUEUE_HOST -t $REGISTRY_BASE/redis:alpine redis-cli -h $TEST_QUEUE_HOST -p 6379 llen ${JOB_NAME}_build${BUILD_NUMBER}:queue:unprocessed", returnStdout: true).split(' ')[1].trim()
def queueStatus = sh(script: "docker run -e REDISCLI_AUTH=${RSPECQ_REDIS_PASSWORD} -e TEST_QUEUE_HOST -t $REGISTRY_BASE/redis:alpine redis-cli -h $TEST_QUEUE_HOST -p 6379 get ${JOB_NAME}_build${BUILD_NUMBER}:queue:status", returnStdout: true).trim()
queueStatus == '\"ready\"' && queueSize.toInteger() == 0