Support user-specified version

It would be helpful to have a version that is passed in on the command
line...especially with things like Jenkins build numbers.
This commit is contained in:
Craig Tracey 2014-11-15 22:14:58 -05:00
parent 2e5390a0a2
commit 83891b64bd
2 changed files with 6 additions and 3 deletions

View File

@ -22,8 +22,9 @@ from giftwrap.settings import Settings
class BuildSpec(object):
def __init__(self, manifest):
def __init__(self, manifest, version):
self._manifest = yaml.load(manifest)
self.version = version
self.settings = Settings.factory(self._manifest['settings'])
self.projects = self._render_projects()
@ -32,5 +33,6 @@ class BuildSpec(object):
if 'projects' in self._manifest:
for project in self._manifest['projects']:
projects.append(OpenstackProject.factory(self.settings,
project))
project,
self.version))
return projects

View File

@ -44,7 +44,7 @@ def build(args):
with open(args.manifest, 'r') as fh:
manifest = fh.read()
buildspec = BuildSpec(manifest)
buildspec = BuildSpec(manifest, args.version)
builder = giftwrap.builder.create_builder(buildspec)
builder.build()
except Exception as e:
@ -64,6 +64,7 @@ def main():
build_subcmd = subparsers.add_parser('build',
description='build giftwrap packages')
build_subcmd.add_argument('-m', '--manifest', required=True)
build_subcmd.add_argument('-v', '--version')
build_subcmd.set_defaults(func=build)
args = parser.parse_args()