configs: Rawhide to accept GPG key from future Fedora Rawhide+1

Fixes: rpm-software-management#1338
praiskup · Mar 3, 2024 · 3de8828 · 3de8828
1 parent fc1f7d4
commit 3de8828
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/mock-core-configs/etc/mock/templates/fedora-rawhide.tpl b/mock-core-configs/etc/mock/templates/fedora-rawhide.tpl
@@ -42,7 +42,7 @@ user_agent={{ user_agent }}
 
 {%- macro rawhide_gpg_keys() -%}
 file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
-{%- for version in [releasever|int, releasever|int - 1]
+{%- for version in [releasever|int, releasever|int - 1, releasever|int + 1]
 %} file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-{{ version }}-primary
 {%- endfor %}
 {%- endmacro %}

diff --git a/mock-core-configs/mock-core-configs.spec b/mock-core-configs/mock-core-configs.spec
@@ -22,7 +22,7 @@ BuildArch:  noarch
 Provides: mock-configs
 
 # distribution-gpg-keys contains GPG keys used by mock configs
-Requires:   distribution-gpg-keys >= 1.98
+Requires:   distribution-gpg-keys >= 1.101
 # specify minimal compatible version of mock
 Requires:   mock >= 5.4.post1
 Requires:   mock-filesystem

diff --git a/releng/rawhide-branching.sh b/releng/rawhide-branching.sh
@@ -17,6 +17,20 @@ for config in fedora-??-x86_64.cfg; do
     next_version=$(( version + 1 ))
 done
 
+rawhide_plus_one_version=$(( next_version + 1 ))
+next_gpg=/usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$rawhide_plus_one_version-primary
+test -e "$next_gpg" || {
+    cat >&2 <<EOF
+File $next_gpg not found!
+
+The new Fedora Rawhide ($next_version) requires a GPG key for Fedora $rawhide_plus_one_version,
+which must be generated by Fedora Infrastructure team and shipped in the
+distribution-gpg-keys.rpm package.  This either has not happened yet, the
+package is outdated, or it is not even installed on this box.
+EOF
+    exit 1
+}
+
 architectures=()
 for config in fedora-"$version"-*.cfg; do
     architecture=$(echo "$config" | sed -e "s/fedora-$version-//" -e "s/.cfg//")

diff --git a/releng/release-notes-next/fedora-rawhide-key-plus-one.config b/releng/release-notes-next/fedora-rawhide-key-plus-one.config
@@ -0,0 +1,4 @@
+Fedora Rawhide configurations, such as releasever=41 now, accept GPG keys from
+Fedora releasever+1 (for example, 42, not yet used for RPM signatures).  This
+change is implemented to address the typically short and unnecessary
+inconvenience during [the Fedora branching process][issue#1338] in the future.