From 2bc4b89014e2e0ced6ad88da60a8047d8995cdbc Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Wed, 14 Jul 2021 10:15:21 -0400
Subject: [PATCH] manifests: move fedora-coreos-pool to fedora-coreos.yaml

This is common to all streams, so we can move it here. I had initially
kept it in `manifest.yaml` because of:

https://github.com/coreos/fedora-coreos-config/pull/355#issuecomment-620860762
---
 manifest.yaml                | 6 ------
 manifests/fedora-coreos.yaml | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/manifest.yaml b/manifest.yaml
index 213cb88408..2acf1e4979 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -16,12 +16,6 @@ repos:
   - fedora
   - fedora-updates
 
-# 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
 
diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
index 3da75faf8f..726e0af407 100644
--- a/manifests/fedora-coreos.yaml
+++ b/manifests/fedora-coreos.yaml
@@ -7,6 +7,10 @@ include: fedora-coreos-base.yaml
 automatic-version-prefix: "${releasever}.<date:%Y%m%d>.dev"
 mutate-os-release: "${releasever}"
 
+# All Fedora CoreOS streams share the same pool for locked files.
+lockfile-repos:
+  - fedora-coreos-pool
+
 packages:
   - fedora-release-coreos
   - fedora-repos-ostree