commit 24d4965db164a5c4f1566c97fe12cc8f77886823
author azvyagintsev <azvyagintsev@mirantis.com> Tue Aug 21 19:33:51 2018 +0300
committer azvyagintsev <azvyagintsev@mirantis.com> Tue Aug 21 19:34:05 2018 +0300
tree 61bbe5a5393d69b1b180312439656ddebf8a689d
parent 3bbcafe870127a2a45374adef0508dfe4879a3b7

Fix regexp processing in comparePillars

Change-Id: Id25b1a378e291733c6002815ae554e19b3ad2b9f

src/com/mirantis/mk/Common.groovy

diff --git a/src/com/mirantis/mk/Common.groovy b/src/com/mirantis/mk/Common.groovy
index a087c5e..570b7a2 100644
--- a/src/com/mirantis/mk/Common.groovy
+++ b/src/com/mirantis/mk/Common.groovy
@@ -628,6 +628,10 @@
         diff_status = sh(script: 'diff -q -r old/ new/  > pillar.diff',
             returnStatus: true,
         )
+    }
+    // Set job description
+    String description = ''
+    if (diff_status == 1) {
         // Unfortunately, diff not able to work with dir-based regexp
         if (grepOpts) {
             sh(script: """
@@ -637,10 +641,6 @@
                 returnStatus: false
             )
         }
-    }
-    // Set job description
-    String description = ''
-    if (diff_status == 1) {
         // Analyse output file and prepare array with results
         String data_ = readFile file: "${compRoot}/pillar.diff"
         def diff_list = diffCheckMultidir(data_.split("\\r?\\n"))