slaprunner: runSlapgridUntilSucces only run if build is ok

fd90499b · Nicolas Wavrant · d1584853 · fd90499b
Commit fd90499b authored Dec 10, 2013 by Nicolas Wavrant
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

slapos/runner/utils.py slapos/runner/utils.py +5 -2

No files found.
--- a/slapos/runner/utils.py
+++ b/slapos/runner/utils.py
@@ -830,10 +830,13 @@ def runSlapgridUntilSuccess(config, step):
    return
  # XXX-Nico runSoftwareWithLock can return 0 or False (0==False)
  while max_tries > 0:
-    if runSlapgridWithLock(config):
+    slapgrid = runSlapgridWithLock(config)
+    if slapgrid:
      break
    max_tries -= 1
-  if step == "software" and RUN_INSTANCE:
+  # run instance only if we are deploying the software release,
+  # if it is defined so, and sr is correctly deployed
+  if step == "software" and RUN_INSTANCE and slapgrid:
    runSlapgridUntilSuccess(config, "instance")