packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ostbuild: Make partial builds work 

If we have component-revisions in our source+binary snapshot, then
we can skip them.
This commit is contained in:
Colin Walters 2012-05-11 18:22:28 -04:00
parent 5d0744ea29
commit eae69513a7
1 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/ostbuild/pyostbuild/builtin_build_components.py
View File

@ -183,28 +183,34 @@ class OstbuildBuildComponents(builtins.Builtin):
for target in bin_snapshot['targets']: for target in bin_snapshot['targets']:
base = target['base'] base = target['base']
base_name = 'bases/%s' % (base['name'], ) base_name = 'bases/%s' % (base['name'], )
base_revision = run_sync_get_output(['ostree', '--repo=' + self.repo, if 'ostree-revision' not in target:
'rev-parse', base_name]) base_revision = run_sync_get_output(['ostree', '--repo=' + self.repo,
base['ostree-revision'] = base_revision 'rev-parse', base_name])
base['ostree-revision'] = base_revision
if 'architecture-buildroots2' in bin_snapshot: if 'architecture-buildroots2' in bin_snapshot:
for arch,buildroot in bin_snapshot['architecture-buildroots2'].iteritems(): for arch,buildroot in bin_snapshot['architecture-buildroots2'].iteritems():
name = buildroot['name'] name = buildroot['name']
rev = run_sync_get_output(['ostree', '--repo=' + self.repo, if 'ostree-revision' not in buildroot:
'rev-parse', name]) rev = run_sync_get_output(['ostree', '--repo=' + self.repo,
buildroot['ostree-revision'] = rev 'rev-parse', name])
buildroot['ostree-revision'] = rev
component_refs = [] component_revisions = bin_snapshot.get('component-revisions', {})
component_refs_to_resolve = []
for name in components.iterkeys(): for name in components.iterkeys():
for architecture in component_architectures[name]:
component_refs.append('components/%s/%s' % (name, architecture))
component_revisions = {}
resolved_refs = self._resolve_refs(component_refs)
for name,rev in zip(components.iterkeys(), resolved_refs):
for architecture in component_architectures[name]: for architecture in component_architectures[name]:
archname = '%s/%s' % (name, architecture) archname = '%s/%s' % (name, architecture)
component_revisions[archname] = rev if archname not in component_revisions:
component_refs_to_resolve.append('components/' + archname)
if len(component_refs_to_resolve) > 0:
resolved_refs = self._resolve_refs(component_refs_to_resolve)
for name,rev in zip(components.iterkeys(), resolved_refs):
for architecture in component_architectures[name]:
archname = '%s/%s' % (name, architecture)
component_revisions[archname] = rev
bin_snapshot['component-revisions'] = component_revisions bin_snapshot['component-revisions'] = component_revisions
@ -224,13 +230,23 @@ class OstbuildBuildComponents(builtins.Builtin):
parser.add_argument('--debug-shell', action='store_true') parser.add_argument('--debug-shell', action='store_true')
parser.add_argument('components', nargs='*') parser.add_argument('components', nargs='*')
args = parser.parse_args(argv) args = parser.parse_args(argv)
self.args = args self.args = args
self.parse_config() self.parse_config()
self.parse_snapshot(args.prefix, args.src_snapshot) self.parse_snapshot(args.prefix, args.src_snapshot)
log("Using source snapshot: %s" % (os.path.basename(self.snapshot_path), )) component_revisions = self.snapshot.get('component-revisions', {})
if component_revisions is not None:
snapshot_type = "source+binary"
else:
snapshot_type = "source"
log("Using %s snapshot: %s" % (snapshot_type,
os.path.basename(self.snapshot_path), ))
self.buildopts = BuildOptions() self.buildopts = BuildOptions()
self.buildopts.shell_on_failure = args.shell_on_failure self.buildopts.shell_on_failure = args.shell_on_failure
@ -277,12 +293,26 @@ class OstbuildBuildComponents(builtins.Builtin):
else: else:
start_at_index = 0 start_at_index = 0
components_to_build = []
component_skipped_count = 0
if not args.compose_only: if not args.compose_only:
for component_name in build_component_order[start_at_index:]: for component_name in build_component_order[start_at_index:]:
component = required_components[component_name] component = required_components[component_name]
architectures = component_architectures[component_name] architectures = component_architectures[component_name]
for architecture in architectures: for architecture in architectures:
self._build_one_component(component_name, component, architecture) archname = '%s/%s' % (component_name, architecture)
if (component_revisions is not None and
archname in component_revisions):
component_skipped_count += 1
else:
components_to_build.append((component_name, component, architecture))
log("%d components to build" % (len(components_to_build), ))
if component_skipped_count > 0:
log("%d components skipped due to existing component-revisions" % (component_skipped_count, ))
for (component_name, component, architecture) in components_to_build:
self._build_one_component(component_name, component, architecture)
self._save_bin_snapshot(required_components, component_architectures) self._save_bin_snapshot(required_components, component_architectures)