Improved ci build failure detection

edenhill · edenhill · commit f56f0adb1258 · 2017-09-05T15:04:36.000+02:00
diff --git a/tools/bootstrap-librdkafka.sh b/tools/bootstrap-librdkafka.sh
@@ -4,13 +4,18 @@
 # Downloads, builds and installs librdkafka into <install-dir>
 #
 
-set -e
+if [[ $1 == "--require-ssl" ]]; then
+    REQUIRE_SSL=1
+    shift
+fi
 
 VERSION=$1
 PREFIXDIR=$2
 
+set -e
+
 if [[ -z "$VERSION" ]]; then
-    echo "Usage: $0 <librdkafka-version> [<install-dir>]" 1>&2
+    echo "Usage: $0 --require-ssl <librdkafka-version> [<install-dir>]" 1>&2
     exit 1
 fi
 
@@ -32,6 +37,12 @@ curl -L "https://github.com/edenhill/librdkafka/archive/${VERSION}.tar.gz" | \
 ./configure --clean
 make clean
 ./configure --prefix="$PREFIXDIR"
+
+if [[ $REQUIRE_SSL == 1 ]]; then
+    grep '^#define WITH_SSL 2$' config.h || \
+        (echo "ERROR: OpenSSL support required" ; cat config.log ; exit 1)
+fi
+
 make -j
 make install
 popd
diff --git a/tools/build-openssl.sh b/tools/build-openssl.sh
@@ -14,10 +14,10 @@ if [[ -z $PREFIX ]]; then
 fi
 
 set -ex
+set -o pipefail
 
 echo "# Building OpenSSL ${OPENSSL_VERSION}"
 
-
 if ! grep -q "^VERSION=${OPENSSL_VERSION}$" build-openssl/Makefile ; then
     echo "No usable build-openssl directory: downloading ${OPENSSL_VERSION}"
     rm -rf build-openssl
@@ -32,7 +32,14 @@ fi
 
 ./config --prefix=${PREFIX} zlib no-krb5 zlib shared
 echo "## building openssl"
-time make -j 2>&1 | tail -20
+if ! time make -j 2>&1 | tail -20 ; then
+    echo "## Make failed, cleaning up and retrying"
+    time make clean 2>&1 | tail -20
+    rm -f test/PASSED
+    echo "## building openssl (retry)"
+    time make -j 2>&1 | tail -20 ; then
+fi
+
 if [[ ! -f test/PASSED ]]; then
     echo "## testing openssl"
     time make test 2>&1 | tail -20
