X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=fb164ea70eb9ab4a7334f948b1048c5b6c94831f;hb=bae34da327b86a31ed936e1304452f0b14ddecdb;hp=4ca3303d505a566a22b6d0c968e76cb7a6386f6d;hpb=556e87cc3414e50377bbdfb542755f1bc231450f;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 4ca3303..fb164ea 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -14,12 +14,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: -1
-        numToKeep: 2
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -33,12 +27,19 @@
           browser-url: https://github.com/{github_user}/{github_name}
           branches:
             - origin/{version}
+          basedir: src/babeltrace
+          skip-tag: true
 
     triggers:
       - pollscm:
           cron: "@hourly"
 
     properties:
+      - inject:
+          properties-content: |
+            PROJECT_NAME=babeltrace
+      - build-discarder:
+          num-to-keep: 2
       - github:
           url: https://github.com/{github_user}/{github_name}
 
@@ -75,14 +76,14 @@
     # TODO: Scan for open tasks
     publishers:
       - tap:
-          results: 'tap/**/*.tap'
+          results: 'tap/**/*.log'
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
           console-log-parsers:
             - 'GNU Make + GNU C Compiler (gcc)'
           total-thresholds:
-            failed:
+            unstable:
               total-all: 0
               total-high: 0
               total-normal: 0
@@ -101,26 +102,18 @@
     <<: *babeltrace_version_buildtype_anchor
     publishers:
       - tap:
-          results: 'tap/**/*.tap'
+          results: 'tap/**/*.log'
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
           console-log-parsers:
             - 'GNU Make + GNU C Compiler (gcc)'
           total-thresholds:
-            failed:
+            unstable:
               total-all: 0
               total-high: 0
               total-normal: 0
               total-low: 0
-      - ircbot:
-          strategy: new-failure-and-fixed
-          notify-committers: True
-          notify-fixers: True
-
-          matrix-notifier: only-configurations
-          channels:
-            - name: '#lttng'
 
 - job-template:
     name: babeltrace_{version}_cppcheck
@@ -133,7 +126,7 @@
     builders:
       - shell: |
           rm -f babeltrace-cppcheck.xml
-          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE 2> babeltrace-cppcheck.xml
+          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/babeltrace 2> babeltrace-cppcheck.xml
 
     publishers:
       - archive:
@@ -157,7 +150,7 @@
 
     builders:
       - shell:
-          !include-raw-escape: scripts/babeltrace/scan-build.sh
+          !include-raw-escape: scripts/common/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -190,6 +183,9 @@
 
     publishers:
       - workspace-cleanup
+      - archive:
+          artifacts: 'analysis-results.tgz,cov-int/**'
+          allow-empty: false
 
 - job-template:
     name: babeltrace_{version}_pylint
@@ -274,13 +270,20 @@
     github_user: efficios
     github_name: babeltrace
     version:
-      !include: jobs/inc/babeltrace-versions.yaml.inc
+      - stable-1.3
+      - stable-1.4
+      - master
     jobs:
       - 'babeltrace_{version}_{buildtype}':
           buildtype: build
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, static, python-bindings]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: clangbuild
+          arch: !!python/tuple [x86-32, x86-64]
+          build: !!python/tuple [clang]
+          conf: !!python/tuple [std, static]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: portbuild
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
@@ -291,8 +294,13 @@
           arch: !!python/tuple [solaris10, solaris11]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, static]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: macosxbuild
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, static]
           version:
-            - stable-1.3
+            - stable-1.4
             - master
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
@@ -314,8 +322,8 @@
           buildtype: build
           version:
             - master-staging
-            - stable-1.2-staging
             - stable-1.3-staging
+            - stable-1.4-staging
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, static, python-bindings]