From b6e62a6a751d22e7cd11b4586ffbaa15d2ded4ea Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 8 Aug 2016 17:41:21 -0400 Subject: [PATCH] jjb: Add macosxbuild and solarisbuild to lttng-tools Signed-off-by: Michael Jeanson --- jobs/lttng-tools.yaml | 48 ++++++++++++++++++++ scripts/lttng-tools/build.sh | 86 ++++++++++++++++++++++++++++-------- 2 files changed, 116 insertions(+), 18 deletions(-) diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index 9898efe..b5d5f09 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -22,6 +22,7 @@ browser-url: https://github.com/{github_user}/{github_name} branches: - origin/{version} + skip-tag: true triggers: - pollscm: @@ -161,6 +162,26 @@ filter: 'build/**' target: 'deps/lttng-ust' do-not-fingerprint: true + - conditional-step: + condition-kind: regex-match + label: '$conf' + regex: (relayd-only) + on-evaluation-failure: run + steps: + - copyartifact: + project: liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=std,build=std + which-build: last-successful + stable: true + filter: 'build/**' + target: 'deps/liburcu' + do-not-fingerprint: true + - copyartifact: + project: babeltrace_${{babeltrace_version}}_{buildtype}/arch=${{arch}},conf=std,build=std + which-build: last-successful + stable: true + filter: 'build/**' + target: 'deps/babeltrace' + do-not-fingerprint: true - shell: !include-raw-escape: scripts/lttng-tools/build.sh @@ -394,6 +415,24 @@ conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent] urcuversion: !!python/tuple [master] babelversion: !!python/tuple [master] + - 'lttng-tools_{version}_{buildtype}': + buildtype: macosxbuild + version: master + ustversion: master + arch: !!python/tuple [macosx] + build: !!python/tuple [std] + conf: !!python/tuple [relayd-only] + urcuversion: !!python/tuple [master] + babelversion: !!python/tuple [master] + - 'lttng-tools_{version}_{buildtype}': + buildtype: solarisbuild + version: master + ustversion: master + arch: !!python/tuple [solaris10, solaris11] + build: !!python/tuple [std] + conf: !!python/tuple [relayd-only] + urcuversion: !!python/tuple [master] + babelversion: !!python/tuple [master] - 'lttng-tools_{version}_{buildtype}': buildtype: build version: stable-2.8 @@ -412,6 +451,15 @@ conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent] urcuversion: !!python/tuple [stable-0.9] babelversion: !!python/tuple [stable-1.4] + - 'lttng-tools_{version}_{buildtype}': + buildtype: solarisbuild + version: stable-2.8 + ustversion: stable-2.8 + arch: !!python/tuple [solaris10, solaris11] + build: !!python/tuple [std] + conf: !!python/tuple [relayd-only] + urcuversion: !!python/tuple [stable-0.9] + babelversion: !!python/tuple [stable-1.4] - 'lttng-tools_{version}_{buildtype}': buildtype: build version: stable-2.7 diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index 84de8fa..e2bf145 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -17,26 +17,62 @@ # 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() { - [ "$1" = "`printf '%s\n%s' $1 $2 | sort -V | head -n1`" ] + vercomp "$1" "$2"; local res="$?" + [ "$res" -eq "0" ] || [ "$res" -eq "2" ] } verlt() { - [ "$1" = "$2" ] && return 1 || verlte $1 $2 + vercomp "$1" "$2"; local res="$?" + [ "$res" -eq "2" ] } vergte() { - [ "$1" = "`printf '%s\n%s' $1 $2 | sort -V | tail -n1`" ] + vercomp "$1" "$2"; local res="$?" + [ "$res" -eq "0" ] || [ "$res" -eq "1" ] } vergt() { - [ "$1" = "$2" ] && return 1 || vergte $1 $2 + vercomp "$1" "$2"; local res="$?" + [ "$res" -eq "1" ] +} + +verne() { + vercomp "$1" "$2"; local res="$?" + [ "$res" -ne "0" ] } # Create build directory -rm -rf $WORKSPACE/build -mkdir -p $WORKSPACE/build +rm -rf "$WORKSPACE/build" +mkdir -p "$WORKSPACE/build" # liburcu URCU_INCS="$WORKSPACE/deps/liburcu/build/include/" @@ -78,6 +114,19 @@ solaris11) export PATH="$PATH:/usr/perl5/bin" ;; +macosx) + MAKE=make + TAR=tar + NPROC="getconf _NPROCESSORS_ONLN" + BISON="bison" + YACC="$BISON -y" + RUN_TESTS="no" + + export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" + export CFLAGS="-I/opt/local/include" + export LDFLAGS="-L/opt/local/lib" + ;; + *) MAKE=make TAR=tar @@ -104,6 +153,7 @@ esac # Get source version from configure script eval `grep '^PACKAGE_VERSION=' ./configure` +PACKAGE_VERSION=`echo "$PACKAGE_VERSION"| sed 's/\-pre$//'` # Export build flags @@ -164,7 +214,7 @@ python-agent) relayd-only) echo "Build relayd only" - CONF_OPTS="--disable-bin-lttng --disable-bin-lttng-consumerd --disable-bin-lttng-crash --disable-bin-lttng-sessiond --disable-extras $NO_UST" + CONF_OPTS="--disable-bin-lttng --disable-bin-lttng-consumerd --disable-bin-lttng-crash --disable-bin-lttng-sessiond --disable-extras --disable-man-pages $NO_UST" ;; *) @@ -186,38 +236,38 @@ case "$build" in oot) echo "Out of tree build" BUILD_PATH=$WORKSPACE/oot - mkdir -p $BUILD_PATH - cd $BUILD_PATH - MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS + mkdir -p "$BUILD_PATH" + cd "$BUILD_PATH" + MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" "$WORKSPACE/configure" --prefix="$PREFIX" $CONF_OPTS ;; dist) echo "Distribution out of tree build" - BUILD_PATH=`mktemp -d` + BUILD_PATH="`mktemp -d`" # Initial configure and generate tarball MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" ./configure $CONF_OPTS --enable-build-man-pages $MAKE dist - mkdir -p $BUILD_PATH - cp *.tar.* $BUILD_PATH/ - cd $BUILD_PATH + mkdir -p "$BUILD_PATH" + cp ./*.tar.* "$BUILD_PATH/" + cd "$BUILD_PATH" # Ignore level 1 of tar - $TAR xvf *.tar.* --strip 1 + $TAR xvf ./*.tar.* --strip 1 - MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS + MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS ;; *) BUILD_PATH=$WORKSPACE echo "Standard tree build" - MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS + MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" "$WORKSPACE/configure" --prefix="$PREFIX" $CONF_OPTS ;; esac # BUILD! -$MAKE -j `$NPROC` V=1 +$MAKE -j "`$NPROC`" V=1 $MAKE install # Run tests -- 2.34.1