Move keyring configuration in tests out of root's ~/.rpmmacros

Keyring type is not something that would be user-specific in a real
world scenario anyhow.

The third step to fixing rpm-software-management#3521

tests/rpmdb.at

@@ -133,8 +133,7 @@ AT_KEYWORDS([rpmdb query])
 AT_SKIP_IF([test x$PGP = xdummy])
 RPMDB_INIT
 
-# root's .rpmmacros used to keep this build prefix independent
-echo "%_keyring rpmdb" >> "${RPMTEST}"/root/.rpmmacros
+echo "%_keyring rpmdb" >> "${RPMTEST}"/"${RPMSYSCONFDIR}"/macros.keyring
 
 RPMTEST_CHECK([
 runroot rpm -U --nodeps --ignorearch --ignoreos --nosignature \

tests/rpmsigdig.at

@@ -63,8 +63,7 @@ AT_SETUP([rpmkeys key update and delete (rpmdb)])
 AT_KEYWORDS([rpmkeys signature])
 RPMDB_INIT
 # currently the default but make it explicit
-# root's .rpmmacros used to keep this build prefix independent
-echo "%_keyring rpmdb" >> "${RPMTEST}"/root/.rpmmacros
+echo "%_keyring rpmdb" >> "${RPMTEST}"/"${RPMSYSCONFDIR}"/macros.keyring
 RPMTEST_CHECK([
 runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
 runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm
@@ -164,8 +163,7 @@ RPMTEST_CLEANUP
 AT_SETUP([rpmkeys migrate from keyid to fingerprint (fs)])
 AT_KEYWORDS([rpmkeys rpmdb])
 RPMDB_INIT
-# root's .rpmmacros used to keep this build prefix independent
-echo "%_keyring fs" >> "${RPMTEST}"/root/.rpmmacros
+echo "%_keyring fs" >> "${RPMTEST}"/"${RPMSYSCONFDIR}"/macros.keyring
 krpath="$(rpm --eval %{_keyringpath})"
 
 RPMTEST_CHECK([
@@ -199,8 +197,7 @@ RPMTEST_CLEANUP
 AT_SETUP([rpmkeys key update (fs)])
 AT_KEYWORDS([rpmkeys signature])
 RPMDB_INIT
-# root's .rpmmacros used to keep this build prefix independent
-echo "%_keyring fs" >> "${RPMTEST}"/root/.rpmmacros
+echo "%_keyring fs" >> "${RPMTEST}"/"${RPMSYSCONFDIR}"/macros.keyring
 RPMTEST_CHECK([
 runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
 runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm
@@ -278,8 +275,7 @@ RPMTEST_CLEANUP
 AT_SETUP([rpmkeys key update (openpgp)])
 AT_KEYWORDS([rpmkeys signature])
 RPMDB_INIT
-# root's .rpmmacros used to keep this build prefix independent
-echo "%_keyring openpgp" >> "${RPMTEST}"/root/.rpmmacros
+echo "%_keyring openpgp" >> "${RPMTEST}"/"${RPMSYSCONFDIR}"/macros.keyring
 krpath=$(rpm --eval "%{_keyringpath}")
 
 RPMTEST_CHECK([