From 10c9bf80aefa84378fc37a4dfa57aa2509317afd Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 15 Dec 2021 13:26:15 -0500 Subject: [PATCH] jjb: librseq: Add gerrit job Signed-off-by: Michael Jeanson Change-Id: I89dc38ae5872ff12fdee5e1ba620c814eb55198d --- jobs/librseq.yaml | 82 +++++++++++++++++++++++++++++++++++++++- scripts/librseq/build.sh | 2 +- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/jobs/librseq.yaml b/jobs/librseq.yaml index b0b1f3f..97e45cb 100644 --- a/jobs/librseq.yaml +++ b/jobs/librseq.yaml @@ -104,6 +104,11 @@ - librseq_build_publishers_defaults: &librseq_build_publishers_defaults name: 'librseq_build_publishers_defaults' publishers: + - tap: + results: 'tap/**/*.log' + fail-if-no-results: true + failed-tests-mark-build-as-failure: true + todo-is-failure: false - warnings: console-log-parsers: - 'GNU Make + GNU C Compiler (gcc)' @@ -114,7 +119,7 @@ total-normal: 0 total-low: 0 - archive: - artifacts: 'build/**' + artifacts: 'build/**,tap/**' allow-empty: false - ircbot: strategy: new-failure-and-fixed @@ -144,6 +149,28 @@ send-to: - recipients +- librseq_build_publishers_gerrit: &librseq_build_publishers_gerrit + name: 'librseq_build_publishers_gerrit' + publishers: + - tap: + results: 'tap/**/*.log' + fail-if-no-results: true + failed-tests-mark-build-as-failure: true + todo-is-failure: false + - warnings: + console-log-parsers: + - 'GNU Make + GNU C Compiler (gcc)' + total-thresholds: + failed: + total-all: 0 + total-high: 0 + total-normal: 0 + total-low: 0 + - archive: + artifacts: 'build/**,tap/**' + allow-empty: false + + ## Templates - job-template: name: librseq_{version}_{buildtype} @@ -203,6 +230,48 @@ send-to: - recipients +- job-template: + name: dev_gerrit_librseq_{buildtype} + defaults: librseq + concurrent: true + + scm: + - git: + url: https://review.lttng.org/librseq + refspec: 'refs/changes/*:refs/changes/*' + branches: + - '$GERRIT_REFSPEC' + basedir: src/librseq + skip-tag: true + + triggers: + - gerrit: + trigger-on: + - comment-added-event: + approval-category: 'CI-Build' + approval-value: 1 + projects: + - project-compare-type: 'PLAIN' + project-pattern: 'librseq' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**' + + <<: *librseq_build_axes_defaults + <<: *librseq_build_builders_defaults + <<: *librseq_build_publishers_gerrit + + properties: + - inject: + properties-content: | + PROJECT_NAME=librseq + - build-discarder: + days-to-keep: 1 + - throttle: + option: 'category' + categories: + - 'gerrit-{buildtype}' + - job-template: name: librseq_{version}_scan-build defaults: librseq @@ -300,6 +369,17 @@ # - 'librseq_{version}_coverity': # version: master +- project: + name: gerrit-librseq + github_user: compudj + github_name: librseq + jobs: + - 'dev_gerrit_librseq_{buildtype}': + buildtype: build + arch: !!python/tuple [amd64] + build: !!python/tuple [std, oot, dist, oot-dist] + conf: !!python/tuple [std, static] + - project: name: librseq-views views: diff --git a/scripts/librseq/build.sh b/scripts/librseq/build.sh index 826cfa9..1a2d852 100755 --- a/scripts/librseq/build.sh +++ b/scripts/librseq/build.sh @@ -295,7 +295,7 @@ ret=$? set -e # 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" +rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap" # Clean the build directory $MAKE clean -- 2.34.1