Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tweak versioning and set up Zincati & pinger enablement #112

Merged
merged 4 commits into from
Jul 12, 2019
Merged

Tweak versioning and set up Zincati & pinger enablement #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00f1fdb
base: Tweak versioning to conform to new spec
jlebon Jul 10, 2019
44dcadc
base: add .dev marker by default
jlebon Jul 10, 2019
8bae3e3
base: disable Zincati and pinger on non-release builds
jlebon Jul 10, 2019
43d060a
manifest: disable Zincati and pinger on testing-devel
jlebon Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 14 additions & 2 deletions fedora-coreos-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ initramfs-args:
machineid-compat: false

releasever: "30"
automatic-version-prefix: "30"
mutate-os-release: "30"
automatic-version-prefix: "${releasever}.<date:%Y%m%d>.dev"
mutate-os-release: "${releasever}"

# Be minimal
recommends: false

Expand Down Expand Up @@ -122,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
Expand Down
10 changes: 10 additions & 0 deletions manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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