[Fusionforge-commits] FusionForge branch master updated. 82d4082d0f4396e2f8c354f6481b137b04c3ff22

Sylvain Beucler beuc-inria at fusionforge.org
Mon Dec 1 18:02:29 CET 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  82d4082d0f4396e2f8c354f6481b137b04c3ff22 (commit)
      from  25229a191b6e956be3728611b774c6d5606968ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 82d4082d0f4396e2f8c354f6481b137b04c3ff22
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Dec 1 18:02:25 2014 +0100

    testsuite: simplify init-jenkins.sh gpg

diff --git a/tests/buildbot/lxc/init-jenkins.sh b/tests/buildbot/lxc/init-jenkins.sh
index d0d5252..b9fdcfc 100755
--- a/tests/buildbot/lxc/init-jenkins.sh
+++ b/tests/buildbot/lxc/init-jenkins.sh
@@ -30,26 +30,17 @@ then
 	su - jenkins -c "ssh-keygen -q -t rsa -f ~/.ssh/id_rsa -N ''"
 fi
 
-# Setup botkey
+# Setup botkey - only needed for 5.3?
 echo "Setup Bot Key"
 if ! su - jenkins -c "gpg --list-secret-keys $EMAIL 2>/dev/null"
 then 
-cat > ~jenkins/botkey <<-EOF
-%echo Generating a standard key'
-Key-Type: DSA
-Key-Length: 1024
-Subkey-Type: ELG-E
-Subkey-Length: 1024
-Name-Real: FusionForge Bot
-Name-Comment: with stupid passphrase
-Name-Email: $EMAIL
-Expire-Date: 0
-#Passphrase: abc
-#%pubring botkey.pub
-#%secring botkey.sec
-# Do a commit here, so that we can later print "done" :-)
-%commit
-%echo done
+su - jenkins -c "gpg --batch --gen-key" <<EOF
+     Key-Type: RSA
+     Key-Length: 2048
+     Subkey-Type: RSA
+     Subkey-Length: 2048
+     Name-Real: buildbot@$(hostname -f)
+     Expire-Date: 0
+     %commit
 EOF
-su - jenkins -c "gpg --batch --gen-key ~/botkey"
 fi

-----------------------------------------------------------------------

Summary of changes:
 tests/buildbot/lxc/init-jenkins.sh |   27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list