atomic-desktops/ci-test
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
ci-test/fedora-common-ostree.yaml

111 lines
3 KiB
YAML
Raw Normal View History

Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 16:38:45 +00:00
ref: fedora/rawhide/${basearch}/ostree-base
Rawhide is now Fedora 39
2023-02-10 14:21:28 +00:00
automatic_version_prefix: "39"
mutate-os-release: "39"
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 16:38:45 +00:00
include: fedora-common-ostree-pkgs.yaml
Add bootupd integration This does what we should have done originally, and copies the bootupd bits directly from https://github.com/coreos/fedora-coreos-config/blob/testing-devel/manifests/bootupd.yaml And uses them via includes.
2022-10-14 17:45:40 +00:00
# See https://github.com/coreos/bootupd
Disable bootupd integration until we use unified core The bootupd code relies on having `/usr/lib/ostree-boot`, which we only get in unified core mode.
2022-11-01 13:41:58 +00:00
# TODO: Disabled until we use use unified-core or native container flow
# for the main build
# arch-include:
# x86_64: bootupd.yaml
# aarch64: bootupd.yaml
Add bootupd integration This does what we should have done originally, and copies the bootupd bits directly from https://github.com/coreos/fedora-coreos-config/blob/testing-devel/manifests/bootupd.yaml And uses them via includes.
2022-10-14 17:45:40 +00:00
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 16:38:45 +00:00
packages:
common: Add git-core-doc Do not include "full" Git as it brings in Perl. Explicitely add Git docs. Fixes: https://github.com/fedora-silverblue/issue-tracker/issues/387
2022-11-22 11:48:41 +00:00
# Do not include "full" Git as it brings in Perl
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 16:38:45 +00:00
- git-core
common: Add git-core-doc Do not include "full" Git as it brings in Perl. Explicitely add Git docs. Fixes: https://github.com/fedora-silverblue/issue-tracker/issues/387
2022-11-22 11:48:41 +00:00
# Explicitely add Git docs
- git-core-doc
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 16:38:45 +00:00
- lvm2
- rpm-ostree
Update comments about package inclusion
2023-01-20 15:26:00 +00:00
# Required for compatibility with old bootloaders until we have bootupd
# See https://github.com/fedora-silverblue/issue-tracker/issues/120
Drop some now-unneeded manual handling of arch-specific packages This lets the recently-merged improved arch-specific package support handle all the arch-specific packages which were previously excluded in `comps-sync-exclude-list.yml` and listed manually in `fedora-common-ostree.yaml`. As the diff shows, the sync script now correctly includes the same packages for the same arches in `fedora-common-ostree-pkgs.yaml`, plus a few appropriate additions of things that should be there but had been left out, on ppc64le and aarch64. We also drop the `packages-armhfp` and `packages-ppc64` lists, as we no longer build for either of those arches. This allows us to move `ostree-grub2` into the non-arch-specific list, since it's no longer left out on any arch we care about. Signed-off-by: Adam Williamson <awilliam@redhat.com>
2022-11-02 20:34:35 +00:00
- ostree-grub2
Add some minor comments
2019-04-06 17:04:22 +00:00
# Container management
- buildah
- podman
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 16:38:45 +00:00
- skopeo
- toolbox
fedora-common-ostree: Add ncurses Provides terminal tools like clear, reset, tput, and tset Fixes: https://github.com/fedora-silverblue/issue-tracker/issues/253
2022-04-20 11:29:34 +00:00
# Provides terminal tools like clear, reset, tput, and tset
- ncurses
Add some minor comments
2019-04-06 17:04:22 +00:00
# Flatpak support
- flatpak
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 16:38:45 +00:00
- xdg-desktop-portal
Move packages needed for all variants to common manifest
2019-04-06 17:01:56 +00:00
# HFS filesystem tools for Apple hardware
# See https://github.com/projectatomic/rpm-ostree/issues/1380
- hfsplus-tools
# Contains default ostree remote config to be used on client's
# system for fetching ostree update
- fedora-repos-ostree
fedora-common-ostree: add archive repo to Silverblue This is the culmination of a lot of work to make package layering more reliable. This archive repo provides all packages that have ever been in the updates repository, which means there should always be a solution that will depsolve given the existing set of base layer packages. Pairing this along with https://github.com/coreos/rpm-ostree/pull/2125 means that we should finally see less of the split base layer vs update repo problem and see less `Forbidden base package replacements` errors. For context see https://github.com/coreos/fedora-coreos-tracker/issues/400
2020-11-30 16:33:13 +00:00
# the archive repo for more reliable package layering
# https://github.com/coreos/fedora-coreos-tracker/issues/400
- fedora-repos-archive
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 16:38:45 +00:00
selinux: true
documentation: true
fedora-common-ostree: Switch to modules for boot-location Fixes the following warning: warning: boot-location: "new" is deprecated, use boot-location: modules From the rpm-ostree docs (https://coreos.github.io/rpm-ostree/treefile/): - “new”: A misnomer, this value is no longer “new”. Kernel data goes in /usr/lib/ostree-boot in addition to /usr/lib/modules. This is the default; use it if you have a need to care about upgrading from very old versions of libostree. - “modules”: Kernel data goes just in /usr/lib/modules. Use this for new systems, and systems that don’t need to be upgraded from very old libostree versions.
2020-11-27 14:29:12 +00:00
boot-location: modules
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 16:38:45 +00:00
etc-group-members:
- wheel
tmp-is-dir: true
ignore-removed-users:
- root
ignore-removed-groups:
- root
fedora-common-ostree: Minor cosmetic fix
2021-10-11 11:06:47 +00:00
check-passwd:
type: file
filename: passwd
check-groups:
type: file
filename: group
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 16:38:45 +00:00
default_target: graphical.target
packages-aarch64:
- grub2-efi
- efibootmgr
- shim
packages-ppc64le:
- grub2
packages-x86_64:
Include shim and grub2 packages for 32-bit EFI firmware https://pagure.io/workstation-ostree-config/issue/217
2021-05-17 08:58:58 +00:00
- grub2-efi-ia32
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 16:38:45 +00:00
- grub2-efi-x64
Explicitly include grub2-pc instead of grub2 This makes the listing more explicit but shouldn't change the package set as grub2-pc provides grub2.
2021-05-17 09:21:32 +00:00
- grub2-pc
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 16:38:45 +00:00
- efibootmgr
Include shim and grub2 packages for 32-bit EFI firmware https://pagure.io/workstation-ostree-config/issue/217
2021-05-17 08:58:58 +00:00
- shim-ia32
- shim-x64
Exclude PackageKit Now that rpm-ostree supports exclude-packages in treefile, we can finally exclude PackageKit (it's Recommended by gnome-software, but nothing hard-requires it).
2020-02-12 15:21:13 +00:00
# Make sure the following are not pulled in when Recommended by other packages
exclude-packages:
- PackageKit
Make sure all openh264 packages are always excluded According to https://fedoraproject.org/wiki/OpenH264, we can not ship this in Silverblue.
2021-02-02 11:42:14 +00:00
# We can not include openh264. See https://fedoraproject.org/wiki/OpenH264
- gstreamer1-plugin-openh264
- mozilla-openh264
- openh264
fedora-common-ostree: Move post script inline This was difficult with the JSON based manifests but is now easy with the YAML ones.
2021-10-09 14:31:03 +00:00
postprocess:
- |
#!/usr/bin/env bash
set -xeuo pipefail
# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295
# From https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf
install -dm0755 /usr/lib/systemd/journald.conf.d/
echo -e "[Journal]\nStorage=persistent" > /usr/lib/systemd/journald.conf.d/10-persistent.conf
# See: https://src.fedoraproject.org/rpms/glibc/pull-request/4
# Basically that program handles deleting old shared library directories
# mid-transaction, which never applies to rpm-ostree. This is structured as a
# loop/glob to avoid hardcoding (or trying to match) the architecture.
for x in /usr/sbin/glibc_post_upgrade.*; do
if test -f ${x}; then
ln -srf /usr/bin/true ${x}
fi
done
fedora-common-ostree: Workaround for unified-core mode change Remove the `loader` directory that conflicts with the `loader` symlink that is installed by Anaconda. See: https://pagure.io/pungi-fedora/pull-request/1115 See: https://github.com/rhinstaller/anaconda/blob/fa42c8b4256b1d380181a775ea7b3766c98e0b2c/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py#L307
2023-02-10 19:43:22 +00:00
# Remove loader directory causing issues in Anaconda in unified core mode
# Will be obsolete once we start using bootupd
rm -rf /usr/lib/ostree-boot/loader
common: Move sysroot RO script to postprocess-script Bash Heredoc in inline YAML string is tricky. Use an independent post-process script instead. Fixes: 5bbc140 Revert "Revert "common: Add readonly sysroot migration unit and script""
2022-08-19 18:16:55 +00:00
postprocess-script: "postprocess.sh"
Reference in a new issue Copy permalink