From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 22 Jun 2016 17:58:25 +0000 (-0400)
Subject: jjb: logrotate is deprecated
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=edf727106a2ce2b9bfa7a83936eb0b14fe3c2582;p=lttng-ci.git

jjb: logrotate is deprecated

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index b445b1e..97a2682 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -14,9 +14,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        numToKeep: 2
-
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -37,6 +34,8 @@
           cron: "@hourly"
 
     properties:
+      - build-discarder:
+          num-to-keep: 2
       - github:
           url: https://github.com/{github_user}/{github_name}
 
diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml
index aebd680..1ee7ffe 100644
--- a/jobs/liburcu.yaml
+++ b/jobs/liburcu.yaml
@@ -27,9 +27,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        numToKeep: 2
-
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -50,6 +47,8 @@
           cron: "@hourly"
 
     properties:
+      - build-discarder:
+          num-to-keep: 2
       - github:
           url: https://github.com/{github_user}/{github_name}
 
diff --git a/jobs/lttng-analyses.yaml b/jobs/lttng-analyses.yaml
index 39f57f5..2bb45ed 100644
--- a/jobs/lttng-analyses.yaml
+++ b/jobs/lttng-analyses.yaml
@@ -7,12 +7,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: -1
-        numToKeep: 2
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -33,6 +27,8 @@
           cron: "@hourly"
 
     properties:
+      - build-discarder:
+          num-to-keep: 2
       - github:
           url: https://github.com/{github_user}/{github_name}
 
diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml
index 32d4013..1b0c8fe 100644
--- a/jobs/lttng-modules.yaml
+++ b/jobs/lttng-modules.yaml
@@ -9,9 +9,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        numToKeep: 2
-
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -34,6 +31,8 @@
           cron: "@hourly"
 
     properties:
+      - build-discarder:
+          num-to-keep: 2
       - github:
           url: https://github.com/{github_user}/{github_name}
 
@@ -234,8 +233,6 @@
           description: 'The linux kernel git repository url.'
 
     concurrent: true
-    logrotate:
-      daysToKeep: 2
 
     scm:
       - git:
diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index cc15677..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"
diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index f30982a..b90d27c 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
@@ -32,6 +29,8 @@
           cron: "@hourly"
 
     properties:
+      - build-discarder:
+          num-to-keep: 2
       - github:
           url: https://github.com/{github_user}/{github_name}
 
@@ -165,6 +164,8 @@
           cron: "@daily"
 
     properties:
+      - build-discarder:
+          num-to-keep: 2
       - github:
           url: https://github.com/lttng/lttng-ust-java-tests
 
diff --git a/jobs/ops_job-generator_kernel.yaml b/jobs/ops_job-generator_kernel.yaml
index 61064c5..e4ed8ca 100644
--- a/jobs/ops_job-generator_kernel.yaml
+++ b/jobs/ops_job-generator_kernel.yaml
@@ -9,8 +9,10 @@
       <p>Job is managed by Jenkins Job Builder.</p>
 
     project-type: freestyle
-    logrotate:
-      numToKeep: 2
+
+    properties:
+      - build-discarder:
+          num-to-keep: 2
 
     wrappers:
       - timestamps
diff --git a/jobs/tracecompass.yml b/jobs/tracecompass.yml
index 3630e05..f9c049a 100644
--- a/jobs/tracecompass.yml
+++ b/jobs/tracecompass.yml
@@ -7,9 +7,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        numToKeep: 2
-
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -28,6 +25,8 @@
           cron: "@hourly"
 
     properties:
+      - build-discarder:
+          num-to-keep: 2
       - github:
           url: https://github.com/{github_user}/{github_name}