diff options
| -rw-r--r-- | job-cfg/chroot-test.yaml | 5 | ||||
| -rw-r--r-- | job-cfg/d-i.yaml | 25 | ||||
| -rw-r--r-- | job-cfg/general.yaml | 23 |
3 files changed, 25 insertions, 28 deletions
diff --git a/job-cfg/chroot-test.yaml b/job-cfg/chroot-test.yaml index d890b07e..a456b6e4 100644 --- a/job-cfg/chroot-test.yaml +++ b/job-cfg/chroot-test.yaml @@ -59,10 +59,6 @@ text: Sponsored by Profitbricks icon: /userContent/images/profitbricks-24x24.png -# -# FIXME: trigger-project needs to accept a list of projects. -# - - defaults: name: chroot-tests+four-trigger description: '{my_description}{do_not_edit}' @@ -101,6 +97,7 @@ icon: /userContent/images/profitbricks-24x24.png - job-template: + defaults: chroot-tests name: '{name}_housekeeping' description: '{my_description}{do_not_edit}' triggers: diff --git a/job-cfg/d-i.yaml b/job-cfg/d-i.yaml index 08eaab53..74a053b4 100644 --- a/job-cfg/d-i.yaml +++ b/job-cfg/d-i.yaml @@ -1,4 +1,27 @@ +- defaults: + name: d-i + project-type: freestyle + logrotate: + daysToKeep: 90 + numToKeep: 50 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + properties: + - sidebar: + url: http://jenkins.debian.net/userContent/about.html + text: About jenkins.debian.net + icon: /userContent/images/debian-swirl-24x24.png + - sidebar: + url: http://jenkins.debian.net/view/debian-installer/ + text: All debian-installer jobs + icon: /userContent/images/debian-swirl-24x24.png + - sidebar: + url: http://www.profitbricks.com + text: Sponsored by Profitbricks + icon: /userContent/images/profitbricks-24x24.png + - job-template: + defaults: d-i name: '{name}_manual' description: 'Shall build d-i manual one day, does not do that yet.{do_not_edit}' scm: @@ -12,7 +35,6 @@ excludedRevprop: '' excludedCommitMessages: '' viewvc-url: http://anonscm.debian.org/viewvc/d-i/trunk - builders: - shell: 'ls' triggers: @@ -24,6 +46,7 @@ fail_on_error: 'true' - job-template: + defaults: d-i name: '{name}_parse_build_logs' description: 'Parses d-i build logs.{do_not_edit}' builders: diff --git a/job-cfg/general.yaml b/job-cfg/general.yaml deleted file mode 100644 index 4a49cbc8..00000000 --- a/job-cfg/general.yaml +++ /dev/null @@ -1,23 +0,0 @@ -- defaults: - name: global - project-type: freestyle - logrotate: - daysToKeep: 90 - numToKeep: 50 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - properties: - - sidebar: - url: http://jenkins.debian.net/userContent/about.html - text: About jenkins.debian.net - icon: /userContent/images/debian-swirl-24x24.png - - sidebar: - url: http://jenkins.debian.net/view/debian-installer/ - text: All debian-installer jobs - icon: /userContent/images/debian-swirl-24x24.png - - sidebar: - url: http://www.profitbricks.com - text: Sponsored by Profitbricks - icon: /userContent/images/profitbricks-24x24.png - - |