commit e669fb18a0019c93338997c0d1bc4a27a9948084
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Sep 01 10:29:05 2020 +0000
committer Gerrit Code Review <mail@domain.com> Tue Sep 01 10:29:05 2020 +0000
tree f639f434393ad9fbed432a9c7fa31814e8ea9bd3
parent 4eb1da385a8610b722a8f8de4aa7fb22a0fa385e
parent e6bd87f673e7a0b48f730f1eee62a2e3328970e6

Merge "Fix node rebooting procedure"

src/com/mirantis/mk/Debian.groovy

diff --git a/src/com/mirantis/mk/Debian.groovy b/src/com/mirantis/mk/Debian.groovy
index 47cd772..1b39d14 100644
--- a/src/com/mirantis/mk/Debian.groovy
+++ b/src/com/mirantis/mk/Debian.groovy
@@ -268,7 +268,7 @@
     salt.runSaltProcessStep(env, target, 'system.reboot', [], null, true, 5)
 
     common.retry(timeout, attempts) {
-        if (salt.runSaltProcessStep(env, target, 'file.file_exists', ['/tmp/rebooting'], null, true, 5)['return'][0].values()[0].toBoolean()) {
+        if (salt.runSaltProcessStep(env, target, 'cmd.run', ['test -e /tmp/rebooting || echo NOFILE'], null, true, 5)['return'][0].values()[0] != "NOFILE") {
             error("The system is still rebooting...")
         }
     }
@@ -354,4 +354,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}