commit b99f87c0ee8ae7d23ed0316cc52aa44d633e4f2f
author azvyagintsev <azvyagintsev@mirantis.com> Tue Aug 21 19:43:59 2018 +0300
committer azvyagintsev <azvyagintsev@mirantis.com> Tue Aug 21 19:44:01 2018 +0300
tree f04fcadf6067fe80841e5d20feea33c2dd530a79
parent 24d4965db164a5c4f1566c97fe12cc8f77886823

Fix regexp processing in comparePillars

Change-Id: Id96a2db734bbbcad3561f3b43c69f07ee77159d1

src/com/mirantis/mk/Common.groovy

diff --git a/src/com/mirantis/mk/Common.groovy b/src/com/mirantis/mk/Common.groovy
index 570b7a2..9d34d70 100644
--- a/src/com/mirantis/mk/Common.groovy
+++ b/src/com/mirantis/mk/Common.groovy
@@ -634,12 +634,14 @@
     if (diff_status == 1) {
         // Unfortunately, diff not able to work with dir-based regexp
         if (grepOpts) {
-            sh(script: """
+            dir(compRoot) {
+                sh(script: """
                 cp -v pillar.diff pillar_orig.diff
                 grep ${grepOpts} pillar_orig.diff  > pillar.diff
                 """,
-                returnStatus: false
-            )
+                    returnStatus: false
+                )
+            }
         }
         // Analyse output file and prepare array with results
         String data_ = readFile file: "${compRoot}/pillar.diff"