summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <michael.drake@codethink.co.uk>2014-07-30 14:51:48 +0100
committerMichael Drake <michael.drake@codethink.co.uk>2014-07-30 14:51:48 +0100
commit0b8ceeca7540faab5f7750e2c95d6496ae904391 (patch)
tree1a16de95a6b9869437b9e7b3e63698db5d1bf172
parentdcbf761d786bd67ee77f996bc6f4d6befb489dc7 (diff)
downloaddefinitions-0b8ceeca7540faab5f7750e2c95d6496ae904391.tar.gz
Write release images into release subdirectory
The script used to chdir into the release directory before running morph deploy. Unfortunately, this didn't work because deployments are run from the top of the definitons repository. So now the release directory is included in the path to be deployed.
-rwxr-xr-xscripts/release-build3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/release-build b/scripts/release-build
index 36a38deb..361d32a0 100755
--- a/scripts/release-build
+++ b/scripts/release-build
@@ -98,7 +98,6 @@ class ReleaseApp(cliapp.Application):
os.chdir('..')
if not os.path.exists('release'):
os.mkdir('release')
- os.chdir('release')
self.deploy_images(cluster, cluster_path)
def load_morphology(self, name, kind=None):
@@ -140,7 +139,7 @@ class ReleaseApp(cliapp.Application):
'In %s: system %s.location should be just the base name, '
'e.g. "%s.img"' % (cluster_path, name, name))
- filename = '%s-%s' % (version_label, basename)
+ filename = os.path.join('release', '%s-%s' % (version_label, basename))
if os.path.exists(filename):
self.output.write('Reusing existing deployment of %s\n' % filename)
else: