From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 23 Sep 2015 17:50:39 +0000 (-0400)
Subject: remove gpg references
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=21af3440c1930466ec87e21519dcfffc1f482554;p=ceph-build.git

remove gpg references

And explicitly tell dpk-buildpackage to not sign .dsc or .changes files

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

diff --git a/radosgw-agent/build/build b/radosgw-agent/build/build
index 13c2a56a..8905223e 100644
--- a/radosgw-agent/build/build
+++ b/radosgw-agent/build/build
@@ -2,22 +2,10 @@
 
 set -ex
 
-# Jenkins will set $RELEASE as a parameter in the job configuration.
-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=460F3994
-else
-        # This is an automatic build. Sign it with the autobuild key.
-        export GNUPGHOME=/home/jenkins-build/build/gnupg.autobuild/
-        export KEYID=03C3951A
-fi
-
 HOST=$(hostname --short)
 echo "Building on ${HOST}"
 echo "  DIST=${DIST}"
 echo "  BPTAG=${BPTAG}"
-echo "  KEYID=${KEYID}"
 echo "  WS=$WORKSPACE"
 echo "  PWD=$(pwd)"
 ls -l
@@ -58,7 +46,9 @@ else
         BP_VERSION=${DEB_VERSION}${BPTAG}
         DEBEMAIL="adeza@redhat.com" dch -D $DIST --force-distribution -b -v "$BP_VERSION" "$comment"
         dpkg-source -b .
-        dpkg-buildpackage -k$KEYID
+        # we no longer sign the .dsc or .changes files (done by default with
+        # the `-k$KEYID` flag), so explicitly tell the tool not to sign them
+        dpkg-buildpackage -uc -us
         RC=$?
         if [ $RC -eq 0 ] ; then
             cd $WORKSPACE