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

add node number to log file for fsc 

add the node number to the dir of archived
log files to help find the correct log.

flag = none

Test Plan:
-jenkins passes, fsc has logs in sub dirs with node num

Change-Id: Ifd79d38239fc683c0d5afda54689298489c1ebd1
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/258893
Reviewed-by: Aaron Ogata <aogata@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
This commit is contained in:
James Butters 2021-02-17 06:46:32 -07:00
parent 296c8a2833
commit 7938aaa722
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Jenkinsfile.selenium.flakey_spec_catcher
View File

@ -155,8 +155,8 @@ def executeFlakeySpecCatcher(prefix = 'main') {
throw e
}
} finally {
sh "build/new-jenkins/docker-copy-files.sh /usr/src/app/tmp/fsc.out tmp canvas_ --allow-error --clean-dir"
archiveArtifacts artifacts: "tmp/**/fsc.out", allowEmptyArchive: true
sh "build/new-jenkins/docker-copy-files.sh /usr/src/app/tmp/fsc.out tmp/${env.NODE_NUMBER} canvas_ --allow-error --clean-dir"
archiveArtifacts artifacts: "tmp/${env.NODE_NUMBER}/**/fsc.out", allowEmptyArchive: true
}
}
@ -240,7 +240,10 @@ pipeline {
def stages = [:]
stages["flakey set 00"] = {
withEnv(["FSC_TESTS=${partitions[0].join(',')}"]) {
withEnv([
"FSC_TESTS=${partitions[0].join(',')}",
"NODE_NUMBER=00"
]) {
executeFlakeySpecCatcher()
}
}
@ -253,7 +256,10 @@ pipeline {
stages["flakey set $node_number"] = {
protectedNode('canvas-docker') {
withEnv(["FSC_TESTS=${partitions[index].join(',')}"]) {
withEnv([
"FSC_TESTS=${partitions[index].join(',')}",
"NODE_NUMBER=$node_number"
]) {
try {
setupNode()
executeFlakeySpecCatcher("node$node_number")