Update the keys and script one more time (#6163)

Signed-off-by: jesus m. rodriguez <[email protected]>

Signed-off-by: jesus m. rodriguez <[email protected]>
Co-authored-by: jesus m. rodriguez <[email protected]>

Author: openshift-cherrypick-robot

.ci/gpg/create-keyring.sh

@@ -16,18 +16,22 @@ declare -r PUBRING_AUTO="${GPG_HOME}/pubring.auto"
 mkdir -p --mode 700 "$GPG_HOME"
 cp "${DIR}"/*.auto* "${GPG_HOME}"
 
+echo -e "\nImporting public keys..."
+{ gpg --home "${GPG_HOME}" --import "${PUBRING_AUTO}" ; } || { err_exit "Could not import public key into gpg." ; }
+echo "Success!"
+
 echo -e "\nDecrypting secret key..."
 {
   # $GPG_PASSWORD is taken from the script's env (injected by CI).
-  echo $GPG_PASSWORD | gpg --decrypt \
+  echo $GPG_PASSWORD | gpg --home "${GPG_HOME}" --decrypt \
     --pinentry-mode loopback --batch \
     --passphrase-fd 0 \
     --output "${SECRING_AUTO}" \
     "${SECRING_AUTO}".gpg ; \
 } || { err_exit "Failed to decrypt secret key." ; }
 echo "Success!"
 
-echo -e "\nImporting keys..."
-{ gpg --home "${GPG_HOME}" --import "${PUBRING_AUTO}" ; } || { err_exit "Could not import public key into gpg." ; }
+echo -e "\nImporting private keys..."
+# { gpg --home "${GPG_HOME}" --import "${PUBRING_AUTO}" ; } || { err_exit "Could not import public key into gpg." ; }
 { gpg --home "${GPG_HOME}" --import "${SECRING_AUTO}" ; } || { err_exit "Could not import secret key into gpg." ; }
 echo "Success!"

.ci/gpg/pubring.auto

@@ -35,30 +35,30 @@ qhO9eP9qGZ1LIgEKOeyLm5TgUcPLnq49vS4/eCo+p+Qa1FcGEs+b6rqIxSzyxNxs
 v2lRmUQ/A3BToV321De2zfr51u1rJJVpYIEvbMPRyiciZzkDu/D5Z5fR1nytoFcR
 t3osFILI0lilvzpSzxlHmnM480JADiTlKGz6YTnYG2mrZCFOxrmAsA/yDO4v41Ii
 7O7z0cJO3l3mZ1fbqqAqqyHU0EGcxYOAmfM8azSrxj0MOM2jfGDMPWg3g3SXTXIl
-6qyWOVUWfP4+QBsHrByHTSpGCgyTWwARAQABiQRyBBgBCAAmFiEEOy8UgdFGI4CA
-s0a7BSmW4qILXH4FAl+clhYCGwIFCQPDuIACQAkQBSmW4qILXH7BdCAEGQEIAB0W
-IQSGE9uHpbqCXvP9Dr4qhZ0Iv5iG2wUCX5yWFgAKCRAqhZ0Iv5iG2x3cD/9KqFC6
-gbhzNpIvZ2yrri1l1SIrB+PKvCeZSOYDlxDJ3YgAu/3+d7EwOovP8IuEb340R8w0
-onsdYDHCHODCgda+Pu/WvWxx5/wSObyd0kHPM55RLx5C5UHPdlt+yKJ0QwiMPF8g
-AqVDXkc2XIghBID4ykP0V5re9ug87hVd2EYnrkMDa6N+lXtlvzptFTjBJVdu3reM
-pLwHqS/GAmxhgwF6kVPxZRHcMIKLweLN2JgGd2aFaIQBj+O43XROhL5or+F/E60w
-c4ZTUp/a8aRxJRrzlHgNFBbV6oknzwTQRaB1CD0YXjFZL2k5rEEfvyfXguCTDyZT
-jJjYvCO0MDxL/KI9fyJpcU+entGod83Ne893XXCS2SmaTY3LvQ+v/e99trh4m7St
-oOQ8xm6b10sI6TbhbgPOYgtTPLxw3BldTrU5Hphz+suPrcHybKn357l7bf9yYTfK
-tsrAKPVOMNF7QEdR3UldqoGzkTo55l4omvMS93tWSG+w47W7QIAQjwTlqDyjYVg3
-2l8XlfDtcR0k+Y6ObguEMUwtsikK+FvqVS5ZCPIyvv4kMCIazMlEWocsfvrINjQ4
-II2W+oQv5vJmOyY30tPELq35taH9oOMjtY3KWZVmPzw6+DGRTA2RDR+7qm2v3lgl
-i49Nzi/iSBvDeVZxSBHRRjH/OL7TKWN+WwC2I4wYD/4iox1+WcKPsI+77HaULvsP
-qa+bXnKbZidrsqSejbPnLg3M9an2gDo0d62QxrnJLl9OhuhObXP/bzCjrcMkg9hY
-BAHaTXbRtVlSKpXYEyuwO6HYQ7WyHlY9y9srHIvcWuBrpI9Kgd28rkT4QZB5WJD/
-Cgj4ksJAe+TsSmccdw3zG3OWWVs4HujQnWnh+NbBE7cyYqZaByKiDjL3vKP+0Zfj
-M/TF8nnY7zqgSljQxScbW7//U3GiB9DKg1r9TEMzmSTDugwv7u2kM/iZPjq+dvUs
-KqKuyX23WDKRLyzusDqIWKsRrkd+g1vBfxSUhWwxtwzyy1rL/tNcXGBuLOxjUit9
-LhdowjFRG93Tswac/Q8VGPEB5XjBgRNlW9vSYgw+5wTHf01UBWgEWtFhl6SJnD6u
-AjnMBtduqXBXmncTA6Gz5XB1h7xM32pLncWJGHfixXiJcOgGqW+Lv1Y3eaPqCFOm
-4yfYDfBL+UN8Y7sR3WrVy1R6Ut/8bf4sD/i1UyBNKSzeN5sBpi7KgA6yY7PpVIN7
-H7V1QN41Bw9vAG5WXCO8vmY0GoCMQAKM5p04mMuBr6nswy1W94q6uuINwq6q1ycf
-YQJyoKhXifPhdicwDMYeuW7aP7WnPIb3VwdtlEyD+ycBsak0Jsq/+yrov3pXgrdL
-dlF2O4uTr4frwKRl28eGEQ==
-=urB3
+6qyWOVUWfP4+QBsHrByHTSpGCgyTWwARAQABiQRyBBgBCAAmAhsCFiEEOy8UgdFG
+I4CAs0a7BSmW4qILXH4FAmNrMGAFCQlyNMoCQMF0IAQZAQgAHRYhBIYT24eluoJe
+8/0OviqFnQi/mIbbBQJfnJYWAAoJECqFnQi/mIbbHdwP/0qoULqBuHM2ki9nbKuu
+LWXVIisH48q8J5lI5gOXEMndiAC7/f53sTA6i8/wi4RvfjRHzDSiex1gMcIc4MKB
+1r4+79a9bHHn/BI5vJ3SQc8znlEvHkLlQc92W37IonRDCIw8XyACpUNeRzZciCEE
+gPjKQ/RXmt726DzuFV3YRieuQwNro36Ve2W/Om0VOMElV27et4ykvAepL8YCbGGD
+AXqRU/FlEdwwgovB4s3YmAZ3ZoVohAGP47jddE6Evmiv4X8TrTBzhlNSn9rxpHEl
+GvOUeA0UFtXqiSfPBNBFoHUIPRheMVkvaTmsQR+/J9eC4JMPJlOMmNi8I7QwPEv8
+oj1/ImlxT56e0ah3zc17z3ddcJLZKZpNjcu9D6/97322uHibtK2g5DzGbpvXSwjp
+NuFuA85iC1M8vHDcGV1OtTkemHP6y4+twfJsqffnuXtt/3JhN8q2ysAo9U4w0XtA
+R1HdSV2qgbOROjnmXiia8xL3e1ZIb7DjtbtAgBCPBOWoPKNhWDfaXxeV8O1xHST5
+jo5uC4QxTC2yKQr4W+pVLlkI8jK+/iQwIhrMyURahyx++sg2NDggjZb6hC/m8mY7
+JjfS08Qurfm1of2g4yO1jcpZlWY/PDr4MZFMDZENH7uqba/eWCWLj03OL+JIG8N5
+VnFIEdFGMf84vtMpY35bALYjCRAFKZbiogtcfuZoD/4hHpYVyF6E+mVblD4XZfWT
+WlpjzAerAMiffjudYrmoFdUOMKjcaDecUEfIu7f4zaC+kWe2pAGI22AgokuSNR/U
+GBIuW2ApLm8HdPr3JpzXixVvFYvTRpw0p3A0CXZGR3gXU3yClhKriwmN38Z3mbJ3
+qtwIF8al5ANHlcWEdI7+MWWdU7eFfGzRYtCS2TYapl3NqAGKpSgViUxqhb5ui/YM
+6muB2NSy54p+jt9I3TURYEiLm+stHAqB1rw6StCvXjqKi81nD5E0c6DzhN5Wcy0H
+blcl63V5/FLZdoW6VUAIpgVLLoenQ3yM2rDylvNQmq18L7hduQFbtnGn5Nb/d4Ch
+jXkdN/0n3pM+Qynw4qwOzoaC6rKV1K4ZVsz/LsnoV5U9mJfnX2G8mCpmv+MByPmz
+GRzmPfT8tBVrq4u0/SqLKirLlP9ugJqHytHlYQv31zyTyquwdhzTd12MO/9wIyx3
+JaFyx7L+X1v2Cqs66AmhWG+E8pDxYSbq0Tow65xhKgDdElqUNNqns4m/t6hEWU+1
+blgtzBf680IJhbwJKyGMJLID6mAsNwitnoZ6hAVcqmtzMrnJ+m0wWAFTbGs/KY+m
+0Cc8IzQzYa70jlyPt/+iwUkpzspXmRDlaWJULylGdaxRbSYmRZFMr95NB/ef33cF
+uNlJZ+sbXAWLfIUlDs7KVQ==
+=CWwB
 -----END PGP PUBLIC KEY BLOCK-----