fix trigger, keep artifacts

3 files changed, 32 insertions, 17 deletions

diff --git a/job-cfg/chroot-test.yaml b/job-cfg/chroot-test.yaml
index be816672..6c28cdb2 100644
--- a/job-cfg/chroot-test.yaml
+++ b/job-cfg/chroot-test.yaml
@@ -2,6 +2,11 @@
 - defaults:
     name: chroot-tests
     description: '{my_description}{do_not_edit}'
+    logrotate:
+      daysToKeep: 90
+      numToKeep: 50
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
     builders:
       - shell: '/srv/jenkins/bin/chroot_tester.sh {chroot_tester_params}'
     publishers:
@@ -13,6 +18,11 @@
 - defaults:
     name: chroot-tests+trigger
     description: '{my_description}{do_not_edit}'
+    logrotate:
+      daysToKeep: 90
+      numToKeep: 50
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
     builders:
       - shell: '/srv/jenkins/bin/chroot_tester.sh {chroot_tester_params}'
     publishers:
@@ -30,6 +40,11 @@
 - defaults:
     name: chroot-tests+4trigger
     description: '{my_description}{do_not_edit}'
+    logrotate:
+      daysToKeep: 90
+      numToKeep: 50
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
     builders:
       - shell: '/srv/jenkins/bin/chroot_tester.sh {chroot_tester_params}'
     publishers:
@@ -57,11 +72,11 @@
          unstable_on_warning: 'true'
          fail_on_error: 'true'
       - trigger:
-         project: 'testjob_chroot-test-sid_bootstrap'
+         project: 'chroot-test-sid_bootstrap'
       - trigger:
-         project: 'testjob_chroot-test-wheezy_bootstrap'
+         project: 'chroot-test-wheezy_bootstrap'
       - trigger:
-         project: 'testjob_chroot-test-squeeze_bootstrap_upgrade_to_wheezy'
+         project: 'chroot-test-squeeze_bootstrap_upgrade_to_wheezy'
 
 - job-template:
     defaults: chroot-tests
@@ -112,7 +127,7 @@
     name: '{name}-wheezy_bootstrap'
 
 - project:
-    name: testjob_chroot-test
+    name: chroot-test
     do_not_edit: '<br><br>Configured by <a href="http://jenkins.debian.net/userContent/about.html">jenkins-job-builder</a>, do not edit this job through the web UI.'
     jobs:
 
@@ -123,7 +138,7 @@
       - '{name}-sid_bootstrap':
          chroot_tester_params: 'sid'
          my_description: 'Debootstrap sid.'
-         my_trigger: 'testjob_chroot-test-sid_install_gnome'
+         my_trigger: 'chroot-test-sid_install_gnome'
 
       - '{name}-squeeze_install_gnome_upgrade_to_wheezy':
          chroot_tester_params: 'squeeze gnome wheezy'
@@ -144,10 +159,10 @@
       - '{name}-squeeze_bootstrap_upgrade_to_wheezy':
          chroot_tester_params: 'squeeze none wheezy'
          my_description: 'Debootstrap squeeze, then upgrade to wheezy.'
-         my_1st_trigger: 'testjob_chroot-test-squeeze_install_gnome_upgrade_to_wheezy'
-         my_2nd_trigger: 'testjob_chroot-test-squeeze_install_kde_upgrade_to_wheezy'
-         my_3rd_trigger: 'testjob_chroot-test-squeeze_install_lxde_upgrade_to_wheezy'
-         my_4th_trigger: 'testjob_chroot-test-squeeze_install_xfce_upgrade_to_wheezy'
+         my_1st_trigger: 'chroot-test-squeeze_install_gnome_upgrade_to_wheezy'
+         my_2nd_trigger: 'chroot-test-squeeze_install_kde_upgrade_to_wheezy'
+         my_3rd_trigger: 'chroot-test-squeeze_install_lxde_upgrade_to_wheezy'
+         my_4th_trigger: 'chroot-test-squeeze_install_xfce_upgrade_to_wheezy'
 
       - '{name}-wheezy_install_gnome':
          chroot_tester_params: 'wheezy gnome'
@@ -168,10 +183,10 @@
       - '{name}-wheezy_bootstrap':
          chroot_tester_params: 'wheezy'
          my_description: 'Debootstrap wheezy.'
-         my_1st_trigger: 'testjob_chroot-test-wheezy_install_gnome'
-         my_2nd_trigger: 'testjob_chroot-test-wheezy_install_kde'
-         my_3rd_trigger: 'testjob_chroot-test-wheezy_install_lxde'
-         my_4th_trigger: 'testjob_chroot-test-wheezy_install_xfce'
+         my_1st_trigger: 'chroot-test-wheezy_install_gnome'
+         my_2nd_trigger: 'chroot-test-wheezy_install_kde'
+         my_3rd_trigger: 'chroot-test-wheezy_install_lxde'
+         my_4th_trigger: 'chroot-test-wheezy_install_xfce'
 
       - '{name}-housekeeping':
          my_description: 'Cleanup so that there is a predictable environment.'
diff --git a/job-cfg/d-i.yaml b/job-cfg/d-i.yaml
index a84112ee..94f8f19e 100644
--- a/job-cfg/d-i.yaml
+++ b/job-cfg/d-i.yaml
@@ -26,7 +26,7 @@
          fail_on_error: 'true'
 
 - job-template:
-    name: '{name}-parse-build-logs'
+    name: '{name}-parse_build_logs'
     description: 'Parses d-i build logs.{do_not_edit}'
     builders:
       - shell: '/srv/jenkins/bin/parse_d-i_logs.sh http://d-i.debian.org/daily-images/build-logs.html'
@@ -40,11 +40,11 @@
     # FIXME missing publisher: build-logs.html "daily d-i build logs"
 
 - project:
-    name: testjob_d-i
+    name: d-i
     do_not_edit: '<br><br>Configured by <a href="http://jenkins.debian.net/userContent/about.html">jenkins-job-builder</a>, do not edit this job through the web UI.'
     jobs:
       - '{name}-manual'
-      - '{name}-parse-build-logs'
+      - '{name}-parse_build_logs'
  
 
 
diff --git a/job-cfg/general.yaml b/job-cfg/general.yaml
index 2a644997..faed4c2e 100644
--- a/job-cfg/general.yaml
+++ b/job-cfg/general.yaml
@@ -3,7 +3,7 @@
     project-type: freestyle
     logrotate:
       daysToKeep: 90
-      numToKeep: 25
+      numToKeep: 50
       artifactDaysToKeep: -1
       artifactNumToKeep: -1