jobs: tweak build-discarder values

Remove num-to-keep from most jobs, as this leads to keeping the build
logs for a much shorter timeline than desired. For example the
gerrit-binpkgs-deb job that runs for most projects when pushing patches
to jenkins reaches the 120 limit in less than 24h - and so when clicking
the link on a failed build from yesterday it is already deleted.

Instead just keep the logs for the last 30 days, no matter how many were
submitted on one day. Storing logs doesn't take up much space.

Remove the artifact-days-to-keep and artifact-num-to-keep lines, as they
don't have an effect. For jobs that do have artifacts, the actual value
is min(days-to-keep,artifact-days-to-keep) and same with num-to-keep.

While at it, increase the ttcn3-testsuites build-discarder to 120 days
as this means more data will show up in the test result analyzer at
which we look frequently.

Change-Id: Iec5c22c7fcf6c1fd2db71611045f15dc6580ed86
---
M jobs/coverity.yml
M jobs/gerrit-binpkgs.yml
M jobs/gerrit-lint.yml
M jobs/gerrit-pipeline-endianness.yml
M jobs/gerrit-verifications-comment.yml
M jobs/gerrit-verifications-dahdi.yml
M jobs/gerrit-verifications.yml
M jobs/master-builds-dahdi.yml
M jobs/master-builds.yml
M jobs/octsim_osmo-ccid-firmware.yml
M jobs/ttcn3-testsuites-kernel-git.yml
M jobs/ttcn3-testsuites.yml
M jobs/update-osmo-ci-on-slaves.yml
M jobs/update-osmo-python-on-slaves.yml
14 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/jobs/coverity.yml b/jobs/coverity.yml
index 242d1aa..277bbf0 100644
--- a/jobs/coverity.yml
+++ b/jobs/coverity.yml
@@ -22,7 +22,6 @@
     properties:
       - build-discarder:
           days-to-keep: 30
-          num-to-keep: 30
     parameters:
       - string:
           name: BRANCH
diff --git a/jobs/gerrit-binpkgs.yml b/jobs/gerrit-binpkgs.yml
index 247ebad..49a2b48 100644
--- a/jobs/gerrit-binpkgs.yml
+++ b/jobs/gerrit-binpkgs.yml
@@ -19,9 +19,6 @@
     properties:
       - build-discarder:
           days-to-keep: 30
-          num-to-keep: 120
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
     description: |
       {type} package job of CI for patches sent to
       <a href="https://gerrit.osmocom.org">gerrit</a>
diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml
index 7b537b9..b0c9c06 100644
--- a/jobs/gerrit-lint.yml
+++ b/jobs/gerrit-lint.yml
@@ -16,9 +16,6 @@
     properties:
       - build-discarder:
           days-to-keep: 30
-          num-to-keep: 120
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
     description: |
       Lint job of CI for patches sent to <a href="https://gerrit.osmocom.org">gerrit</a>.
       </br></br>
diff --git a/jobs/gerrit-pipeline-endianness.yml b/jobs/gerrit-pipeline-endianness.yml
index 809cce6..c9904f4 100644
--- a/jobs/gerrit-pipeline-endianness.yml
+++ b/jobs/gerrit-pipeline-endianness.yml
@@ -15,9 +15,6 @@
     properties:
       - build-discarder:
           days-to-keep: 30
-          num-to-keep: 120
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
     description: |
       Run <code>struct_endianness.py</code> from libosmocore.git on patches
       sent to <a href="https://gerrit.osmocom.org">gerrit</a>.
diff --git a/jobs/gerrit-verifications-comment.yml b/jobs/gerrit-verifications-comment.yml
index f781bf8..046c986 100644
--- a/jobs/gerrit-verifications-comment.yml
+++ b/jobs/gerrit-verifications-comment.yml
@@ -15,9 +15,6 @@
     properties:
       - build-discarder:
           days-to-keep: 30
-          num-to-keep: 120
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
     description: |
       Send start and result comments to <a href="https://gerrit.osmocom.org">gerrit</a>.
       </br></br>
