From e077af2826150963d3748cbdbc3b22131cf645ed Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 2 May 2023 16:14:06 -0400 Subject: [PATCH] Initial changes for `experimental` branch with bootc This implements https://github.com/coreos/fedora-coreos-tracker/issues/1446 --- .coreos.skip-files | 4 ++++ fedora-copr-bootc.repo | 10 ++++++++++ image.yaml | 3 +++ manifest.yaml | 6 ++++-- manifests/bootc.yaml | 7 +++++++ 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 .coreos.skip-files create mode 100644 fedora-copr-bootc.repo create mode 100644 manifests/bootc.yaml diff --git a/.coreos.skip-files b/.coreos.skip-files new file mode 100644 index 0000000000..018a2fd0c6 --- /dev/null +++ b/.coreos.skip-files @@ -0,0 +1,4 @@ +# See https://github.com/coreos/fedora-coreos-releng-automation/pull/171 +# This suppresses config-bot removing these files +manifests/bootc.yaml +fedora-copr-bootc.repo diff --git a/fedora-copr-bootc.repo b/fedora-copr-bootc.repo new file mode 100644 index 0000000000..fa967d5f7d --- /dev/null +++ b/fedora-copr-bootc.repo @@ -0,0 +1,10 @@ +[bootc-fedora] +name=Copr repo for bootc owned by rhcontainerbot +baseurl=https://download.copr.fedorainfracloud.org/results/rhcontainerbot/bootc/fedora-$releasever-$basearch/ +type=rpm-md +skip_if_unavailable=True +gpgcheck=1 +gpgkey=https://download.copr.fedorainfracloud.org/results/rhcontainerbot/bootc/pubkey.gpg +repo_gpgcheck=0 +enabled=1 +enabled_metadata=1 diff --git a/image.yaml b/image.yaml index 1bf800cca2..9232563b87 100644 --- a/image.yaml +++ b/image.yaml @@ -2,3 +2,6 @@ # similarly to manifest.yaml. Unlike image-base.yaml, which is shared by all # streams. include: image-base.yaml + +deploy-via-container: true +container-imgref: ostree-remote-registry:fedora:quay.io/fedora/fedora-coreos:experimental diff --git a/manifest.yaml b/manifest.yaml index c3f59ab5dd..a3c2f22b00 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -1,5 +1,5 @@ variables: - stream: testing-devel + stream: experimental prod: false releasever: 38 @@ -12,4 +12,6 @@ repos: - fedora - fedora-updates -include: manifests/fedora-coreos.yaml +include: + - manifests/fedora-coreos.yaml + - manifests/bootc.yaml diff --git a/manifests/bootc.yaml b/manifests/bootc.yaml new file mode 100644 index 0000000000..aaa20acc3a --- /dev/null +++ b/manifests/bootc.yaml @@ -0,0 +1,7 @@ +# This implements https://github.com/coreos/fedora-coreos-tracker/issues/1446 + +repos: + - bootc-fedora + +packages: + - bootc