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.

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

[hold] Use new cosa build naming model #424

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions fedora-coreos.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
ref: fedora/${basearch}/coreos/testing-devel
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, this is a bit awkward, because there is also a manifests/fedora-coreos.yaml. Maybe let's rename that one to reduce confusion?

This will also require updating config-bot, which right now special-cases manifest.yaml (see https://github.com/coreos/fedora-coreos-config#about-this-repo).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I wonder if it'd be simpler to just make coreos/coreos-assembler#1474 use a name field in image.yaml instead? It's not strictly correct since e.g. the OSTree tarball has that name too, though it does seem cleaner to have it be more explicit and sitting alongside summary.

include: manifests/fedora-coreos.yaml

releasever: "31"

repos:
# these repos are there to make it easier to add new packages to the OS and to
# use `cosa fetch --update-lockfile`; but note that all package versions are
# still pinned
- fedora
- fedora-updates
- fedora-modular
- fedora-updates-modular

# All Fedora CoreOS streams share the same pool for locked files.
# This will be in fedora-coreos.yaml in the future so it can be more easily be
# shared between all the streams
lockfile-repos:
- fedora-coreos-pool

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
1 change: 1 addition & 0 deletions image.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# This replaces image.ks
summary: "Fedora CoreOS testing-devel"
# size is the target disk size in GB.
size: 8

Expand Down
37 changes: 0 additions & 37 deletions manifest.yaml

This file was deleted.

1 change: 1 addition & 0 deletions manifest.yaml