From 3579dc143a3efb98fd0f0a667b52920f62a73523 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 16 Jul 2019 17:54:39 -0400 Subject: [PATCH] jjb: Update lttng-ust jobs Signed-off-by: Michael Jeanson --- jobs/lttng-ust.yaml | 85 +++-------- scripts/lttng-ust/build.sh | 283 +++++++++++++++++++++++++----------- scripts/lttng-ust/pylint.sh | 1 - 3 files changed, 221 insertions(+), 148 deletions(-) delete mode 100755 scripts/lttng-ust/pylint.sh diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml index 290452f..b880469 100644 --- a/jobs/lttng-ust.yaml +++ b/jobs/lttng-ust.yaml @@ -79,7 +79,7 @@ which-build: last-successful stable: false filter: 'build/**' - target: 'deps/liburcu' + target: 'deps' do-not-fingerprint: true - conditional-step: @@ -93,7 +93,7 @@ which-build: last-successful stable: false filter: 'build/**' - target: 'deps/liburcu' + target: 'deps' do-not-fingerprint: true - shell: !include-raw-escape: scripts/lttng-ust/build.sh @@ -114,7 +114,7 @@ total-normal: 0 total-low: 0 - archive: - artifacts: 'build/**' + artifacts: 'build/**,tap/**' allow-empty: false - workspace-cleanup - email-ext: @@ -227,66 +227,15 @@ artifacts: 'analysis-results.tgz,cov-int/**' allow-empty: false -# TODO -- job-template: - name: lttng-ust_{version}_pylint - defaults: lttng-ust - node: 'amd64' - scm: [] +## Views +- view-template: + name: 'LTTng-ust' + view-type: list + regex: 'lttng-ust[-_].*' - triggers: - - pollscm: - cron: "@daily" - - builders: - - copyartifact: - project: lttng-ust-{version}/arch=amd64,build=std,conf=agents - which-build: last-successful - stable: false - filter: 'build/**' - target: 'deps/lttng-ust' - do-not-fingerprint: true - - shell: - !include-raw-escape: scripts/lttng-ust/pylint.sh - publishers: - - archive: - artifacts: 'pep8.out,pylint.out' - - violations: - pep8: - pattern: pep8.out - min: 10 - max: 999 - unstable: 999 - pylint: - pattern: pylint.out - min: 10 - max: 999 - unstable: 999 - - email-ext: - recipients: '{obj:email_to}' - always: false - unstable: false - first-failure: true - first-unstable: true - not-built: false - aborted: false - regression: false - failure: false - second-failure: false - improvement: false - still-failing: false - success: false - fixed: false - fixed-unhealthy: true - still-unstable: false - pre-build: false - matrix-trigger: only-parent - send-to: - - recipients - -## Project +## Projects - project: name: lttng-ust github_user: lttng @@ -303,19 +252,19 @@ arch: !!python/tuple [amd64] build: !!python/tuple [std, dist, oot, oot-dist] conf: !!python/tuple [std, agents, debug-rcu] - liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, master] + liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, stable-0.11, master] - 'lttng-ust_{version}_{buildtype}': buildtype: portbuild arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] build: !!python/tuple [std] conf: !!python/tuple [std, agents] - liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, master] + liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, stable-0.11, master] - 'lttng-ust_{version}_{buildtype}': buildtype: slesbuild arch: !!python/tuple [sles12sp2] build: !!python/tuple [std] conf: !!python/tuple [std] - liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, master] + liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.11, master] - 'lttng-ust_{version}_cppcheck' - 'lttng-ust_{version}_scan-build' - 'lttng-ust_{version}_{buildtype}': @@ -324,21 +273,21 @@ arch: !!python/tuple [amd64] build: !!python/tuple [std, dist, oot, oot-dist] conf: !!python/tuple [std, agents, debug-rcu] - liburcu_version: !!python/tuple [master] + liburcu_version: !!python/tuple [stable-0.11, master] - 'lttng-ust_{version}_{buildtype}': buildtype: portbuild version: master arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] build: !!python/tuple [std] conf: !!python/tuple [std, agents] - liburcu_version: !!python/tuple [master] + liburcu_version: !!python/tuple [stable-0.11, master] - 'lttng-ust_{version}_{buildtype}': buildtype: slesbuild version: master arch: !!python/tuple [sles12sp2] build: !!python/tuple [std] conf: !!python/tuple [std] - liburcu_version: !!python/tuple [master] + liburcu_version: !!python/tuple [stable-0.11, master] - 'lttng-ust_{version}_cppcheck': version: master - 'lttng-ust_{version}_scan-build': @@ -355,3 +304,7 @@ conf: !!python/tuple [std] liburcu_version: !!python/tuple [stable-0.9] +- project: + name: liburcu-views + views: + - LTTng-ust diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh index 8c6e47c..7dd809a 100755 --- a/scripts/lttng-ust/build.sh +++ b/scripts/lttng-ust/build.sh @@ -1,7 +1,7 @@ #!/bin/bash -exu # -# Copyright (C) 2015, Jonathan Rajotte-Julien -# 2016, Michael Jeanson +# Copyright (C) 2015 Jonathan Rajotte-Julien +# 2016-2019 Michael Jeanson # # 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 @@ -16,173 +16,294 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +# Version compare functions +vercomp () { + set +u + if [[ "$1" == "$2" ]]; then + return 0 + fi + local IFS=. + local i ver1=($1) ver2=($2) + # fill empty fields in ver1 with zeros + for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do + ver1[i]=0 + done + for ((i=0; i<${#ver1[@]}; i++)); do + if [[ -z ${ver2[i]} ]]; then + # fill empty fields in ver2 with zeros + ver2[i]=0 + fi + if ((10#${ver1[i]} > 10#${ver2[i]})); then + return 1 + fi + if ((10#${ver1[i]} < 10#${ver2[i]})); then + return 2 + fi + done + set -u + return 0 +} + +verlte() { + vercomp "$1" "$2"; local res="$?" + [ "$res" -eq "0" ] || [ "$res" -eq "2" ] +} + +verlt() { + vercomp "$1" "$2"; local res="$?" + [ "$res" -eq "2" ] +} + +vergte() { + vercomp "$1" "$2"; local res="$?" + [ "$res" -eq "0" ] || [ "$res" -eq "1" ] +} + +vergt() { + vercomp "$1" "$2"; local res="$?" + [ "$res" -eq "1" ] +} + +verne() { + vercomp "$1" "$2"; local res="$?" + [ "$res" -ne "0" ] +} + # Required parameters arch=${arch:-} conf=${conf:-} build=${build:-} +cc=${cc:-} + +DEPS_INC="$WORKSPACE/deps/build/include" +DEPS_LIB="$WORKSPACE/deps/build/lib" -# liburcu -URCU_INCS="$WORKSPACE/deps/liburcu/build/include/" -URCU_LIBS="$WORKSPACE/deps/liburcu/build/lib/" +export LD_LIBRARY_PATH="$DEPS_LIB:${LD_LIBRARY_PATH:-}" +export CPPFLAGS="-I$DEPS_INC" +export LDFLAGS="-L$DEPS_LIB" SRCDIR="$WORKSPACE/src/lttng-ust" TMPDIR="$WORKSPACE/tmp" -PREFIX="$WORKSPACE/build" +PREFIX="/build" -# Create build and tmp directories -rm -rf "$PREFIX" "$TMPDIR" -mkdir -p "$PREFIX" "$TMPDIR" +# Create tmp directory +rm -rf "$TMPDIR" +mkdir -p "$TMPDIR" export TMPDIR export CFLAGS="-g -O2" +# Set compiler variables +case "$cc" in +gcc) + export CC=gcc + export CXX=g++ + ;; +gcc-4.8) + export CC=gcc-4.8 + export CXX=g++-4.8 + ;; +gcc-5) + export CC=gcc-5 + export CXX=g++-5 + ;; +gcc-6) + export CC=gcc-6 + export CXX=g++-6 + ;; +gcc-7) + export CC=gcc-7 + export CXX=g++-7 + ;; +gcc-8) + export CC=gcc-8 + export CXX=g++-8 + ;; +clang) + export CC=clang + export CXX=clang++ + ;; +clang-3.9) + export CC=clang-3.9 + export CXX=clang++-3.9 + ;; +clang-4.0) + export CC=clang-4.0 + export CXX=clang++-4.0 + ;; +clang-5.0) + export CC=clang-5.0 + export CXX=clang++-5.0 + ;; +clang-6.0) + export CC=clang-6.0 + export CXX=clang++-6.0 + ;; +clang-7) + export CC=clang-7 + export CXX=clang++-7 + ;; +*) + if [ "x$cc" != "x" ]; then + export CC="$cc" + fi + ;; +esac + +if [ "x${CC:-}" != "x" ]; then + echo "Selected compiler:" + "$CC" -v +fi + # Set platform variables case "$arch" in *) - MAKE=make - TAR=tar - NPROC=nproc - #BISON="bison" - #YACC="$BISON -y" - #CFLAGS="" - ;; + export MAKE=make + export TAR=tar + export NPROC=nproc + export PYTHON="python3" + export PYTHON_CONFIG="python3-config" + ;; esac -# Export time env. variables flags -export LD_LIBRARY_PATH="$URCU_LIBS:${LD_LIBRARY_PATH:-}" +# Enter the source directory +cd "$SRCDIR" -# Define flags -CPPFLAGS="-I$URCU_INCS" -LDFLAGS="-L$URCU_LIBS" +# Run bootstrap in the source directory prior to configure +./bootstrap +# Get source version from configure script +eval "$(grep '^PACKAGE_VERSION=' ./configure)" -# Set configure options for each build configuration -CONF_OPTS="" +# Set configure options and environment variables for each build +# configuration. +CONF_OPTS=("--prefix=$PREFIX") case "$conf" in static) # Unsupported! liblttng-ust can't pull in it's static (.a) dependencies. - echo "Static build" - CONF_OPTS="--enable-static --disable-shared" + echo "Static lib only configuration" + + CONF_OPTS+=("--enable-static" "--disable-shared") ;; agents) - echo "Enable Java agent build" - export CLASSPATH="/usr/share/java/log4j-1.2.jar" - CONF_OPTS+=" --enable-java-agent-all --enable-jni-interface" + echo "Java and Python agents configuration" - echo "Enable Python agent build" - CONF_OPTS+=" --enable-python-agent" + export CLASSPATH="/usr/share/java/log4j-1.2.jar" + CONF_OPTS+=("--enable-java-agent-all" "--enable-jni-interface" "--enable-python-agent") ;; debug-rcu) echo "Enable RCU sanity checks for debugging" - CPPFLAGS="${CPPFLAGS:-} -DDEBUG_RCU" + export CPPFLAGS="${CPPFLAGS} -DDEBUG_RCU" ;; *) - echo "Standard build" - CONF_OPTS="" + echo "Standard configuration" ;; esac -# Enter the source directory -cd "$SRCDIR" - -# Run bootstrap in the source directory prior to configure -./bootstrap - - # Build type # oot : out-of-tree build # dist : build via make dist # oot-dist: build via make dist out-of-tree # * : 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 directory 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" + # Create and enter a temporary build directory + builddir=$(mktemp -d) + cd "$builddir" - CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS + "$SRCDIR/configure" "${CONF_OPTS[@]}" ;; dist) - echo "Distribution tarball in-tree build" + echo "Distribution in-tree build" - # Initial configure and generate tarball - CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" "$SRCDIR/configure" + # Run configure and generate the tar file + # in the source directory + ./configure $MAKE dist - BUILD_PATH="$(mktemp -d)" - cp ./*.tar.* "$BUILD_PATH/" - cd "$BUILD_PATH" + # Create and enter a temporary build directory + builddir=$(mktemp -d) + cd "$builddir" - # Ignore level 1 of tar - $TAR xvf ./*.tar.* --strip 1 + # Extract the distribution tar in the build directory, + # ignore the first directory level + $TAR xvf "$SRCDIR"/*.tar.* --strip 1 # Build in extracted source tree - CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS + ./configure "${CONF_OPTS[@]}" ;; oot-dist) - echo "Distribution tarball out of tree build" - BUILD_PATH="$(mktemp -d)" - cd "$BUILD_PATH" + echo "Distribution out of tree build" - # Initial configure and generate tarball - CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" "$SRCDIR/configure" + # Create and enter a temporary build directory + builddir=$(mktemp -d) + cd "$builddir" + + # Run configure out of tree and generate the tar file + "$SRCDIR/configure" $MAKE dist - NEWSRC_PATH="$(mktemp -d)" - cp ./*.tar.* "$NEWSRC_PATH/" - cd "$NEWSRC_PATH" + dist_srcdir="$(mktemp -d)" + cd "$dist_srcdir" - # Ignore level 1 of tar - $TAR xvf ./*.tar.* --strip 1 + # Extract the distribution tar in the new source directory, + # ignore the first directory level + $TAR xvf "$builddir"/*.tar.* --strip 1 - BUILD_PATH="$(mktemp -d)" - cd "$BUILD_PATH" + # Create and enter a second temporary build directory + builddir="$(mktemp -d)" + cd "$builddir" - # Build oot from extracted sources - CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" "$NEWSRC_PATH/configure" --prefix="$PREFIX" $CONF_OPTS + # Run configure from the extracted distribution tar, + # out of the source tree + "$dist_srcdir/configure" "${CONF_OPTS[@]}" ;; *) echo "Standard in-tree build" - CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS + ./configure "${CONF_OPTS[@]}" ;; esac +# We are now inside a configured build directory + # BUILD! $MAKE -j "$($NPROC)" V=1 -$MAKE install -# Run tests +# Install in the workspace +$MAKE install DESTDIR="$WORKSPACE" + +# Run tests, don't fail now, we want to run the archiving steps +set +e $MAKE --keep-going check +ret=$? +set -e -# Copy tap logs for the jenkins tap parser +# Copy tap logs for the jenkins tap parser before cleaning the build dir rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap" # Clean the build directory $MAKE clean # Cleanup rpath in executables and shared libraries -find "$PREFIX/lib" -name "*.so" -exec chrpath --delete {} \; +find "$WORKSPACE/$PREFIX/bin" -type f -perm -0500 -exec chrpath --delete {} \; +find "$WORKSPACE/$PREFIX/lib" -name "*.so" -exec chrpath --delete {} \; # Remove libtool .la files -find "$PREFIX/lib" -name "*.la" -exec rm -f {} \; +find "$WORKSPACE/$PREFIX/lib" -name "*.la" -exec rm -f {} \; -# Clean temp dir for dist build -if [ "$build" = "dist" ]; then - cd "$SRCDIR" - rm -rf "$BUILD_PATH" -fi +# Exit with the return code of the test suite +exit $ret # EOF diff --git a/scripts/lttng-ust/pylint.sh b/scripts/lttng-ust/pylint.sh deleted file mode 100755 index 4640904..0000000 --- a/scripts/lttng-ust/pylint.sh +++ /dev/null @@ -1 +0,0 @@ -# TODO -- 2.34.1