Skip to content

Commit

Permalink
ci(jenkins): change log rotation, use cached repo (#2970)
Browse files Browse the repository at this point in the history
  • Loading branch information
v1v authored Nov 28, 2019
1 parent 21207bc commit 4093838
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .ci/check-changelogs.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pipeline {
}
options {
timeout(time: 1, unit: 'HOURS')
buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
buildDiscarder(logRotator(numToKeepStr: '100', artifactNumToKeepStr: '30', daysToKeepStr: '30'))
timestamps()
ansiColor('xterm')
disableResume()
Expand Down
5 changes: 1 addition & 4 deletions .ci/jobs/apm-server-check-changelogs-mbp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
display-name: APM Server check changelogs MBP
description: APM Server check changelogs MBP
project-type: multibranch
view: APM-CI
number-to-keep: '5'
days-to-keep: '1'
script-path: .ci/check-changelogs.groovy
scm:
- github:
Expand Down Expand Up @@ -36,8 +33,8 @@
recursive: true
parent-credentials: true
timeout: 100
reference-repo: /var/lib/jenkins/.git-references/apm-server.git
timeout: '15'
use-author: true
wipe-workspace: 'True'
periodic-folder-trigger: 1w
prune-dead-branches: true
8 changes: 2 additions & 6 deletions .ci/jobs/apm-server-mbp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@
display-name: APM Server
description: APM Server
project-type: multibranch
view: APM-CI
number-to-keep: '5'
days-to-keep: '1'
concurrent: true
script-path: Jenkinsfile
scm:
- github:
branch-discovery: all
branch-discovery: no-pr
discover-pr-forks-strategy: merge-current
discover-pr-forks-trust: permission
discover-pr-origin: merge-current
Expand Down Expand Up @@ -41,8 +38,7 @@
recursive: true
parent-credentials: true
timeout: 100
reference-repo: /var/lib/jenkins/.git-references/apm-server.git
timeout: '15'
use-author: true
wipe-workspace: 'True'
periodic-folder-trigger: 1d
prune-dead-branches: true
4 changes: 3 additions & 1 deletion .ci/jobs/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@
##### JOB DEFAULTS

- job:
view: APM-CI
logrotate:
daysToKeep: 30
numToKeep: 100
node: linux
periodic-folder-trigger: 1d
prune-dead-branches: true
publishers:
- email:
recipients: [email protected]
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pipeline {
}
options {
timeout(time: 2, unit: 'HOURS')
buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
buildDiscarder(logRotator(numToKeepStr: '100', artifactNumToKeepStr: '30', daysToKeepStr: '30'))
timestamps()
ansiColor('xterm')
disableResume()
Expand Down

0 comments on commit 4093838

Please sign in to comment.