X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=117cd0ae1050ec64e88882a87f5edb0549e0ae5e;hb=f3a9312d225a53fa23e35b7ef783ffaba272dd5b;hp=172b7cf50f4f254ae0293108a83009291d96def2;hpb=1d9e7aaad1f72016eb5ddbaa89082a160d66a7f2;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 172b7cf..117cd0a 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -14,9 +14,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        numToKeep: 2
-
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -30,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}
 
@@ -72,7 +76,7 @@
     # TODO: Scan for open tasks
     publishers:
       - tap:
-          results: 'tests/**/*.log'
+          results: 'tap/**/*.log'
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
@@ -98,7 +102,7 @@
     <<: *babeltrace_version_buildtype_anchor
     publishers:
       - tap:
-          results: 'tests/**/*.log'
+          results: 'tap/**/*.log'
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
@@ -122,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:
@@ -146,7 +150,7 @@
 
     builders:
       - shell:
-          !include-raw-escape: scripts/babeltrace/scan-build.sh
+          !include-raw-escape: scripts/common/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -179,6 +183,9 @@
 
     publishers:
       - workspace-cleanup
+      - archive:
+          artifacts: 'analysis-results.tgz,cov-int/**'
+          allow-empty: false
 
 - job-template:
     name: babeltrace_{version}_pylint
@@ -195,7 +202,7 @@
        - copyartifact:
            project: babeltrace_{version}_build/arch=x86-64,build=std,conf=python-bindings
            which-build: last-successful
-           stable: true
+           stable: false
            filter: 'build/**'
            target: 'deps/babeltrace'
        - shell:
@@ -263,7 +270,10 @@
     github_user: efficios
     github_name: babeltrace
     version:
-      !include: jobs/inc/babeltrace-versions.yaml.inc
+      - stable-1.3
+      - stable-1.4
+      - stable-1.5
+      - master
     jobs:
       - 'babeltrace_{version}_{buildtype}':
           buildtype: build
@@ -285,15 +295,14 @@
           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]
+          conf: !!python/tuple [std]
           version:
+            - stable-1.4
+            - stable-1.5
             - master
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
@@ -315,9 +324,22 @@
           buildtype: build
           version:
             - master-staging
-            - stable-1.2-staging
             - stable-1.3-staging
+            - stable-1.4-staging
+            - stable-1.5-staging
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, static, python-bindings]
+      - 'dev_{user}_babeltrace_{version}_{buildtype}':
+          user: jgalar
+          github_user: jgalar
+          github_name: babeltrace
+          buildtype: macosxbuild
+          version:
+            - master-staging
+            - stable-1.4-staging
+            - stable-1.5-staging
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]