use the new key for signing

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb
index cd45a2177032d1f7e80f2603739d4d0fe94bc45f..e754075ed1225fe91ce55a09ae7e9a6d9b8557b0 100644 (file)
--- a/ceph-build/build/build_deb
+++ b/ceph-build/build/build_deb
@@ -29,7 +29,7 @@ get_bptag() {
 BPTAG=`get_bptag $DIST`
 
 export GNUPGHOME=/home/jenkins-build/build/gnupg.ceph-release/
-export KEYID=17ED316D
+export KEYID=460F3994
 HOST=$(hostname --short)
 echo "Building on $(hostname) Date: $(date)"
 echo "  DIST=${DIST}"

diff --git a/ceph-build/build/build_rpm b/ceph-build/build/build_rpm
index c58d3c0383a00f5103e86b819ec1539125ea1092..e8ac9e027720724cb1690b780e98e2f089f51223 100644 (file)
--- a/ceph-build/build/build_rpm
+++ b/ceph-build/build/build_rpm
@@ -6,7 +6,7 @@ if [[ ! -f /etc/redhat-release && ! -f /usr/bin/zypper ]] ; then
 fi
 
 export GNUPGHOME=/home/jenkins-build/build/gnupg.ceph-release/
-export KEYID=17ED316D
+export KEYID=460F3994
 HOST=$(hostname --short)
 echo "Building on $(hostname) Date: $(date)"
 echo "  DIST=${DIST}"

diff --git a/ceph-deploy/build/build b/ceph-deploy/build/build
index 91220ee6ff0d9b425925cea132e03a33e8077813..f6da30869abae163b17584b8a2f0ad76e93484d2 100644 (file)
--- a/ceph-deploy/build/build
+++ b/ceph-deploy/build/build
@@ -10,7 +10,7 @@ set -e
 if $RELEASE ; then
         # This is a formal release. Sign it with the release key.
         export GNUPGHOME=/home/jenkins-build/build/gnupg.ceph-release/
-        export KEYID=17ED316D
+        export KEYID=460F3994
 else
         # This is an automatic build. Sign it with the autobuild key.
         export GNUPGHOME=/home/jenkins-build/build/gnupg.autobuild/

diff --git a/ceph-release-rpm/build/build b/ceph-release-rpm/build/build
index f414df95d32dc73de793a6b1871b114fe21147a2..59296cf958917287d6e3bf42acc9ce9008a734a7 100644 (file)
--- a/ceph-release-rpm/build/build
+++ b/ceph-release-rpm/build/build
@@ -2,7 +2,7 @@
 
 #export GNUPGHOME=/home/jenkins-build/build/gnupg.autobuild/
 export GNUPGHOME=/home/jenkins-build/build/gnupg.ceph-release/
-export KEYID=17ED316D
+export KEYID=460F3994
 HOST=$(hostname --short)
 echo "Building on ${HOST}"
 echo "  DIST=${DIST}"

diff --git a/ceph-setup/build/build b/ceph-setup/build/build
index edd4d34092700006c4798eb9b663c890348c6ee8..cadc06c877a2004238b88a4209ade83b0859b6c2 100644 (file)
--- a/ceph-setup/build/build
+++ b/ceph-setup/build/build
@@ -2,7 +2,7 @@
 
 #export GNUPGHOME=/home/jenkins-build/build/gnupg.autobuild/
 export GNUPGHOME=/home/jenkins-build/build/gnupg.ceph-release/
-export KEYID=17ED316D
+export KEYID=460F3994
 HOST=$(hostname --short)
 echo "Building on ${HOST}"
 echo "  DIST=${DIST}"

diff --git a/ceph/config/definitions/ceph.yml b/ceph/config/definitions/ceph.yml
index 6f2c39683512e006b4141ad7b012a44c337c1e20..0e0f6f4d6745f633b6dcf95e137d835cffbdb3e7 100644 (file)
--- a/ceph/config/definitions/ceph.yml
+++ b/ceph/config/definitions/ceph.yml
@@ -28,7 +28,7 @@
           description: "
 If this is unchecked, then the builds will be signed with the autosign key (03C3951A). This is the default.<br/>
 
-If this is checked, then the builds will be signed by the release key (17ED316D).<br/>
+If this is checked, then the builds will be signed by the release key (460F3994).<br/>
 
 Only check this box if we will be shipping the packages as formal releases."
 

diff --git a/do_release.sh b/do_release.sh
index 69305ba84b4e5151ebdff1f4e075aeea5e14f07e..5c85bf14835c5764ff6ad3f0d6ec9ea72b70cece 100755 (executable)
--- a/do_release.sh
+++ b/do_release.sh
@@ -3,7 +3,7 @@
 set -e
 
 xterm=${xterm:-0}      # set to 1 to use xterm for remote sessions
-gpgkey='17ED316D'
+gpgkey='460F3994'
 
 bindir=`dirname $0`
 

diff --git a/kmod/sign-and-sync-from-jenkins b/kmod/sign-and-sync-from-jenkins
index de883eb3d9e6d31dac62407c03e22dc11f0335f5..72f7205ef9cdff60af14ed64029b00285f609b6d 100755 (executable)
--- a/kmod/sign-and-sync-from-jenkins
+++ b/kmod/sign-and-sync-from-jenkins
@@ -20,7 +20,7 @@ BUILD=lastSuccessful
 ROOT=/home2/jenkins/jobs/${JOB}/configurations/axis-label
 
 #KEYID=${KEYID:-03C3951A}  # default is autobuild keyid
-KEYID=${KEYID:-17ED316D}  # default is release keyid
+KEYID=${KEYID:-460F3994}  # default is release keyid
 
 if gpg --list-keys 2>/dev/null | grep -q ${KEYID} ; then
     echo "Signing packages and repo with ${KEYID}"

diff --git a/push_to_rpm_repo.sh b/push_to_rpm_repo.sh
index 92686d94e68abaf03906206211c36249bc55374d..5601347a6afda72c29fd4341c032b1c905a49779 100755 (executable)
--- a/push_to_rpm_repo.sh
+++ b/push_to_rpm_repo.sh
@@ -6,7 +6,7 @@ releasedir=$1
 repo=$2
 cephvers=$3
 
-keyid=17ED316D
+keyid=460F3994
 
 usage() {
     echo "usage: $0 releasedir repodir version component"

diff --git a/radosgw-agent/build/build b/radosgw-agent/build/build
index abcd10297e7708c7a5b4a942ca552cd73f1a4e85..13c2a56ab79d8995fbe83f9ffa60df2e319f8831 100644 (file)
--- a/radosgw-agent/build/build
+++ b/radosgw-agent/build/build
@@ -6,7 +6,7 @@ set -ex
 if $RELEASE ; then
         # This is a formal release. Sign it with the release key.
         export GNUPGHOME=/home/jenkins-build/build/gnupg.ceph-release/
-        export KEYID=17ED316D
+        export KEYID=460F3994
 else
         # This is an automatic build. Sign it with the autobuild key.
         export GNUPGHOME=/home/jenkins-build/build/gnupg.autobuild/

diff --git a/sign_and_index_rpm_repo.sh b/sign_and_index_rpm_repo.sh
index e1a4ad8a7aae953d679500824ca760f6ff1badd7..af538eb016a58bcf3b74f5803ba803296aeed782 100755 (executable)
--- a/sign_and_index_rpm_repo.sh
+++ b/sign_and_index_rpm_repo.sh
@@ -6,7 +6,7 @@ releasedir=$1
 repo=$2
 cephvers=$3
 
-keyid=17ED316D
+keyid=460F3994
 
 usage() {
     echo "usage: $0 releasedir repodir version"

diff --git a/tag_release.sh b/tag_release.sh
index c128ce73cd32845b69e08f42f1e16bc2eb24db17..d4a360301f79cd8db72fd57cd707c2b6f717a817 100755 (executable)
--- a/tag_release.sh
+++ b/tag_release.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-git tag -s $1 -u 17ED316D -m $1
+git tag -s $1 -u 460F3994 -m $1