diff --git a/doc/configuration.rst b/doc/configuration.rst index e0057a8b..573404f1 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -1220,6 +1220,9 @@ repository with a new commit. deliverable is not release blocking. * ``update_summary`` -- (*bool*) Update summary metadata after tree composing. 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. If this option is set to ``!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN``, a value will be generated automatically as ``$VERSION.$RELEASE``. diff --git a/pungi/checks.py b/pungi/checks.py index 9fc40b81..9db1c92c 100644 --- a/pungi/checks.py +++ b/pungi/checks.py @@ -884,6 +884,7 @@ def make_schema(): "arches": {"$ref": "#/definitions/list_of_strings"}, "failable": {"$ref": "#/definitions/list_of_strings"}, "update_summary": {"type": "boolean"}, + "force_new_commit": {"type": "boolean"}, "version": {"type": "string"}, "config_branch": {"type": "string"}, "tag_ref": {"type": "boolean"}, diff --git a/pungi/ostree/tree.py b/pungi/ostree/tree.py index 45978a71..64e34463 100644 --- a/pungi/ostree/tree.py +++ b/pungi/ostree/tree.py @@ -33,6 +33,10 @@ class Tree(OSTree): if self.version: # Add versioning metadata 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) 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.extra_config = self.args.extra_config 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: