Add GPG public key
Change-Id: I86c93f03fc4d5bcd3958b765d09afd47ae56c06e
diff --git a/jjb/onos/onos-release-build.sh b/jjb/onos/onos-release-build.sh
index ca852f3..4f4dc58 100644
--- a/jjb/onos/onos-release-build.sh
+++ b/jjb/onos/onos-release-build.sh
@@ -4,8 +4,9 @@
ONOS_ROOT=`pwd`
. tools/build/envDefaults
-# extract GPG key
+# extract GPG keys
base64 -d secring.gpg.b64 >secring.gpg
+base64 -d pubring.gpg.b64 >pubring.gpg
env
@@ -21,9 +22,10 @@
mkdir -p ~/.m2
mv settings.xml ~/.m2/settings.xml
-# stage the gpg key
+# stage the gpg keys
mkdir -p ~/.gnupg
-mv secring.gpg ~/.gnupg
+cp secring.gpg ~/.gnupg
+cp pubring.gpg ~/.gnupg
# run the build
onos-build-and-upload ${ONOS_VERSION} ${ONOS_NEXT_VERSION} ${GERRIT_BRANCH}
diff --git a/jjb/onos/onos-verify.yaml b/jjb/onos/onos-verify.yaml
index 4195904..9fba725 100644
--- a/jjb/onos/onos-verify.yaml
+++ b/jjb/onos/onos-verify.yaml
@@ -287,10 +287,10 @@
variable: 'BUCK_CONFIG_FILE'
- file-id: 'secring.gpg.b64'
target: 'secring.gpg.b64'
- variable: 'GPG_B64_FILE'
- - file-id: 'secring.gpg.b64'
- target: 'secring.gpg.b64'
- variable: 'GPG_B64_FILE'
+ variable: 'GPG_SEC_B64_FILE'
+ - file-id: 'pubring.gpg.b64'
+ target: 'pubring.gpg.b64'
+ variable: 'GPG_PUB_B64_FILE'
- file-id: 'release-build-maven-settings'
target: 'settings.xml'
variable: 'MAVEN_SETTINGS'