adds option to skip logs gathering

Signed-off-by: Andrey Kononykhin <[email protected]>
Suvanch · Jul 23, 2019 · 5828257 · 5828257
1 parent 6a27d98
commit 5828257
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Jenkinsfile.nightly b/Jenkinsfile.nightly
@@ -5,6 +5,7 @@
 String pkgName = 'indy-node'
 String mainModuleName = 'indy_node'
 String emailRecipients = params.INDY_NODE_RECIPIENTS ?: env.INDY_NODE_RECIPIENTS ?: ''
+Boolean gatherLogs = (params.GATHER_LOGS ?: env.GATHER_LOGS) != 'false'
 
 def localLib
 def err
@@ -61,6 +62,7 @@ try {
         ]
         testVersion = 'v0.8.7'
         testVersionByTag = true
+        delegate.gatherLogs = gatherLogs
     }
 } catch(Exception _err) {
     currentBuild.result = "FAILED"

diff --git a/ci/pipeline.groovy b/ci/pipeline.groovy
@@ -12,7 +12,8 @@ def systemTests(Closure body) {
             srcVersion: null,
             testSchema: [['.']],
             testVersion: null,
-            testVersionByTag: false
+            testVersionByTag: false,
+            gatherLogs: true
         ],
         body, ['pkgVersion'], {}, prefix
     )
@@ -93,6 +94,7 @@ def systemTests(Closure body) {
                 String testReportFileNamePlain = "system_tests_${testGroup}_report.${config.repoChannel}.txt"
                 String testTargets = config.testSchema[testGroup].collect{"system/indy-node-tests/$it"}.join(' ')
                 String buildLogsDir = "_build/logs"
+                String gatherLogsOpt = config.gatherLogs ? ' --gatherlogs' : ''
 
                 try {
                     stage("[${testGroup}] Run tests") {
@@ -101,7 +103,7 @@ def systemTests(Closure body) {
                                 set -o pipefail; \
                                 ./system/docker/run.sh \
                                     \\"$testTargets\\" \
-                                    \\"-l -vv --junit-xml=$testReportFileNameXml --gatherlogs --logsdir=${buildLogsDir}\\" \
+                                    \\"-l -vv --junit-xml=$testReportFileNameXml ${gatherLogsOpt} --logsdir=${buildLogsDir}\\" \
                                     \\"$systemTestsNetwork\\" 2>&1 | tee $testReportFileNamePlain;\
                             "
                         """