jjb: Add env and os details printing to build jobs

[lttng-ci.git] / scripts / lttng-tools / build.sh

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 4458a0ce5fd822ea235dd714561f28a976133290..394575c1cb162ffd25332a6ad753cca881f707f4 100755 (executable)
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 # shellcheck disable=SC2103
 #
 # Copyright (C) 2016 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+set -exu
+
 # Version compare functions
 vercomp () {
     set +u
@@ -70,6 +72,16 @@ verne() {
     [ "$res" -ne "0" ]
 }
 
+failed_configure() {
+    # Assume we are in the configured build directory
+    echo "#################### BEGIN config.log ####################"
+    cat config.log
+    echo "#################### END config.log ####################"
+
+    # End the build with failure
+    exit 1
+}
+
 # Required variables
 WORKSPACE=${WORKSPACE:-}
 
@@ -269,6 +281,10 @@ if [ -d "$WORKSPACE/src/lttng-modules" ]; then
     depmod
 fi
 
+# Print build env details
+print_os || true
+print_tooling || true
+
 # Enter the source directory
 cd "$SRCDIR"
 
@@ -290,6 +306,8 @@ fi
 # Most build configs require the python bindings
 CONF_OPTS=("--prefix=$PREFIX" "--enable-python-bindings")
 
+DIST_CONF_OPTS=()
+
 # Set configure options and environment variables for each build
 # configuration.
 case "$conf" in
@@ -302,6 +320,7 @@ static)
 no-ust)
     echo "Build without UST support"
     CONF_OPTS+=("$NO_UST")
+    DIST_CONF_OPTS+=("$NO_UST")
     ;;
 
 agents)
@@ -347,7 +366,7 @@ oot)
     builddir=$(mktemp -d)
     cd "$builddir"
 
-    "$SRCDIR/configure" "${CONF_OPTS[@]}"
+    "$SRCDIR/configure" "${CONF_OPTS[@]}" || failed_configure
     ;;
 
 dist)
@@ -355,7 +374,7 @@ dist)
 
     # Run configure and generate the tar file
     # in the source directory
-    ./configure
+    ./configure "${DIST_CONF_OPTS[@]}" || failed_configure
     $MAKE dist
 
     # Create and enter a temporary build directory
@@ -367,7 +386,7 @@ dist)
     $TAR xvf "$SRCDIR"/*.tar.* --strip 1
 
     # Build in extracted source tree
-    ./configure "${CONF_OPTS[@]}"
+    ./configure "${CONF_OPTS[@]}" || failed_configure
     ;;
 
 oot-dist)
@@ -378,7 +397,7 @@ oot-dist)
     cd "$builddir"
 
     # Run configure out of tree and generate the tar file
-    "$SRCDIR/configure"
+    "$SRCDIR/configure" "${DIST_CONF_OPTS[@]}" || failed_configure
     $MAKE dist
 
     dist_srcdir="$(mktemp -d)"
@@ -394,12 +413,12 @@ oot-dist)
 
     # Run configure from the extracted distribution tar,
     # out of the source tree
-    "$dist_srcdir/configure" "${CONF_OPTS[@]}"
+    "$dist_srcdir/configure" "${CONF_OPTS[@]}" || failed_configure
     ;;
 
 *)
     echo "Standard in-tree build"
-    ./configure "${CONF_OPTS[@]}"
+    ./configure "${CONF_OPTS[@]}" || failed_configure
     ;;
 esac