X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=c2208bc2993afdfc68f91976cc491caef5ce57e6;hb=62c509037827a9d16bfbb1c9cd2e7ead4b4ab9fc;hp=a140cd67edf1e16a2a30775eec2f45e0d835b84e;hpb=d2c76ee58ef3d473a7d4f53163a1fd6e1b7653ab;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index a140cd6..c2208bc 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -10,9 +10,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        numToKeep: 2
-
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -25,12 +22,19 @@
           browser-url: https://github.com/{github_user}/{github_name}
           branches:
             - origin/{version}
+          basedir: src/lttng-ust
+          skip-tag: true
 
     triggers:
       - pollscm:
           cron: "@hourly"
 
     properties:
+      - inject:
+          properties-content: |
+            PROJECT_NAME=lttng-ust
+      - build-discarder:
+          num-to-keep: 2
       - github:
           url: https://github.com/{github_user}/{github_name}
 
@@ -68,7 +72,7 @@
       - copyartifact:
           project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=std,build=std
           which-build: last-successful
-          stable: true
+          stable: false
           filter: 'build/**'
           target: 'deps/liburcu'
           do-not-fingerprint: true
@@ -78,7 +82,7 @@
     # 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:
@@ -112,7 +116,7 @@
     builders:
       - shell: |
           rm -f lttng-ust-cppcheck.xml
-          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE 2> lttng-ust-cppcheck.xml
+          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/lttng-ust 2> lttng-ust-cppcheck.xml
 
     publishers:
       - archive:
@@ -138,12 +142,12 @@
       - copyartifact:
           project: liburcu_master_build/arch=x86-64,conf=std,build=std
           which-build: last-successful
-          stable: true
+          stable: false
           filter: 'build/**'
           target: 'deps/liburcu'
           do-not-fingerprint: true
       - shell:
-          !include-raw-escape: scripts/lttng-ust/scan-build.sh
+          !include-raw-escape: scripts/common/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -175,7 +179,7 @@
       - copyartifact:
           project: liburcu_master_build/arch=x86-64,conf=std,build=std
           which-build: last-successful
-          stable: true
+          stable: false
           filter: 'build/**'
           target: 'deps/liburcu'
           do-not-fingerprint: true
@@ -184,6 +188,9 @@
 
     publishers:
       - workspace-cleanup
+      - archive:
+          artifacts: 'analysis-results.tgz,cov-int/**'
+          allow-empty: false
 
 # TODO
 - job-template:
@@ -199,9 +206,9 @@
 
     builders:
        - copyartifact:
-           project: lttng-ust-{version}/arch=x86-64,build=std,conf=python-agent
+           project: lttng-ust-{version}/arch=x86-64,build=std,conf=agents
            which-build: last-successful
-           stable: true
+           stable: false
            filter: 'build/**'
            target: 'deps/lttng-ust'
            do-not-fingerprint: true
@@ -234,18 +241,21 @@
     github_user: lttng
     github_name: lttng-ust
     version:
-      !include: jobs/inc/lttng-ust-versions.yaml.inc
+      - stable-2.7
+      - stable-2.8
+      - stable-2.9
+      - master
     jobs:
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build
           arch: !!python/tuple [x86-32, x86-64]
-          build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, java-agent, python-agent]
+          build: !!python/tuple [std, dist, oot, oot-dist]
+          conf: !!python/tuple [std, agents]
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, java-agent, python-agent]
+          conf: !!python/tuple [std, agents]
       - 'lttng-ust_{version}_cppcheck'
       - 'lttng-ust_{version}_scan-build'
       - 'lttng-ust_{version}_coverity':