diff options
| author | Michael Drake <michael.drake@codethink.co.uk> | 2014-07-15 13:59:42 +0100 |
|---|---|---|
| committer | Michael Drake <michael.drake@codethink.co.uk> | 2014-07-15 13:59:42 +0100 |
| commit | bc8c891a6d6caff8150b5e6aada9b64a14b1bfcb (patch) | |
| tree | 725cc8d16cfe27abb8069df5751b0f4a4e8a38f2 | |
| parent | 773f6a31bbeb6c5d603281d7b36ebb75225a4f0a (diff) | |
| parent | fb3fd107167d630af627ec0a4c9b5534d2055571 (diff) | |
| download | definitions-bc8c891a6d6caff8150b5e6aada9b64a14b1bfcb.tar.gz | |
Merge branch 'baserock/michaeldrake/fix-release-branch'
| -rw-r--r-- | scripts/do-release.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/do-release.py b/scripts/do-release.py index 5a86f090..6b487b41 100644 --- a/scripts/do-release.py +++ b/scripts/do-release.py @@ -36,16 +36,16 @@ See: <http://wiki.baserock.org/guides/release-process>. class config(object): - release_number = RELEASE NUMBER + release_number = '<RELEASE NUMBER>' - build_trove = 'hawkdevtrove' + build_trove = '<YOUR BUILD TROVE>' release_trove = 'git.baserock.org' deploy_workspace = '/src/ws-release' images_dir = '/src/release' artifacts_dir = '/src/release/artifacts' - images_server = <YOUR USERNAME> '@download.baserock.org' + images_server = '<YOUR USERNAME>@download.baserock.org' artifacts_server = 'root@git.baserock.org' # These paths are passed to rsync and ssh, so relative paths will be @@ -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: |