From dcca79fa473d4188463c6c27d0608e324afe319d Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 22 Sep 2015 17:31:14 -0400 Subject: [PATCH] use the new key for signing Signed-off-by: Alfredo Deza --- ceph-build/build/build_deb | 2 +- ceph-build/build/build_rpm | 2 +- ceph-deploy/build/build | 2 +- ceph-release-rpm/build/build | 2 +- ceph-setup/build/build | 2 +- ceph/config/definitions/ceph.yml | 2 +- do_release.sh | 2 +- kmod/sign-and-sync-from-jenkins | 2 +- push_to_rpm_repo.sh | 2 +- radosgw-agent/build/build | 2 +- sign_and_index_rpm_repo.sh | 2 +- tag_release.sh | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb index cd45a217..e754075e 100644 --- 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 c58d3c03..e8ac9e02 100644 --- 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 91220ee6..f6da3086 100644 --- 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 f414df95..59296cf9 100644 --- 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 edd4d340..cadc06c8 100644 --- 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 6f2c3968..0e0f6f4d 100644 --- 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 69305ba8..5c85bf14 100755 --- 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 de883eb3..72f7205e 100755 --- 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 92686d94..5601347a 100755 --- 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 abcd1029..13c2a56a 100644 --- 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 e1a4ad8a..af538eb0 100755 --- 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 c128ce73..d4a36030 100755 --- 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 -- 2.39.5