[MERGED] libosmocore[master]: Cleanup jenkins build scripts

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: Cleanup jenkins build scripts
......................................................................


Cleanup jenkins build scripts

* reorder builds to avoid rm -rf invocation
* avoid useless double autoreconf
* move common parts into shared helper
* move common build steps into separate function

Change-Id: I24e500e132f5c8e8133d35548cb7b4e4552331d0
---
M contrib/jenkins-arm.sh
M contrib/jenkins.sh
A contrib/jenkins_common.sh
3 files changed, 26 insertions(+), 32 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/contrib/jenkins-arm.sh b/contrib/jenkins-arm.sh
index ad992af..beb53da 100755
--- a/contrib/jenkins-arm.sh
+++ b/contrib/jenkins-arm.sh
@@ -1,11 +1,9 @@
 #!/bin/sh
 
-set -ex
+. $(dirname "$0")/jenkins_common.sh
 
-verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
-
-autoreconf --install --force
-./configure --enable-static \
+build() {
+    $1 --enable-static \
 	--prefix=/usr/local/arm-none-eabi \
 	--host=arm-none-eabi \
 	--enable-embedded \
@@ -14,20 +12,13 @@
 
 $MAKE $PARALLEL_MAKE \
 	|| cat-testlogs.sh
+}
 
 # verify build in dir other than source tree
-rm -rf *
-git checkout .
-autoreconf --install --force
-mkdir builddir
+mkdir -p builddir
 cd builddir
+build ../configure
 
-../configure --enable-static \
-	--prefix=/usr/local/arm-none-eabi \
-	--host=arm-none-eabi \
-	--enable-embedded \
-	--disable-shared \
-	CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror"
+cd ..
+build ./configure
 
-$MAKE $PARALLEL_MAKE \
-	|| cat-testlogs.sh
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 4a26776..c397d52 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,31 +1,27 @@
 #!/bin/sh
 # jenkins build helper script for libosmo-sccp.  This is how we build on jenkins.osmocom.org
 
-set -ex
+. $(dirname "$0")/jenkins_common.sh
 
-verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+ENABLE_SANITIZE="--enable-sanitize"
 
 if [ "x$label" = "xFreeBSD_amd64" ]; then
         ENABLE_SANITIZE=""
-else
-        ENABLE_SANITIZE="--enable-sanitize"
 fi
 
-autoreconf --install --force
-./configure --enable-static $ENABLE_SANITIZE CFLAGS="-Werror" CPPFLAGS="-Werror"
+build() {
+    $1 --enable-static $2 CFLAGS="-Werror" CPPFLAGS="-Werror"
 $MAKE $PARALLEL_MAKE check \
   || cat-testlogs.sh
 $MAKE distcheck \
   || cat-testlogs.sh
+}
 
 # verify build in dir other than source tree
-rm -rf *
-git checkout .
-autoreconf --install --force
-mkdir builddir
+mkdir -p builddir
 cd builddir
-../configure --enable-static CFLAGS="-Werror" CPPFLAGS="-Werror"
-$MAKE $PARALLEL_MAKE check \
-  || cat-testlogs.sh
-$MAKE distcheck \
-  || cat-testlogs.sh
+build ../configure $ENABLE_SANITIZE
+
+cd ..
+build ./configure $ENABLE_SANITIZE
+
diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh
new file mode 100644
index 0000000..e52a96a
--- /dev/null
+++ b/contrib/jenkins_common.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -ex
+
+verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+
+autoreconf --install --force

-- 
To view, visit https://gerrit.osmocom.org/3132
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I24e500e132f5c8e8133d35548cb7b4e4552331d0
Gerrit-PatchSet: 4
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: blobb <dr.blobb at gmail.com>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>