From 69d7af7199b59d52e623c75d83a665efff0311ce Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 16 Jul 2019 14:36:05 -0400
Subject: [PATCH] jjb: Update liburcu jobs

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 jobs/liburcu.yaml        | 23 ++++++++++++++++++--
 scripts/liburcu/build.sh | 47 +++++++++++++++++++++++-----------------
 2 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml
index f4fbb80..01b7e48 100644
--- a/jobs/liburcu.yaml
+++ b/jobs/liburcu.yaml
@@ -143,6 +143,10 @@
 - liburcu_build_publishers_defaults: &liburcu_build_publishers_defaults
     name: 'liburcu_build_publishers_defaults'
     publishers:
+      - tap:
+          results: 'tap/**/*.log'
+          failed-tests-mark-build-as-failure: true
+          todo-is-failure: false
       - warnings:
           console-log-parsers:
             - 'GNU Make + GNU C Compiler (gcc)'
@@ -153,7 +157,7 @@
               total-normal: 0
               total-low: 0
       - archive:
-          artifacts: 'build/**'
+          artifacts: 'build/**,tap/**'
           allow-empty: false
       - ircbot:
           strategy: new-failure-and-fixed
@@ -297,7 +301,14 @@
           allow-empty: false
 
 
-## Project
+## Views
+- view-template:
+    name: 'Liburcu'
+    view-type: list
+    regex: 'liburcu[-_].*'
+
+
+## Projects
 - project:
     name: liburcu
     github_user: urcu
@@ -307,6 +318,7 @@
       - stable-0.8
       - stable-0.9
       - stable-0.10
+      - stable-0.11
       - master
     jobs:
       - 'liburcu_{version}_{buildtype}':
@@ -333,6 +345,7 @@
             - master
             - stable-0.9
             - stable-0.10
+            - stable-0.11
       - 'liburcu_{version}_{buildtype}':
           buildtype: macosxbuild
           arch: !!python/tuple [macosx]
@@ -342,6 +355,7 @@
             - master
             - stable-0.9
             - stable-0.10
+            - stable-0.11
       - 'liburcu_{version}_winbuild':
           arch: !!python/tuple [cygwin, cygwin64]
           build: !!python/tuple [std]
@@ -350,8 +364,13 @@
             - master
             - stable-0.9
             - stable-0.10
+            - stable-0.11
       - 'liburcu_{version}_cppcheck'
       - 'liburcu_{version}_scan-build'
       - 'liburcu_{version}_coverity':
           version: master
 
+- project:
+    name: liburcu-views
+    views:
+      - Liburcu
diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh
index 7afb07f..b327896 100755
--- a/scripts/liburcu/build.sh
+++ b/scripts/liburcu/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -exu
 #
-# Copyright (C) 2015 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
-#               2016 - Michael Jeanson <mjeanson@efficios.com>
+# Copyright (C) 2015 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+#               2016-2019 Michael Jeanson <mjeanson@efficios.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -79,6 +79,9 @@ SRCDIR="$WORKSPACE/src/liburcu"
 TMPDIR="$WORKSPACE/tmp"
 PREFIX="$WORKSPACE/build"
 
+# The build dir defaults to the source dir
+BUILDDIR="$SRCDIR"
+
 # Create build and tmp directories
 rm -rf "$PREFIX" "$TMPDIR"
 mkdir -p "$PREFIX" "$TMPDIR"
@@ -173,38 +176,40 @@ esac
 # dist: build via make dist
 # *   : normal tree build
 #
-# Make sure to move to the build_path and configure
-# before continuing
-BUILD_PATH=$SRCDIR
+# Make sure to move to the build dir and run configure
+# before continuing.
 case "$build" in
 oot)
     echo "Out of tree build"
-    BUILD_PATH=$WORKSPACE/oot
-    mkdir -p "$BUILD_PATH"
-    cd "$BUILD_PATH"
+
+    BUILDDIR=$WORKSPACE/oot
+    mkdir -p "$BUILDDIR"
+    cd "$BUILDDIR"
+
     "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 
 dist)
     echo "Distribution out of tree build"
-    BUILD_PATH=$(mktemp -d)
 
-    # Initial configure and generate tarball
-    "$SRCDIR/configure"
+    tar_file="userspace-rcu-$PACKAGE_VERSION.tar.bz2"
+
+    # Initial configure in src dir and tarball generation
+    ./configure
     $MAKE dist
 
-    mkdir -p "$BUILD_PATH"
-    cp ./*.tar.* "$BUILD_PATH/"
-    cd "$BUILD_PATH"
+    BUILDDIR=$(mktemp -d)
+    mkdir -p "$BUILDDIR"
+    cd "$BUILDDIR"
 
     # Ignore level 1 of tar
-    $TAR xvf ./*.tar.* --strip 1
+    $TAR xvf "$SRCDIR/$tar_file" --strip 1
 
-    "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+    ./configure --prefix="$PREFIX" $CONF_OPTS
     ;;
 *)
     echo "Standard in-tree build"
-    "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+    ./configure --prefix="$PREFIX" $CONF_OPTS
     ;;
 esac
 
@@ -216,14 +221,16 @@ $MAKE install
 $MAKE --keep-going check
 # Only run regtest for 0.9 and up
 if vergte "$PACKAGE_VERSION" "0.9"; then
-   $MAKE regtest
+   $MAKE --keep-going regtest
 fi
 
+# Copy tap logs for the jenkins tap parser
+rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap"
+
 # Cleanup
 $MAKE clean
 
 # Cleanup rpath in executables and shared libraries
-#find $WORKSPACE/build/bin -type f -perm -0500 -exec chrpath --delete {} \;
 find "$PREFIX/lib" -name "*.so" -exec chrpath --delete {} \;
 
 # Remove libtool .la files
@@ -232,7 +239,7 @@ find "$PREFIX/lib" -name "*.la" -exec rm -f {} \;
 # Cleanup temp directory of dist build
 if [ "$build" = "dist" ]; then
     cd "$SRCDIR"
-    rm -rf "$BUILD_PATH"
+    rm -rf "$BUILDDIR"
 fi
 
 # EOF
-- 
2.34.1