diff --git a/jobs/gerrit-verifications-dahdi.yml b/jobs/gerrit-verifications-dahdi.yml
index d594378..526dc78 100644
--- a/jobs/gerrit-verifications-dahdi.yml
+++ b/jobs/gerrit-verifications-dahdi.yml
@@ -16,9 +16,6 @@
     properties:
       - build-discarder:
           days-to-keep: 30
-          num-to-keep: 120
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
     description: |
       Pending gerrit code reviews of
       <a href="https://gerrit.osmocom.org/#/q/status:open+project:dahdi-linux">dahdi-linux</a>
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 2bd9296..9ab2d48 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -627,9 +627,6 @@
     properties:
       - build-discarder:
           days-to-keep: 30
-          num-to-keep: 120
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
     description: |
       Pipeline of CI for patches sent to
       <a href="https://gerrit.osmocom.org/#/q/status:open+project:{repos}">{repos}</a>
@@ -680,9 +677,6 @@
     properties:
       - build-discarder:
           days-to-keep: 30
-          num-to-keep: 120
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
     description: |
       Build job of CI for patches sent to
       <a href="https://gerrit.osmocom.org/#/q/status:open+project:{repos}">{repos}</a>
diff --git a/jobs/master-builds-dahdi.yml b/jobs/master-builds-dahdi.yml
index b152805..068c92d 100644
--- a/jobs/master-builds-dahdi.yml
+++ b/jobs/master-builds-dahdi.yml
@@ -16,9 +16,6 @@
     properties:
       - build-discarder:
           days-to-keep: 30
-          num-to-keep: 120
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
     description: |
       Automatic jenkins test job of
       <a href="https://gerrit.osmocom.org/#/q/status:open+project:dahdi-linux">dahdi-linux</a>
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index ab1a0e2..9e0aa1b 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -517,9 +517,6 @@
     properties:
       - build-discarder:
           days-to-keep: 30
-          num-to-keep: 120
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
     description: |
       Automatic jenkins test job of
       <a href="{git_base_url}/{repos}">{repos}</a>
diff --git a/jobs/octsim_osmo-ccid-firmware.yml b/jobs/octsim_osmo-ccid-firmware.yml
index 17e3cef..efabe57 100644
--- a/jobs/octsim_osmo-ccid-firmware.yml
+++ b/jobs/octsim_osmo-ccid-firmware.yml
@@ -35,10 +35,7 @@
         queue-scanning: DISABLED
         use-build-blocker: false
     - build-discarder:
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
         days-to-keep: 30
-        num-to-keep: 120
     - rebuild:
         auto-rebuild: false
         rebuild-disabled: false
diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml
index fbed5ea..ce7dd26 100644
--- a/jobs/ttcn3-testsuites-kernel-git.yml
+++ b/jobs/ttcn3-testsuites-kernel-git.yml
@@ -116,9 +116,6 @@
     properties:
     - build-discarder:
         days-to-keep: 30
-        num-to-keep: 120
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
     wrappers:
     - ansicolor:
         colormap: xterm
diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index cac271f..9500662 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -384,10 +384,7 @@
           only-if-success: false
     properties:
     - build-discarder:
-        days-to-keep: 30
-        num-to-keep: 120
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
+        days-to-keep: 120
     wrappers:
     - ansicolor:
         colormap: xterm
diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml
index 8ab1e12..749f5b1 100644
--- a/jobs/update-osmo-ci-on-slaves.yml
+++ b/jobs/update-osmo-ci-on-slaves.yml
@@ -18,7 +18,6 @@
     properties:
       - build-discarder:
           days-to-keep: 30
-          num-to-keep: 120
     scm:
       - git:
           url: https://gerrit.osmocom.org/osmo-ci
diff --git a/jobs/update-osmo-python-on-slaves.yml b/jobs/update-osmo-python-on-slaves.yml
index 4a2afbc..8efb141 100644
--- a/jobs/update-osmo-python-on-slaves.yml
+++ b/jobs/update-osmo-python-on-slaves.yml
@@ -15,7 +15,6 @@
     properties:
       - build-discarder:
           days-to-keep: 30
-          num-to-keep: 120
     scm:
       - git:
           url: https://gerrit.osmocom.org/python/osmo-python-tests

