almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

ostree: Add force_new_commit option

Browse Source 
Followup from discussion in: https://pagure.io/pungi/issue/811

It's likely now that for Fedora Atomic Host we'll use this, to work
around other issues, after we fix the FAW change detection.

Signed-off-by: Colin Walters <walters@verbum.org>
This commit is contained in:
Colin Walters 2017-12-05 05:51:43 -05:00 committed by Ondrej Nosek
parent 5cc54cd587
commit 161b7f974b
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/configuration.rst
View File

@ -1220,6 +1220,9 @@ repository with a new commit.
deliverable is not release blocking. deliverable is not release blocking.
* ``update_summary`` -- (*bool*) Update summary metadata after tree composing. * ``update_summary`` -- (*bool*) Update summary metadata after tree composing.
Defaults to ``False``. Defaults to ``False``.
* ``force_new_commit`` -- (*bool*) Do not use rpm-ostree's built in change
detection.
Defaults to ``False``.
* ``version`` -- (*str*) Version string to be added as versioning metadata. * ``version`` -- (*str*) Version string to be added as versioning metadata.
If this option is set to ``!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN``, If this option is set to ``!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN``,
a value will be generated automatically as ``$VERSION.$RELEASE``. a value will be generated automatically as ``$VERSION.$RELEASE``.

1
pungi/checks.py
View File

@ -884,6 +884,7 @@ def make_schema():
"arches": {"$ref": "#/definitions/list_of_strings"}, "arches": {"$ref": "#/definitions/list_of_strings"},
"failable": {"$ref": "#/definitions/list_of_strings"}, "failable": {"$ref": "#/definitions/list_of_strings"},
"update_summary": {"type": "boolean"}, "update_summary": {"type": "boolean"},
"force_new_commit": {"type": "boolean"},
"version": {"type": "string"}, "version": {"type": "string"},
"config_branch": {"type": "string"}, "config_branch": {"type": "string"},
"tag_ref": {"type": "boolean"}, "tag_ref": {"type": "boolean"},

5
pungi/ostree/tree.py
View File

@ -33,6 +33,10 @@ class Tree(OSTree):
if self.version: if self.version:
# Add versioning metadata # Add versioning metadata
cmd.append('--add-metadata-string=version=%s' % self.version) cmd.append('--add-metadata-string=version=%s' % self.version)
# Note renamed from rpm-ostree --force-nocache since it's a better
# name; more clearly describes what we're doing here.
if self.force_new_commit:
cmd.append('--force-nocache')
cmd.append(self.treefile) cmd.append(self.treefile)
shortcuts.run(cmd, show_cmd=True, stdout=True, logfile=log_file) shortcuts.run(cmd, show_cmd=True, stdout=True, logfile=log_file)
@ -84,6 +88,7 @@ class Tree(OSTree):
self.update_summary = self.args.update_summary self.update_summary = self.args.update_summary
self.extra_config = self.args.extra_config self.extra_config = self.args.extra_config
self.ostree_ref = self.args.ostree_ref self.ostree_ref = self.args.ostree_ref
self.force_new_commit = self.args.force_new_commit
if self.extra_config or self.ostree_ref: if self.extra_config or self.ostree_ref:
if self.extra_config: if self.extra_config: