Skip to content

Commit

Permalink
Use new cosa build naming model
Browse files Browse the repository at this point in the history
coreos/coreos-assembler#1459 is
going to add support for more convenient multiple builds.

Here the `name` is derived simply from the name of the manifest file.
We use the summary for cloud uploads, so that moves to `image.yaml`.
  • Loading branch information
cgwalters committed May 22, 2020
1 parent 7510b1a commit 4a539b3
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 37 deletions.
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
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

0 comments on commit 4a539b3

Please sign in to comment.