Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "manifests: workaround F37 GPG key issue for rawhide" #1172

Merged
merged 1 commit into from
Aug 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions kola-denylist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
snooze: 2021-09-01
platforms:
- openstack
- pattern: ext.config.yum-repos
tracker: https://github.com/coreos/fedora-coreos-tracker/issues/925
snooze: 2021-09-01
- pattern: ext.config.toolbox
tracker: https://github.com/coreos/fedora-coreos-tracker/issues/926
stream: rawhide
Expand Down
11 changes: 0 additions & 11 deletions manifests/fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,6 @@ postprocess:
echo 'DEFAULT_HOSTNAME=localhost' >> /usr/lib/os-release
fi


# Workaround issue in rawhide parsing the F37 GPG key
# by removing it from the list of gpgkeys to load.
# https://github.com/coreos/fedora-coreos-tracker/issues/925
- |
#!/usr/bin/env bash
set -xeuo pipefail
source /etc/os-release
[ ${VERSION_ID} -eq 36 ] || exit 0
sed -i 's|gpgkey=.*$|gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch|' /etc/yum.repos.d/fedora-rawhide.repo

# Packages listed here should be specific to Fedore CoreOS (as in not yet
# available in RHCOS or not desired in RHCOS). All other packages should go
# into one of the sub-manifests listed at the top.
Expand Down
25 changes: 0 additions & 25 deletions tests/kola/yum-repos/test.sh

This file was deleted.