From 9565443101589c6455b3aca9282830668ff175f6 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 16 Oct 2015 16:30:14 -0400 Subject: [PATCH] Multiples fix to jobs --- jobs/babeltrace.yaml | 8 +- jobs/liburcu.yaml | 3 +- jobs/lttng-analyses.yaml | 2 +- jobs/lttng-tools.yaml | 34 +++++--- jobs/lttng-ust.yaml | 11 +-- scripts/babeltrace/build.sh | 2 +- scripts/lttng-tools/build.sh | 153 ++++++++++++++++++++--------------- 7 files changed, 128 insertions(+), 85 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 75ea54f..ea2eaaf 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -61,7 +61,7 @@ values: - std - static - - python_bindings + - python-bindings - axis: type: user-defined name: build @@ -76,6 +76,7 @@ - tap: results: 'tap/**/*.tap' failed-tests-mark-build-as-failure: true + todo-is-failure: false - warnings: console-log-parsers: - 'GNU Make + GNU C Compiler (gcc)' @@ -89,6 +90,7 @@ artifacts: 'build/**' allow-empty: false - ircbot: + strategy: new-failure-and-fixed matrix-notifier: only-parent channels: - name: '#lttng' @@ -175,7 +177,7 @@ builders: - copyartifact: - project: babeltrace-{version}/arch=x86-64,build=std,conf=python_bindings + project: babeltrace-{version}/arch=x86-64,build=std,conf=python-bindings which-build: last-successful stable: true filter: 'build/**' @@ -215,7 +217,7 @@ build: !!python/tuple [std, oot, dist] - 'babeltrace_{version}_{buildtype}': buildtype: portbuild - arch: !!python/tuple [armhf, powerpc] + arch: !!python/tuple [armhf, powerpc, ppc64el] build: !!python/tuple [std] - 'babeltrace_{version}_cppcheck' - 'babeltrace_{version}_scan-build' diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml index f264f63..121ea52 100644 --- a/jobs/liburcu.yaml +++ b/jobs/liburcu.yaml @@ -99,6 +99,7 @@ artifacts: 'build/**' allow-empty: false - ircbot: + strategy: new-failure-and-fixed matrix-notifier: only-parent channels: - name: '#lttng' @@ -186,7 +187,7 @@ build: !!python/tuple [std, oot, dist] - 'liburcu_{version}_{buildtype}': buildtype: portbuild - arch: !!python/tuple [armhf, powerpc] + arch: !!python/tuple [armhf, powerpc, ppc64el] build: !!python/tuple [std] - 'liburcu_{version}_cppcheck' - 'liburcu_{version}_scan-build' diff --git a/jobs/lttng-analyses.yaml b/jobs/lttng-analyses.yaml index bf9511b..eff7b69 100644 --- a/jobs/lttng-analyses.yaml +++ b/jobs/lttng-analyses.yaml @@ -48,7 +48,7 @@ builders: - copyartifact: - project: babeltrace-master/arch=x86-64,build=std,conf=python_bindings + project: babeltrace-master/arch=x86-64,build=std,conf=python-bindings which-build: last-successful stable: true filter: 'build/**' diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index ca1e383..491ce5d 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -56,12 +56,7 @@ - axis: type: user-defined name: conf - values: - - std - #- static - - no_ust - - python_bindings - - java_agents + values: '{obj:conf}' - axis: type: user-defined name: liburcu_version @@ -75,6 +70,13 @@ name: build values: '{obj:build}' + properties: + - throttle: + max-per-node: 1 + option: 'category' + categories: + - 'lttng-tools' + builders: - conditional-step: condition-kind: regex-match @@ -106,7 +108,7 @@ - conditional-step: condition-kind: regex-match label: '$conf' - regex: (python_bindings|no_ust) + regex: (python-bindings|no-ust) on-evaluation-failure: run steps: - copyartifact: @@ -133,7 +135,7 @@ - conditional-step: condition-kind: regex-match label: '$conf' - regex: (java_agents) + regex: (java-agent|python-agent) on-evaluation-failure: run steps: - copyartifact: @@ -151,7 +153,7 @@ target: 'deps/babeltrace' do-not-fingerprint: true - copyartifact: - project: lttng-ust_{version}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=java-agent,build=std + project: lttng-ust_{version}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=${{conf}},build=std which-build: last-successful stable: true filter: 'build/**' @@ -165,6 +167,7 @@ - tap: results: 'tap/**/*.tap' failed-tests-mark-build-as-failure: true + todo-is-failure: false - warnings: console-log-parsers: - 'GNU Make + GNU C Compiler (gcc)' @@ -178,6 +181,11 @@ artifacts: 'build/**' allow-empty: false - workspace-cleanup + - ircbot: + strategy: new-failure-and-fixed + matrix-notifier: only-parent + channels: + - name: '#lttng' - job-template: @@ -332,13 +340,15 @@ version: master arch: !!python/tuple [x86-32, x86-64] build: !!python/tuple [std, oot, dist] + 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: portbuild version: master - arch: !!python/tuple [armhf, powerpc] + arch: !!python/tuple [armhf, powerpc, ppc64el] build: !!python/tuple [std] + conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent] urcuversion: !!python/tuple [master] babelversion: !!python/tuple [master] - 'lttng-tools_{version}_{buildtype}': @@ -346,6 +356,7 @@ version: stable-2.7 arch: !!python/tuple [x86-32, x86-64] build: !!python/tuple [std, oot, dist] + conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent] urcuversion: !!python/tuple [stable-0.8] babelversion: !!python/tuple [stable-1.2] - 'lttng-tools_{version}_{buildtype}': @@ -353,6 +364,7 @@ version: stable-2.7 arch: !!python/tuple [armhf, powerpc] build: !!python/tuple [std] + conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent] urcuversion: !!python/tuple [stable-0.8] babelversion: !!python/tuple [stable-1.2] - 'lttng-tools_{version}_{buildtype}': @@ -360,6 +372,7 @@ version: stable-2.6 arch: !!python/tuple [x86-32, x86-64] build: !!python/tuple [std, oot, dist] + conf: !!python/tuple [std, no-ust, python-bindings] urcuversion: !!python/tuple [stable-0.8] babelversion: !!python/tuple [stable-1.2] - 'lttng-tools_{version}_{buildtype}': @@ -367,6 +380,7 @@ version: stable-2.6 arch: !!python/tuple [armhf, powerpc] build: !!python/tuple [std] + conf: !!python/tuple [std, no-ust, python-bindings] urcuversion: !!python/tuple [stable-0.8] babelversion: !!python/tuple [stable-1.2] - 'lttng-tools_{version}_cppcheck' diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml index 25dc66e..09114e9 100644 --- a/jobs/lttng-ust.yaml +++ b/jobs/lttng-ust.yaml @@ -56,10 +56,7 @@ - axis: type: user-defined name: conf - values: - - std - - java-agent - - python-agent + values: '{obj:conf}' - axis: type: user-defined name: liburcu_version @@ -86,6 +83,7 @@ - tap: results: 'tap/**/*.tap' failed-tests-mark-build-as-failure: true + todo-is-failure: false - warnings: console-log-parsers: - 'GNU Make + GNU C Compiler (gcc)' @@ -100,6 +98,7 @@ allow-empty: false - workspace-cleanup - ircbot: + strategy: new-failure-and-fixed matrix-notifier: only-parent channels: - name: '#lttng' @@ -242,10 +241,12 @@ buildtype: build arch: !!python/tuple [x86-32, x86-64] build: !!python/tuple [std, oot, dist] + conf: !!python/tuple [std, java-agent, python-agent] - 'lttng-ust_{version}_{buildtype}': buildtype: portbuild - arch: !!python/tuple [armhf, powerpc] + arch: !!python/tuple [armhf, powerpc, ppc64el] build: !!python/tuple [std] + conf: !!python/tuple [std, java-agent, python-agent] - 'lttng-ust_{version}_cppcheck' - 'lttng-ust_{version}_scan-build' - 'lttng-ust_{version}_coverity': diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index b9dc041..3af49df 100755 --- a/scripts/babeltrace/build.sh +++ b/scripts/babeltrace/build.sh @@ -30,7 +30,7 @@ static) echo "Static build" CONF_OPTS="--enable-static --disable-shared" ;; -python_bindings) +python-bindings) echo "Build with python bindings" # We only support bindings built with Python 3 export PYTHON="python3" diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index b8f6576..926d4bc 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -21,6 +21,12 @@ rm -rf $WORKSPACE/build mkdir -p $WORKSPACE/build +PYTHON2=python2 +PYTHON3=python3 + +P2_VERSION=$($PYTHON2 -c "import sys;print(sys.version[:3])") +P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])") + # liburcu URCU_INCS="$WORKSPACE/deps/liburcu/build/include/" URCU_LIBS="$WORKSPACE/deps/liburcu/build/lib/" @@ -28,6 +34,9 @@ URCU_LIBS="$WORKSPACE/deps/liburcu/build/lib/" # lttng-ust UST_INCS="$WORKSPACE/deps/lttng-ust/build/include/" UST_LIBS="$WORKSPACE/deps/lttng-ust/build/lib/" +UST_JAVA="$WORKSPACE/deps/lttng-ust/build/share/java/" +UST_PYTHON2="$WORKSPACE/deps/lttng-ust/build/lib/python$P2_VERSION/site-packages" +UST_PYTHON3="$WORKSPACE/deps/lttng-ust/build/lib/python$P3_VERSION/site-packages" # babeltrace BABEL_INCS="$WORKSPACE/deps/babeltrace/build/include/" @@ -36,7 +45,7 @@ BABEL_BINS="$WORKSPACE/deps/babeltrace/build/bin/" PREFIX="$WORKSPACE/build" -if [ "$conf" = "no_ust" ] +if [ "$conf" = "no-ust" ] then export CPPFLAGS="-I$URCU_INCS" export LDFLAGS="-L$URCU_LIBS" @@ -51,25 +60,41 @@ fi CONF_OPTS="" case "$conf" in -static) - echo "Static build" - CONF_OPTS="--enable-static --disable-shared" - ;; -python_bindings) - echo "Build with python bindings" - # We only support bindings built with Python 3 - export PYTHON="python3" - export PYTHON_CONFIG="/usr/bin/python3-config" - CONF_OPTS="--enable-python-bindings" - ;; -no_ust) - echo "Build without UST support" - CONF_OPTS="--disable-lttng-ust" - ;; -*) - echo "Standard build" - CONF_OPTS="" - ;; + static) + echo "Static build" + CONF_OPTS="--enable-static --disable-shared" + ;; + + python-bindings) + echo "Build with python bindings" + # We only support bindings built with Python 3 + export PYTHON="python3" + export PYTHON_CONFIG="/usr/bin/python3-config" + CONF_OPTS="--enable-python-bindings" + ;; + + no-ust) + echo "Build without UST support" + CONF_OPTS="--disable-lttng-ust" + ;; + + java-agent) + echo "Build with Java Agents" + export JAVA_HOME="/usr/lib/jvm/default-java" + export CLASSPATH="$UST_JAVA/*:/usr/share/java/*" + CONF_OPTS="--enable-test-java-agent-all" + ;; + + python-agent) + echo "Build with python agents" + export PYTHONPATH="$UST_PYTHON2:$UST_PYTHON3" + CONF_OPTS="--enable-test-python-agent-all" + ;; + + *) + echo "Standard build" + CONF_OPTS="" + ;; esac # Build type @@ -82,35 +107,37 @@ esac BUILD_PATH=$WORKSPACE case "$build" in - oot) - echo "Out of tree build" - BUILD_PATH=$WORKSPACE/oot - mkdir -p $BUILD_PATH - cd $BUILD_PATH - $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS - ;; - dist) - echo "Distribution out of tree build" - BUILD_PATH=`mktemp -d` - - # Initial configure and generate tarball - ./configure - make dist - - mkdir -p $BUILD_PATH - cp *.tar.* $BUILD_PATH/ - cd $BUILD_PATH - - # Ignore level 1 of tar - tar xvf *.tar.* --strip 1 - - $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS - ;; - *) - BUILD_PATH=$WORKSPACE - echo "Standard tree build" - $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS - ;; + oot) + echo "Out of tree build" + BUILD_PATH=$WORKSPACE/oot + mkdir -p $BUILD_PATH + cd $BUILD_PATH + $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS + ;; + + dist) + echo "Distribution out of tree build" + BUILD_PATH=`mktemp -d` + + # Initial configure and generate tarball + ./configure $CONF_OPTS + make dist + + mkdir -p $BUILD_PATH + cp *.tar.* $BUILD_PATH/ + cd $BUILD_PATH + + # Ignore level 1 of tar + tar xvf *.tar.* --strip 1 + + $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS + ;; + + *) + BUILD_PATH=$WORKSPACE + echo "Standard tree build" + $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS + ;; esac @@ -121,9 +148,11 @@ make install # Allow core dumps ulimit -c unlimited +# Add 'babeltrace' binary to PATH chmod +x $BABEL_BINS/babeltrace export PATH="$PATH:$BABEL_BINS" +# Prepare tap output dirs rm -rf $WORKSPACE/tap mkdir -p $WORKSPACE/tap mkdir -p $WORKSPACE/tap/unit @@ -132,25 +161,19 @@ mkdir -p $WORKSPACE/tap/with_bindings_regression cd $BUILD_PATH/tests -if [ "$conf" = "std" ] -then - prove --merge --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true - prove --merge --exec '' - < $BUILD_PATH/tests/fast_regression --archive $WORKSPACE/tap/fast_regression/ || true -fi - -if [ "$conf" = "no_ust" ] -then +# Run 'unit_tests' and 'fast_regression' test suites for all configs except 'no-ust' +if [ "$conf" != "no-ust" ]; then + prove --merge -v --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true + prove --merge -v --exec '' - < $BUILD_PATH/tests/fast_regression --archive $WORKSPACE/tap/fast_regression/ || true +else # Regression is disabled for now, we need to adjust the testsuite for no ust builds. - echo "Testsuite disabled. See job configuration for more info." + echo "Testsuite disabled for 'no-ust'. See job configuration for more info." fi -if [ "$conf" = "python_bindings" ] +# Run 'with_bindings_regression' test suite for 'python-bindings' config +if [ "$conf" = "python-bindings" ] then - # Disabled due to race conditions in tests - echo "Testsuite disabled. See job configuration for more info." - prove --merge --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true - prove --merge --exec '' - < $BUILD_PATH/tests/fast_regression --archive $WORKSPACE/tap/fast_regression/ || true - prove --merge --exec '' - < $BUILD_PATH/tests/with_bindings_regression --archive $WORKSPACE/tap/with_bindings_regression/ || true + prove --merge -v --exec '' - < $WORKSPACE/tests/with_bindings_regression --archive $WORKSPACE/tap/with_bindings_regression/ || true fi # TAP plugin is having a hard time with .yml files. @@ -175,3 +198,5 @@ find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \; if [ $build = "dist" ]; then rm -rf $BUILD_PATH fi + +# EOF -- 2.34.1