From 00f1fdbd21adda110cca2a744bf53d8a9aac131e Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 10 Jul 2019 11:14:32 -0400 Subject: [PATCH 1/4] base: Tweak versioning to conform to new spec In https://github.com/coreos/fedora-coreos-tracker/issues/81, we agreed on a versioning scheme for releases. This patch changes `automatic-version-prefix` to respect this. Note that it's not a perfect fit, since e.g. the first build doesn't have a `.0` prefix. In actuality, versioning in the pipeline will be driven by an external process, and thus the scheme embedded here will have no effect (unless we decide to use rpm-ostree itself as part of the external process... though it'll need some tweaking first). So really, this is more for the benefit of local developers so that versioning looks similar to release builds. --- fedora-coreos-base.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fedora-coreos-base.yaml b/fedora-coreos-base.yaml index b96e34b2fd..a79df379ba 100644 --- a/fedora-coreos-base.yaml +++ b/fedora-coreos-base.yaml @@ -22,8 +22,9 @@ initramfs-args: machineid-compat: false releasever: "30" -automatic-version-prefix: "30" -mutate-os-release: "30" +automatic-version-prefix: "${releasever}." +mutate-os-release: "${releasever}" + # Be minimal recommends: false From 44dcadc8407797258fb8056686107d30932d7d66 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 10 Jul 2019 11:18:17 -0400 Subject: [PATCH 2/4] base: add .dev marker by default We want to be able to distinguish between release and non-release builds. To do this, we embed a `.dev` marker in the version string so that the default developer workflow will use this. As mentioned in the previous commit message, this will be overridden for release streams. See https://github.com/coreos/fedora-coreos-tracker/issues/212 for more information about this. --- fedora-coreos-base.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-coreos-base.yaml b/fedora-coreos-base.yaml index a79df379ba..45f3cb7f69 100644 --- a/fedora-coreos-base.yaml +++ b/fedora-coreos-base.yaml @@ -22,7 +22,7 @@ initramfs-args: machineid-compat: false releasever: "30" -automatic-version-prefix: "${releasever}." +automatic-version-prefix: "${releasever}..dev" mutate-os-release: "${releasever}" # Be minimal From 8bae3e31cd535ac703cf30cc99768b33e9aba974 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 10 Jul 2019 11:20:28 -0400 Subject: [PATCH 3/4] base: disable Zincati and pinger on non-release builds On non-release/local developer builds, we don't want Zincati or pinger to be active by default. Key off of the OSTree version and add a config dropin to do this. See discussions about this in: https://github.com/coreos/fedora-coreos-tracker/issues/212 --- fedora-coreos-base.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fedora-coreos-base.yaml b/fedora-coreos-base.yaml index 45f3cb7f69..1d6e87141d 100644 --- a/fedora-coreos-base.yaml +++ b/fedora-coreos-base.yaml @@ -123,6 +123,17 @@ postprocess: set -xeuo pipefail rm -rf /etc/systemd/system/* systemctl preset-all + # Disable Zincati and fedora-coreos-pinger on non-release builds + # https://github.com/coreos/fedora-coreos-tracker/issues/212 + - | + #!/usr/bin/env bash + set -xeuo pipefail + source /etc/os-release + if [[ $OSTREE_VERSION = *.dev* ]]; then + mkdir -p /etc/fedora-coreos-pinger/config.d /etc/zincati/config.d + echo -e '# https://github.com/coreos/fedora-coreos-tracker/issues/212\nreporting.enabled = false' > /etc/fedora-coreos-pinger/config.d/95-disable-on-dev.toml + echo -e '# https://github.com/coreos/fedora-coreos-tracker/issues/212\nupdates.enabled = false' > /etc/zincati/config.d/95-disable-on-dev.toml + fi packages: # Security From 43d060ac5ac7f9f94170abf524bca077b609898b Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 10 Jul 2019 11:21:51 -0400 Subject: [PATCH 4/4] manifest: disable Zincati and pinger on testing-devel By default, we don't enable Zincati and pinger on testing-devel. See discussions in: https://github.com/coreos/fedora-coreos-tracker/issues/163 --- manifest.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/manifest.yaml b/manifest.yaml index 314bddc037..0337ae64a2 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -8,3 +8,13 @@ repos: add-commit-metadata: fedora-coreos.stream: testing-devel + +postprocess: + # Disable Zincati and fedora-coreos-pinger on non-production streams + # https://github.com/coreos/fedora-coreos-tracker/issues/163 + - | + #!/usr/bin/env bash + set -xeuo pipefail + mkdir -p /etc/fedora-coreos-pinger/config.d /etc/zincati/config.d + echo -e '# https://github.com/coreos/fedora-coreos-tracker/issues/163\nreporting.enabled = false' > /etc/fedora-coreos-pinger/config.d/90-disable-on-non-production-stream.toml + echo -e '# https://github.com/coreos/fedora-coreos-tracker/issues/163\nupdates.enabled = false' > /etc/zincati/config.d/90-disable-on-non-production-stream.toml