summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Drake <michael.drake@codethink.co.uk>2014-07-14 13:48:35 (GMT)
committerMichael Drake <michael.drake@codethink.co.uk>2014-07-14 13:59:39 (GMT)
commitc086fdb09ed4a20efd3f7b7dc421c1282b901318 (patch)
tree3b40725eeaa8c9459184e7584822011d4f17605a /scripts
parent773f6a31bbeb6c5d603281d7b36ebb75225a4f0a (diff)
downloaddefinitions-c086fdb09ed4a20efd3f7b7dc421c1282b901318.tar.gz
Fix to use correct release branch.
Replaces references to `master` with release tag name.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/do-release.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/do-release.py b/scripts/do-release.py
index 5a86f09..5daca6c 100644
--- a/scripts/do-release.py
+++ b/scripts/do-release.py
@@ -113,7 +113,7 @@ class DeployImages(object):
status('Reusing existing workspace %s' % path)
repo = 'baserock:baserock/definitions'
- branch = 'master'
+ branch = 'baserock-%s' % config.release_number
with cwd(path):
if not os.path.exists(branch):
@@ -252,7 +252,8 @@ class PrepareArtifacts(object):
else:
text = cliapp.runcmd(
['morph', '--quiet', '--trove-host=%s' % config.build_trove,
- 'list-artifacts', 'baserock:baserock/definitions', 'master'] +
+ 'list-artifacts', 'baserock:baserock/definitions',
+ 'baserock-%s' % config.release_number] +
system_morphs)
artifact_basenames = text.strip().split('\n')
with morphlib.savefile.SaveFile(artifact_manifest, 'w') as f: