Skip to content

Commit

Permalink
manifests: fedora-coreos: add archive repo to FCOS
Browse files Browse the repository at this point in the history
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 coreos/rpm-ostree#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: coreos/fedora-coreos-tracker#400
  • Loading branch information
dustymabe committed Oct 7, 2020
1 parent 8ec872e commit 4f86aa3
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 3 deletions.
10 changes: 10 additions & 0 deletions manifest-lock.overrides.aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 10 additions & 0 deletions manifest-lock.overrides.ppc64le.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 10 additions & 0 deletions manifest-lock.overrides.s390x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 10 additions & 0 deletions manifest-lock.overrides.x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 6 additions & 3 deletions manifest-lock.x86_64.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions manifests/fedora-coreos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4f86aa3

Please sign in to comment.