Jenkins specific key
Change-Id: I99b277c4b70541144fee128644e234d36c3b2463
diff --git a/jjb/onos/onos-release-build.sh b/jjb/onos/onos-release-build.sh
index 4f4dc58..55c5cd9 100644
--- a/jjb/onos/onos-release-build.sh
+++ b/jjb/onos/onos-release-build.sh
@@ -4,9 +4,8 @@
ONOS_ROOT=`pwd`
. tools/build/envDefaults
-# extract GPG keys
-base64 -d secring.gpg.b64 >secring.gpg
-base64 -d pubring.gpg.b64 >pubring.gpg
+# import GPG key
+gpg --import jenkins.key
env
@@ -22,10 +21,5 @@
mkdir -p ~/.m2
mv settings.xml ~/.m2/settings.xml
-# stage the gpg keys
-mkdir -p ~/.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 9fba725..10536a9 100644
--- a/jjb/onos/onos-verify.yaml
+++ b/jjb/onos/onos-verify.yaml
@@ -285,12 +285,9 @@
- file-id: 'buck-config-local'
target: '.buckconfig.local'
variable: 'BUCK_CONFIG_FILE'
- - file-id: 'secring.gpg.b64'
- target: 'secring.gpg.b64'
- variable: 'GPG_SEC_B64_FILE'
- - file-id: 'pubring.gpg.b64'
- target: 'pubring.gpg.b64'
- variable: 'GPG_PUB_B64_FILE'
+ - file-id: 'gpg-key'
+ target: 'jenkins.key'
+ variable: 'GPG_KEY_FILE'
- file-id: 'release-build-maven-settings'
target: 'settings.xml'
variable: 'MAVEN_SETTINGS'