Skip to content
This repository has been archived by the owner on Aug 1, 2019. It is now read-only.

Commit

Permalink
- Added Gluon repository to .gitignore
Browse files Browse the repository at this point in the history
 - Set build-jenkins.sh and build-test.sh executable
 - build-jenkins.sh: New Flag "--disable-sign" to disable signing for
   local tests
 - build-test.sh does not try to sign builds anymore
  • Loading branch information
MPW1412 committed Mar 6, 2015
1 parent 95c8240 commit 170cd9a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1 +1,2 @@
*~
gluon/
25 changes: 16 additions & 9 deletions build-jenkins.sh 100644 → 100755
Expand Up @@ -18,6 +18,13 @@ export GLUON_URL=https://github.com/freifunk-gluon/gluon.git
export GLUON_COMMIT=v2014.4
export GLUON_RELEASE=$GLUON_COMMIT+$BUILD_NUMBER

if [ "$1" = '--disable-sign' ]; then
SIGN=0
shift
else
SIGN=1
fi


# Verzeichnis für Gluon-Repo erstellen und initialisieren

Expand Down Expand Up @@ -57,14 +64,14 @@ make V=s GLUON_RELEASE=$GLUON_RELEASE GLUON_BRANCH=stable
# Der private Schlüssel des Servers muss in $JENKINS_HOME/secret liegen und das
# Tools 'ecdsasign' muss auf dem Server verfügbar sein.
# Repo: https://github.com/tcatm/ecdsautils
if [ $SIGN ]; then
cd $WORKSPACE/gluon

cd $WORKSPACE/gluon

make manifest GLUON_RELEASE=$GLUON_RELEASE GLUON_BRANCH=experimental
make manifest GLUON_RELEASE=$GLUON_RELEASE GLUON_BRANCH=beta
make manifest GLUON_RELEASE=$GLUON_RELEASE GLUON_BRANCH=stable

sh contrib/sign.sh $JENKINS_HOME/secret images/sysupgrade/experimental.manifest
sh contrib/sign.sh $JENKINS_HOME/secret images/sysupgrade/beta.manifest
sh contrib/sign.sh $JENKINS_HOME/secret images/sysupgrade/stable.manifest
make manifest GLUON_RELEASE=$GLUON_RELEASE GLUON_BRANCH=experimental
make manifest GLUON_RELEASE=$GLUON_RELEASE GLUON_BRANCH=beta
make manifest GLUON_RELEASE=$GLUON_RELEASE GLUON_BRANCH=stable

sh contrib/sign.sh $JENKINS_HOME/secret images/sysupgrade/experimental.manifest
sh contrib/sign.sh $JENKINS_HOME/secret images/sysupgrade/beta.manifest
sh contrib/sign.sh $JENKINS_HOME/secret images/sysupgrade/stable.manifest
fi
2 changes: 1 addition & 1 deletion build-test.sh 100644 → 100755
Expand Up @@ -17,5 +17,5 @@ export BUILD_NUMBER=000
# Jenkins Build-Konfiguration
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
chmod +x $WORKSPACE/build-jenkins.sh
sh $WORKSPACE/build-jenkins.sh
sh $WORKSPACE/build-jenkins.sh --disable-sign

0 comments on commit 170cd9a

Please sign in to comment.