From f0aec1e4873846307c5287947b595048f0ebeb68 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 11 Sep 2018 23:27:03 -0400 Subject: [PATCH] fedora.conf: force new ostree commits for AH/Silverblue This will ensure that the OSTrees get generated on each compose so that the media created will match the version numbers of the OSTree inside. The caveat is that there can be empty commits that do happen. Signed-off-by: Dusty Mabe (cherry picked from commit 0fca75d92a1a48bdbb766a4a61a27694a7ca5a6d) --- fedora-beta.conf | 2 ++ fedora.conf | 2 ++ 2 files changed, 4 insertions(+) diff --git a/fedora-beta.conf b/fedora-beta.conf index 7eb589e..6963580 100644 --- a/fedora-beta.conf +++ b/fedora-beta.conf @@ -750,6 +750,7 @@ live_images = [ ostree = { "^AtomicHost$": { "version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN', + "force_new_commit": True, "treefile": "fedora-atomic-host.json", "config_url": "https://pagure.io/fedora-atomic.git", "config_branch": "f29", @@ -762,6 +763,7 @@ ostree = { }, "^Silverblue$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "force_new_commit": True, "treefile": "fedora-atomic-workstation.json", "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f29", diff --git a/fedora.conf b/fedora.conf index 1edba84..c5cd180 100644 --- a/fedora.conf +++ b/fedora.conf @@ -750,6 +750,7 @@ live_images = [ ostree = { "^AtomicHost$": { "version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN', + "force_new_commit": True, "treefile": "fedora-atomic-host.json", "config_url": "https://pagure.io/fedora-atomic.git", "config_branch": "f29", @@ -762,6 +763,7 @@ ostree = { }, "^Silverblue$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "force_new_commit": True, "treefile": "fedora-atomic-workstation.json", "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f29",