X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=dab22cffaf81a10b1a9f48983147e8db88e9e490;hb=4f5133bef6efe19f0f9b3862c1fb5929d2f62358;hp=e24d1823bd186c017dca3c037ccb0733d0379784;hpb=1f4fba8c3ff773bb4dfc8ba3d911a2ffe70c323c;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index e24d182..dab22cf 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
@@ -26,12 +23,18 @@
           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}
 
@@ -159,12 +162,15 @@
           branches:
             - origin/{version}
           basedir: lttng-ust-java-tests
+          skip-tag: true
 
     triggers:
       - pollscm:
           cron: "@daily"
 
     properties:
+      - build-discarder:
+          num-to-keep: 2
       - github:
           url: https://github.com/lttng/lttng-ust-java-tests
 
@@ -248,7 +254,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:
@@ -279,7 +285,7 @@
           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:
@@ -373,7 +379,9 @@
     github_user: lttng
     github_name: lttng-ust
     version:
-      !include: jobs/inc/lttng-ust-versions.yaml.inc
+      - stable-2.7
+      - stable-2.8
+      - master
     jobs:
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build