[gentoo-commits] proj/qa-scripts:master commit in: /

[John Helmert III]

commit:     d76a48bc11b24d1a2a3ffd41c901f3881f48b624
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 03:38:16 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 03:38:16 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=d76a48bc

create-dev-keyrings: also export infra service keys

Needed for glsamaker.

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 create-dev-keyrings.bash | 3 +++
 keyrings.inc.bash        | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/create-dev-keyrings.bash b/create-dev-keyrings.bash
index d0ea12a..94af82a 100755
--- a/create-dev-keyrings.bash
+++ b/create-dev-keyrings.bash
@@ -18,6 +18,9 @@ grab_keys "${SYSTEM_KEYS[@]}"
 export_keys "${OUTPUT_DIR}"/service-keys.gpg \
        "${SYSTEM_KEYS[@]}"
 
+grab_keys "${INFRA_SYSTEM_KEYS[@]}"
+export_keys "${OUTPUT_DIR}"/infra-service-keys.gpg
+
 grab_keys "${COMMITTING_DEVS[@]}"
 export_keys "${OUTPUT_DIR}"/committing-devs.gpg \
        "${COMMITTING_DEVS[@]}"

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index 661dd36..9c2a23b 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -7,6 +7,7 @@ 
COMMIT_RULE='(&(gentooAccess=git.gentoo.org/repo/gentoo.git)(gentooStatus=active
 
NONCOMMIT_RULE='(&(!(gentooAccess=git.gentoo.org/repo/gentoo.git))(gentooStatus=active))'
 RETIRED_RULE='(!(gentooStatus=active))'
 INFRA_RULE='(&(gentooAccess=infra.group)(gentooStatus=active))'
+INFRA_SYSTEM_RULE='(&(gentooAccess=infra-system.group)(gentooStatus=active))'
 
 export KS_GENTOO=hkps://keys.gentoo.org/
 # Use local keyserver for speedup
@@ -134,4 +135,5 @@ export_ldap_data_to_env() {
        export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${RETIRED_RULE}") )
        export -a INFRA_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${INFRA_RULE}") )
        export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" 
"${NONCOMMIT_RULE}") )
+       export -a INFRA_SYSTEM_KEYS=( $(grab_ldap_fingerprints -b 
"${SYSTEM_BASE}" "${INFRA_SYSTEM_RULE}") )
 }