osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/32187 )

Change subject: jobs: remove artifacts-days/num-to-keep: -1 ......................................................................

jobs: remove artifacts-days/num-to-keep: -1

Remove the "artifact-days-to-keep: -1" and "artifact-num-to-keep: -1" lines, as they don't have an effect. -1 is the default value, which means "infinite" and causes the value from "days-to-keep" / "num-to-keep" to get used instead.

This patch re-applies part of 719ff976 ("jobs: tweak build-discarder values"), which had been reverted in a052c13c.

Related: https://jenkins-job-builder.readthedocs.io/en/latest/properties.html#propert... Related: OS#5980 Change-Id: Ic073643634e1814147d765dd7e8f3f02e81effc3 --- 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 11 files changed, 19 insertions(+), 24 deletions(-)

Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved

diff --git a/jobs/gerrit-binpkgs.yml b/jobs/gerrit-binpkgs.yml index 247ebad..0e77920 100644 --- a/jobs/gerrit-binpkgs.yml +++ b/jobs/gerrit-binpkgs.yml @@ -20,8 +20,6 @@ - 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..bf24cb7 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -17,8 +17,6 @@ - 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..1fd8b6c 100644 --- a/jobs/gerrit-pipeline-endianness.yml +++ b/jobs/gerrit-pipeline-endianness.yml @@ -16,8 +16,6 @@ - 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..6c8d90d 100644 --- a/jobs/gerrit-verifications-comment.yml +++ b/jobs/gerrit-verifications-comment.yml @@ -16,8 +16,6 @@ - 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..76657f1 100644 --- a/jobs/gerrit-verifications-dahdi.yml +++ b/jobs/gerrit-verifications-dahdi.yml @@ -17,8 +17,6 @@ - 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..3745345 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -628,8 +628,6 @@ - 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> @@ -681,8 +679,6 @@ - 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..37d48b7 100644 --- a/jobs/master-builds-dahdi.yml +++ b/jobs/master-builds-dahdi.yml @@ -17,8 +17,6 @@ - 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 724628d..01e5ac0 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -518,8 +518,6 @@ - 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..534cf13 100644 --- a/jobs/octsim_osmo-ccid-firmware.yml +++ b/jobs/octsim_osmo-ccid-firmware.yml @@ -35,8 +35,6 @@ 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: diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml index fbed5ea..6ce8fe8 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -117,8 +117,6 @@ - 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..0503a54 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -386,8 +386,6 @@ - build-discarder: days-to-keep: 30 num-to-keep: 120 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 wrappers: - ansicolor: colormap: xterm