diff options
| author |   John Helmert III <ajak@gentoo.org> | 2022-07-15 22:38:16 -0500 |
|---|---|---|
| committer | John Helmert III <ajak@gentoo.org> | 2022-07-15 22:38:16 -0500 |
| commit | d76a48bc11b24d1a2a3ffd41c901f3881f48b624 (patch) | |
| tree | eb3834d5e211f893c97ce5d5a030d4b614fba413 | |
| parent | keyrings-export.bash: use ${OUTPUT_DIR} (diff) | |
| download | qa-scripts-d76a48bc11b24d1a2a3ffd41c901f3881f48b624.tar.gz qa-scripts-d76a48bc11b24d1a2a3ffd41c901f3881f48b624.tar.bz2 qa-scripts-d76a48bc11b24d1a2a3ffd41c901f3881f48b624.zip | |
create-dev-keyrings: also export infra service keys
Needed for glsamaker.
Signed-off-by: John Helmert III <ajak@gentoo.org>
| -rwxr-xr-x | create-dev-keyrings.bash | 3 | ||||
| -rw-r--r-- | keyrings.inc.bash | 2 |
2 files changed, 5 insertions, 0 deletions
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}") ) } |