X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=fb164ea70eb9ab4a7334f948b1048c5b6c94831f;hb=1b29d53bc7cc594d122e2eae0c1be4a738d35eef;hp=637a997318e4ff9b438bb5223b48960b957714a3;hpb=e6be9fb081c8e72001399813d032124d0117899d;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 637a997..fb164ea 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -14,9 +14,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        numToKeep: 2
-
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -31,12 +28,18 @@
           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}
 
@@ -123,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:
@@ -147,7 +150,7 @@
 
     builders:
       - shell:
-          !include-raw-escape: scripts/babeltrace/scan-build.sh
+          !include-raw-escape: scripts/common/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -180,6 +183,9 @@
 
     publishers:
       - workspace-cleanup
+      - archive:
+          artifacts: 'analysis-results.tgz,cov-int/**'
+          allow-empty: false
 
 - job-template:
     name: babeltrace_{version}_pylint
@@ -264,7 +270,9 @@
     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
@@ -286,15 +294,13 @@
           arch: !!python/tuple [solaris10, solaris11]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, static]
-          version:
-            - stable-1.3
-            - master
       - 'babeltrace_{version}_{buildtype}':
           buildtype: macosxbuild
           arch: !!python/tuple [macosx]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, static]
           version:
+            - stable-1.4
             - master
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
@@ -316,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]