]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
jenkins: support autobuild key or release key 2/head
authorKen Dreyer <ken.dreyer@inktank.com>
Tue, 14 Jan 2014 03:29:06 +0000 (20:29 -0700)
committerKen Dreyer <ken.dreyer@inktank.com>
Tue, 14 Jan 2014 03:52:15 +0000 (20:52 -0700)
We need Jenkins to build ceph more often so we can have more testing,
but we don't want to sign these "unofficial" builds with the official
release key.

Conditionally select the release key or the autobuild key based upon the
$RELEASE environment variable. Jenkins will set this variable using a
parameter when it runs each ceph build. For formal releases, we will set
the parameter to "true".

Signed-off-by: Ken Dreyer <ken.dreyer@inktank.com>
jenkins/build
jenkins/setup

index a9694297cab4ad478bf3b2ee447abbdbc8b23bb0..44b181cff8b86c9862091075985f66bc533ba987 100644 (file)
@@ -3,9 +3,17 @@
 # This is a script that runs inside Jenkins.
 # http://jenkins.ceph.com/job/ceph-build/
 
-#export GNUPGHOME=/home/jenkins-build/build/gnupg.autobuild/
-export GNUPGHOME=/home/jenkins-build/build/gnupg.ceph-release/
-export KEYID=17ED316D
+# 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=17ED316D
+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 $(hostname) Date: $(date)"
 echo "  DIST=${DIST}"
index 4f4331853320e9bd4fb8d1923f84314868d94754..e28b886b18c61e55600ec7cf32cb602dd5ac17f8 100644 (file)
@@ -3,9 +3,17 @@
 # This is a script that runs inside Jenkins.
 # http://jenkins.ceph.com/job/ceph-setup/
 
-#export GNUPGHOME=/home/jenkins-build/build/gnupg.autobuild/
-export GNUPGHOME=/home/jenkins-build/build/gnupg.ceph-release/
-export KEYID=17ED316D
+# 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=17ED316D
+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}"