[M] Change in osmo-ci[master]: Revert "jobs: tweak build-discarder values"

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/32102 ) Change subject: Revert "jobs: tweak build-discarder values" ...................................................................... Revert "jobs: tweak build-discarder values" This reverts commit 719ff9760808acb1fe944f4c496c356c7dc07c91. The disk consumption of jenkins has grown by almost 500GB since we merged this patch. Clearly this is not expected, and we'd have ran out of disk space in a few weeks. I personally think the current allocation of 1.5TB of disk space to jenkins should be more than sufficient; we just need to manage it better. Closes: OS#5980 Change-Id: I6b744a8b84a3e1255a8d51f73d1721ccfd028ac1 --- 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, 60 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/02/32102/1 diff --git a/jobs/coverity.yml b/jobs/coverity.yml index 277bbf0..242d1aa 100644 --- a/jobs/coverity.yml +++ b/jobs/coverity.yml @@ -22,6 +22,7 @@ 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 49a2b48..247ebad 100644 --- a/jobs/gerrit-binpkgs.yml +++ b/jobs/gerrit-binpkgs.yml @@ -19,6 +19,9 @@ 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 b0c9c06..7b537b9 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -16,6 +16,9 @@ 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 c9904f4..809cce6 100644 --- a/jobs/gerrit-pipeline-endianness.yml +++ b/jobs/gerrit-pipeline-endianness.yml @@ -15,6 +15,9 @@ 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 046c986..f781bf8 100644 --- a/jobs/gerrit-verifications-comment.yml +++ b/jobs/gerrit-verifications-comment.yml @@ -15,6 +15,9 @@ 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 526dc78..d594378 100644 --- a/jobs/gerrit-verifications-dahdi.yml +++ b/jobs/gerrit-verifications-dahdi.yml @@ -16,6 +16,9 @@ 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&q… diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 9ab2d48..2bd9296 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -627,6 +627,9 @@ 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}"… @@ -677,6 +680,9 @@ 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}"… diff --git a/jobs/master-builds-dahdi.yml b/jobs/master-builds-dahdi.yml index 068c92d..b152805 100644 --- a/jobs/master-builds-dahdi.yml +++ b/jobs/master-builds-dahdi.yml @@ -16,6 +16,9 @@ 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&q… diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 23e5219..724628d 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -517,6 +517,9 @@ 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 efabe57..17e3cef 100644 --- a/jobs/octsim_osmo-ccid-firmware.yml +++ b/jobs/octsim_osmo-ccid-firmware.yml @@ -35,7 +35,10 @@ 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 ce7dd26..fbed5ea 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -116,6 +116,9 @@ 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 9500662..cac271f 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -384,7 +384,10 @@ only-if-success: false properties: - build-discarder: - days-to-keep: 120 + 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/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 749f5b1..8ab1e12 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -18,6 +18,7 @@ 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 8efb141..4a2afbc 100644 --- a/jobs/update-osmo-python-on-slaves.yml +++ b/jobs/update-osmo-python-on-slaves.yml @@ -15,6 +15,7 @@ properties: - build-discarder: days-to-keep: 30 + num-to-keep: 120 scm: - git: url: https://gerrit.osmocom.org/python/osmo-python-tests -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/32102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6b744a8b84a3e1255a8d51f73d1721ccfd028ac1 Gerrit-Change-Number: 32102 Gerrit-PatchSet: 1 Gerrit-Owner: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-MessageType: newchange