From c086fdb09ed4a20efd3f7b7dc421c1282b901318 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 14 Jul 2014 14:48:35 +0100 Subject: Fix to use correct release branch. Replaces references to `master` with release tag name. --- scripts/do-release.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/do-release.py b/scripts/do-release.py index 5a86f090..5daca6c2 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: -- cgit v1.2.1 From fb3fd107167d630af627ec0a4c9b5534d2055571 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 14 Jul 2014 14:49:33 +0100 Subject: Tidy up the bits that the user is meant to edit. Fix string quoting. Put all stuff that needs changed in angle brackets. --- scripts/do-release.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/do-release.py b/scripts/do-release.py index 5daca6c2..6b487b41 100644 --- a/scripts/do-release.py +++ b/scripts/do-release.py @@ -36,16 +36,16 @@ See: . class config(object): - release_number = RELEASE NUMBER + release_number = '' - build_trove = 'hawkdevtrove' + build_trove = '' release_trove = 'git.baserock.org' deploy_workspace = '/src/ws-release' images_dir = '/src/release' artifacts_dir = '/src/release/artifacts' - images_server = '@download.baserock.org' + images_server = '@download.baserock.org' artifacts_server = 'root@git.baserock.org' # These paths are passed to rsync and ssh, so relative paths will be -- cgit v1.2.1