From 7671741cd1f87b177d8f9568b98accd91524777b Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 27 Jun 2016 17:44:22 -0400 Subject: [PATCH] jjb: add lttng-tools jgalar dev jobs Signed-off-by: Michael Jeanson --- jobs/lttng-tools.yaml | 78 +++++++++++++++++++++++++++++++----- scripts/lttng-tools/build.sh | 39 +++++++++--------- 2 files changed, 89 insertions(+), 28 deletions(-) diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index c0caa8e..0870252 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -35,8 +35,9 @@ ## Templates -- job-template: - name: lttng-tools_{version}_{buildtype} + +- lttng-tools_version_buildtype_anchor: <tng-tools_version_buildtype_anchor + name: 'lttng-tools_version_buildtype_anchor' defaults: lttng-tools project-type: matrix @@ -76,13 +77,6 @@ matrix-builds: false matrix-configs: true - triggers: - - pollscm: - cron: "@hourly" - - reverse: - jobs: 'lttng-ust_{version}_{buildtype}' - result: 'success' - builders: - conditional-step: condition-kind: regex-match @@ -168,7 +162,17 @@ - shell: !include-raw-escape: scripts/lttng-tools/build.sh - # TODO: Scan for open tasks + +- job-template: + name: lttng-tools_{version}_{buildtype} + <<: *lttng-tools_version_buildtype_anchor + triggers: + - pollscm: + cron: "@hourly" + - reverse: + jobs: 'lttng-ust_{version}_{buildtype}' + result: 'success' + publishers: - tap: results: 'tap/**/*.tap' @@ -194,6 +198,27 @@ - name: '#lttng' +- job-template: + name: dev_{user}_lttng-tools_{version}_{buildtype} + <<: *lttng-tools_version_buildtype_anchor + + publishers: + - 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)' + total-thresholds: + unstable: + total-all: 0 + total-high: 0 + total-normal: 0 + total-low: 0 + - workspace-cleanup + + - job-template: name: lttng-tools_{version}_cppcheck defaults: lttng-tools @@ -393,6 +418,39 @@ conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent] urcuversion: !!python/tuple [stable-0.9] babelversion: !!python/tuple [stable-1.3] + - 'dev_{user}_lttng-tools_{version}_{buildtype}': + user: jgalar + github_user: jgalar + github_name: lttng-tools + buildtype: build + version: master-staging + 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] + - 'dev_{user}_lttng-tools_{version}_{buildtype}': + user: jgalar + github_user: jgalar + github_name: lttng-tools + buildtype: build + version: stable-2.8-staging + 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.9] + babelversion: !!python/tuple [stable-1.4] + - 'dev_{user}_lttng-tools_{version}_{buildtype}': + user: jgalar + github_user: jgalar + github_name: lttng-tools + buildtype: build + version: stable-2.7-staging + 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.9] + babelversion: !!python/tuple [stable-1.3] - 'lttng-tools_{version}_cppcheck' - 'lttng-tools_{version}_scan-build': version: master diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index 09918ae..84de8fa 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -222,19 +222,21 @@ $MAKE install # Run tests if [ "$RUN_TESTS" = "yes" ]; then + cd tests + # Allow core dumps ulimit -c unlimited # Add 'babeltrace' binary to PATH - chmod +x $BABEL_BINS/babeltrace + 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 - mkdir -p $WORKSPACE/tap/fast_regression - mkdir -p $WORKSPACE/tap/with_bindings_regression + rm -rf "$WORKSPACE/tap" + mkdir -p "$WORKSPACE/tap" + mkdir -p "$WORKSPACE/tap/unit" + mkdir -p "$WORKSPACE/tap/fast_regression" + mkdir -p "$WORKSPACE/tap/with_bindings_regression" # Force the lttng-sessiond path to /bin/true to prevent the spawing of a # lttng-sessiond --daemonize on "lttng create" @@ -245,12 +247,11 @@ if [ "$RUN_TESTS" = "yes" ]; then # Run 'unit_tests', 2.8 and up has a new test suite if vergte "$PACKAGE_VERSION" "2.8"; then make check - rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap" + rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*'" $BUILD_PATH/tests/" "$WORKSPACE/tap" else - prove --merge -v --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true + 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 fi - - 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 "Tests disabled for 'no-ust'." @@ -258,30 +259,32 @@ if [ "$RUN_TESTS" = "yes" ]; then # Run 'with_bindings_regression' test suite for 'python-bindings' config if [ "$conf" = "python-bindings" ]; then - prove --merge -v --exec '' - < $WORKSPACE/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. - find $WORKSPACE/tap -name "meta.yml" -exec rm -f {} \; + find "$WORKSPACE/tap" -name "meta.yml" -exec rm -f {} \; # And also with files without extension, so rename all result to *.tap - find $WORKSPACE/tap/ -type f -exec mv {} {}.tap \; + find "$WORKSPACE/tap/" -type f -exec mv {} {}.tap \; + + cd - fi # Cleanup $MAKE clean # Cleanup rpath in executables and shared libraries -find $WORKSPACE/build/bin -type f -perm -0500 -exec chrpath --delete {} \; -find $WORKSPACE/build/lib -name "*.so" -exec chrpath --delete {} \; +find "$WORKSPACE/build/bin" -type f -perm -0500 -exec chrpath --delete {} \; +find "$WORKSPACE/build/lib" -name "*.so" -exec chrpath --delete {} \; # Remove libtool .la files -find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \; +find "$WORKSPACE/build/lib" -name "*.la" -exec rm -f {} \; # Clean temp dir for dist build if [ "$build" = "dist" ]; then - cd $WORKSPACE - rm -rf $BUILD_PATH + cd "$WORKSPACE" + rm -rf "$BUILD_PATH" fi # EOF -- 2.34.1