From 4f86aa3df617020a38a1ced1a49c6eb458e88f81 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Wed, 7 Oct 2020 15:48:50 -0400
Subject: [PATCH] manifests: fedora-coreos: add archive repo to FCOS

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.

Fixes: https://github.com/coreos/fedora-coreos-tracker/issues/400
---
 manifest-lock.overrides.aarch64.yaml | 10 ++++++++++
 manifest-lock.overrides.ppc64le.yaml | 10 ++++++++++
 manifest-lock.overrides.s390x.yaml   | 10 ++++++++++
 manifest-lock.overrides.x86_64.yaml  | 10 ++++++++++
 manifest-lock.x86_64.json            |  9 ++++++---
 manifests/fedora-coreos.yaml         |  3 +++
 6 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/manifest-lock.overrides.aarch64.yaml b/manifest-lock.overrides.aarch64.yaml
index 64640f31f9..be6332599d 100644
--- a/manifest-lock.overrides.aarch64.yaml
+++ b/manifest-lock.overrides.aarch64.yaml
@@ -22,3 +22,13 @@ packages:
     evra: 0.20.1-1.fc32.noarch
   console-login-helper-messages-profile:
     evra: 0.20.1-1.fc32.noarch
+  # Fast-track fedora-repos-32-7 to get archive repo
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-ab02250f9d
+  fedora-repos:
+    evra: 32-7.noarch
+  fedora-repos-ostree:
+    evra: 32-7.noarch
+  fedora-repos-archive:
+    evra: 32-7.noarch
+  fedora-gpg-keys:
+    evra: 32-7.noarch
diff --git a/manifest-lock.overrides.ppc64le.yaml b/manifest-lock.overrides.ppc64le.yaml
index 6d43275a8c..e501817aca 100644
--- a/manifest-lock.overrides.ppc64le.yaml
+++ b/manifest-lock.overrides.ppc64le.yaml
@@ -22,3 +22,13 @@ packages:
     evra: 0.20.1-1.fc32.noarch
   console-login-helper-messages-profile:
     evra: 0.20.1-1.fc32.noarch
+  # Fast-track fedora-repos-32-7 to get archive repo
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-ab02250f9d
+  fedora-repos:
+    evra: 32-7.noarch
+  fedora-repos-ostree:
+    evra: 32-7.noarch
+  fedora-repos-archive:
+    evra: 32-7.noarch
+  fedora-gpg-keys:
+    evra: 32-7.noarch
diff --git a/manifest-lock.overrides.s390x.yaml b/manifest-lock.overrides.s390x.yaml
index 12764442c9..c5fcca72b8 100644
--- a/manifest-lock.overrides.s390x.yaml
+++ b/manifest-lock.overrides.s390x.yaml
@@ -22,3 +22,13 @@ packages:
     evra: 0.20.1-1.fc32.noarch
   console-login-helper-messages-profile:
     evra: 0.20.1-1.fc32.noarch
+  # Fast-track fedora-repos-32-7 to get archive repo
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-ab02250f9d
+  fedora-repos:
+    evra: 32-7.noarch
+  fedora-repos-ostree:
+    evra: 32-7.noarch
+  fedora-repos-archive:
+    evra: 32-7.noarch
+  fedora-gpg-keys:
+    evra: 32-7.noarch
diff --git a/manifest-lock.overrides.x86_64.yaml b/manifest-lock.overrides.x86_64.yaml
index 9282d5aff0..2b2ab41d2a 100644
--- a/manifest-lock.overrides.x86_64.yaml
+++ b/manifest-lock.overrides.x86_64.yaml
@@ -22,3 +22,13 @@ packages:
     evra: 0.20.1-1.fc32.noarch
   console-login-helper-messages-profile:
     evra: 0.20.1-1.fc32.noarch
+  # Fast-track fedora-repos-32-7 to get archive repo
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-ab02250f9d
+  fedora-repos:
+    evra: 32-7.noarch
+  fedora-repos-ostree:
+    evra: 32-7.noarch
+  fedora-repos-archive:
+    evra: 32-7.noarch
+  fedora-gpg-keys:
+    evra: 32-7.noarch
diff --git a/manifest-lock.x86_64.json b/manifest-lock.x86_64.json
index 75533d1126..4bafe65527 100644
--- a/manifest-lock.x86_64.json
+++ b/manifest-lock.x86_64.json
@@ -256,7 +256,7 @@
       "evra": "0.0.4-7.fc32.x86_64"
     },
     "fedora-gpg-keys": {
-      "evra": "32-6.noarch"
+      "evra": "32-7.noarch"
     },
     "fedora-release-common": {
       "evra": "32-3.noarch"
@@ -265,10 +265,13 @@
       "evra": "32-3.noarch"
     },
     "fedora-repos": {
-      "evra": "32-6.noarch"
+      "evra": "32-7.noarch"
+    },
+    "fedora-repos-archive": {
+      "evra": "32-7.noarch"
     },
     "fedora-repos-ostree": {
-      "evra": "32-6.noarch"
+      "evra": "32-7.noarch"
     },
     "file": {
       "evra": "5.38-2.fc32.x86_64"
diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
index 8e52fc5012..37cf250923 100644
--- a/manifests/fedora-coreos.yaml
+++ b/manifests/fedora-coreos.yaml
@@ -10,6 +10,9 @@ mutate-os-release: "${releasever}"
 packages:
   - fedora-release-coreos
   - fedora-repos-ostree
+  # the archive repo for more reliable package layering
+  # https://github.com/coreos/fedora-coreos-tracker/issues/400
+  - fedora-repos-archive
   # CL ships this.
   - moby-engine
   # User metrics