From 719ff9760808acb1fe944f4c496c356c7dc07c91 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 7 Mar 2023 11:50:22 +0100 Subject: [PATCH] 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 --- jobs/coverity.yml | 1 - jobs/gerrit-binpkgs.yml | 3 --- jobs/gerrit-lint.yml | 3 --- jobs/gerrit-pipeline-endianness.yml | 3 --- jobs/gerrit-verifications-comment.yml | 3 --- jobs/gerrit-verifications-dahdi.yml | 3 --- jobs/gerrit-verifications.yml | 6 ------ jobs/master-builds-dahdi.yml | 3 --- jobs/master-builds.yml | 3 --- jobs/octsim_osmo-ccid-firmware.yml | 3 --- jobs/ttcn3-testsuites-kernel-git.yml | 3 --- jobs/ttcn3-testsuites.yml | 5 +---- jobs/update-osmo-ci-on-slaves.yml | 1 - jobs/update-osmo-python-on-slaves.yml | 1 - 14 files changed, 1 insertion(+), 40 deletions(-) diff --git a/jobs/coverity.yml b/jobs/coverity.yml index 242d1aa5..277bbf00 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 247ebad6..49a2b483 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 gerrit diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 7b537b9d..b0c9c064 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 gerrit.

diff --git a/jobs/gerrit-pipeline-endianness.yml b/jobs/gerrit-pipeline-endianness.yml index 809cce64..c9904f46 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 struct_endianness.py from libosmocore.git on patches sent to gerrit. diff --git a/jobs/gerrit-verifications-comment.yml b/jobs/gerrit-verifications-comment.yml index f781bf81..046c986c 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 gerrit.

diff --git a/jobs/gerrit-verifications-dahdi.yml b/jobs/gerrit-verifications-dahdi.yml index d594378c..526dc785 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 dahdi-linux diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 2bd9296c..9ab2d488 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 {repos} @@ -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 {repos} diff --git a/jobs/master-builds-dahdi.yml b/jobs/master-builds-dahdi.yml index b1528053..068c92d9 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 dahdi-linux diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index ab1a0e20..9e0aa1bb 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 {repos} diff --git a/jobs/octsim_osmo-ccid-firmware.yml b/jobs/octsim_osmo-ccid-firmware.yml index 17e3cef8..efabe57c 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 fbed5eaa..ce7dd260 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 cac271f7..95006621 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 8ab1e12c..749f5b11 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 4a2afbc7..8efb141b 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