Commit 3def6eef authored by Nicolas Wavrant's avatar Nicolas Wavrant

test

parent bf12c51a
...@@ -847,23 +847,28 @@ def isSoftwareReleaseReady(config): ...@@ -847,23 +847,28 @@ def isSoftwareReleaseReady(config):
"""Return 1 if the Software Release has """Return 1 if the Software Release has
correctly been deployed, 0 if not, correctly been deployed, 0 if not,
and 2 if it is currently deploying""" and 2 if it is currently deploying"""
return "1" logger.warning('in isSoftwareReleaseReady')
auto_deploy = config['auto_deploy'] in TRUE_VALUES auto_deploy = config['auto_deploy'] in TRUE_VALUES
auto_run = config['autorun'] in TRUE_VALUES auto_run = config['autorun'] in TRUE_VALUES
project = os.path.join(config['etc_dir'], '.project') project = os.path.join(config['etc_dir'], '.project')
if not ( os.path.exists(project) and (auto_run or auto_deploy) ): if not ( os.path.exists(project) and (auto_run or auto_deploy) ):
return "0" return "0"
logger.warning('will run updateInstanceParameter')
updateInstanceParameter(config) updateInstanceParameter(config)
logger.warning('will run isSoftwareReleaseCompleted')
if isSoftwareReleaseCompleted(config): if isSoftwareReleaseCompleted(config):
if auto_run: if auto_run:
runSlapgridUntilSuccess(config, 'instance') runSlapgridUntilSuccess(config, 'instance')
return "1" return "1"
else: else:
logger.warning('will run IsSoftwareRunning')
if isSoftwareRunning(config): if isSoftwareRunning(config):
return "2" return "2"
elif auto_deploy: elif auto_deploy:
logger.warning('will run runSoftwareWithLock')
runSoftwareWithLock(config) runSoftwareWithLock(config)
if auto_run: if auto_run:
logger.warning('will run runSlapgridUntilSuccess on instance')
runSlapgridUntilSuccess(config, 'instance') runSlapgridUntilSuccess(config, 'instance')
return "2" return "2"
else: else:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment