X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=c0caa8e42111c07ec5ee5a081d736a61e1b2e55f;hb=edf727106a2ce2b9bfa7a83936eb0b14fe3c2582;hp=75d4be0452f8c2a86704e683b922530402506cfb;hpb=9159048912dfb2eb2499da1f568c1c32eec7c0ec;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 75d4be0..c0caa8e 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -10,12 +10,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: -1
-        numToKeep: 2
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -36,6 +30,8 @@
     properties:
       - github:
           url: https://github.com/{github_user}/{github_name}
+      - build-discarder:
+          num-to-keep: 2
 
 
 ## Templates
@@ -68,6 +64,10 @@
          values: '{obj:build}'
 
     properties:
+      - github:
+          url: https://github.com/{github_user}/{github_name}
+      - build-discarder:
+          num-to-keep: 2
       - throttle:
           max-per-node: 1
           option: 'category'
@@ -75,6 +75,7 @@
             - 'lttng-tools'
           matrix-builds: false
           matrix-configs: true
+
     triggers:
       - pollscm:
           cron: "@hourly"
@@ -340,7 +341,9 @@
     github_user: lttng
     github_name: lttng-tools
     version:
-      !include: jobs/inc/lttng-tools-versions.yaml.inc
+      - stable-2.7
+      - stable-2.8
+      - master
     jobs:
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
@@ -365,15 +368,15 @@
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
+          babelversion: !!python/tuple [stable-1.4]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.8
-          arch: !!python/tuple [armhf, arm64, powerpc]
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
+          babelversion: !!python/tuple [stable-1.4]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
           version: stable-2.7
@@ -390,22 +393,6 @@
           conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.3]
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: build
-          version: stable-2.6
-          arch: !!python/tuple [x86-32, x86-64]
-          build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, no-ust, python-bindings]
-          urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: portbuild
-          version: stable-2.6
-          arch: !!python/tuple [armhf, arm64, powerpc]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [std, no-ust, python-bindings]
-          urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
       - 'lttng-tools_{version}_cppcheck'
       - 'lttng-tools_{version}_scan-build':
           version: master
@@ -416,9 +403,6 @@
       - 'lttng-tools_{version}_scan-build':
           version: stable-2.7
           urcuversion: stable-0.9
-      - 'lttng-tools_{version}_scan-build':
-         version: stable-2.6
-         urcuversion: stable-0.9
       #- 'lttng-tools_{version}_pylint'
       - 'lttng-tools_{version}_coverity':
           version: master