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

This reverts commit df0c12d. It's no longer needed since the format of the gpgkey in fedora-repos was updated. coreos/fedora-coreos-tracker#925
HuijingHei · Oct 10, 2023 · 23d0086 · 23d0086
1 parent c8c6f14
commit 23d0086
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 39 deletions.
diff --git a/kola-denylist.yaml b/kola-denylist.yaml
@@ -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

diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
@@ -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.

diff --git a/tests/kola/yum-repos/test.sh b/tests/kola/yum-repos/test.sh