commit 8706c02741f76d908ec683a17da9556a7e6a14b6
author Martin Polreich <polreichmartin@gmail.com> Mon Sep 30 16:51:13 2019 +0200
committer Martin Polreich <polreichmartin@gmail.com> Mon Sep 30 16:51:17 2019 +0200
tree 4205ce66038d7feff57cb982819e16a8a34f8e7e
parent 5f1c0d95dc65d516725dcab33e0975063ae391c5

Minor fixes for backupninja backup pipeline

Related: PROD-32740

Change-Id: I2d39eaf35a8bfe2fbe4373b82313d7cad26fa189

backupninja-backup-pipeline.groovy

diff --git a/backupninja-backup-pipeline.groovy b/backupninja-backup-pipeline.groovy
index 5ec3457..1af5e5b 100644
--- a/backupninja-backup-pipeline.groovy
+++ b/backupninja-backup-pipeline.groovy
@@ -11,6 +11,7 @@
 logBackupFailure = []
 
 def checkBackupninjaLog(output, backupName='', terminateOnFailure=true) {
+    def common = new com.mirantis.mk.Common()
     def outputPattern = java.util.regex.Pattern.compile("\\d+")
     def outputMatcher = outputPattern.matcher(output)
     if (outputMatcher.find()) {
@@ -61,7 +62,7 @@
             if (backupDogtag) {
                 try {
                     def dogtagPillar = salt.getPillar(pepperEnv, "I@salt:master", "dogtag:server")
-                    if (masterPillar['return'].isEmpty()) {
+                    if (dogtagPillar['return'].isEmpty()) {
                         throw new Exception("Problem with dogtag pillar on I@dogtag:server node.")
                     }
                 }