From 5a8eee45a3f59264c6955bac2bded662592eb009 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 9 Nov 2012 15:19:11 +0100 Subject: rename jobs to start with prefix underscore --- job-cfg/chroot-test.yaml | 52 ++++++++++++++++++++++++------------------------ job-cfg/d-i.yaml | 8 ++++---- job-cfg/webcheck.yaml | 14 +++++++++++-- update_jdn.sh | 2 +- 4 files changed, 43 insertions(+), 33 deletions(-) diff --git a/job-cfg/chroot-test.yaml b/job-cfg/chroot-test.yaml index 20193eb9..2ce12a5b 100644 --- a/job-cfg/chroot-test.yaml +++ b/job-cfg/chroot-test.yaml @@ -89,7 +89,7 @@ icon: /userContent/images/profitbricks-24x24.png - job-template: - name: '{name}-housekeeping' + name: '{name}_housekeeping' description: '{my_description}{do_not_edit}' triggers: - timed: "0 5 * * *" @@ -109,83 +109,83 @@ - job-template: defaults: chroot-tests - name: '{name}-sid_install_gnome' + name: '{name}_sid_install_gnome' - job-template: defaults: chroot-tests+trigger - name: '{name}-sid_bootstrap' + name: '{name}_sid_bootstrap' - job-template: defaults: chroot-tests - name: '{name}-squeeze_install_gnome_upgrade_to_wheezy' + name: '{name}_squeeze_install_gnome_upgrade_to_wheezy' - job-template: defaults: chroot-tests - name: '{name}-squeeze_install_kde_upgrade_to_wheezy' + name: '{name}_squeeze_install_kde_upgrade_to_wheezy' - job-template: defaults: chroot-tests - name: '{name}-squeeze_install_lxde_upgrade_to_wheezy' + name: '{name}_squeeze_install_lxde_upgrade_to_wheezy' - job-template: defaults: chroot-tests - name: '{name}-squeeze_install_xfce_upgrade_to_wheezy' + name: '{name}_squeeze_install_xfce_upgrade_to_wheezy' - job-template: defaults: chroot-tests+four-trigger - name: '{name}-squeeze_bootstrap_upgrade_to_wheezy' + name: '{name}_squeeze_bootstrap_upgrade_to_wheezy' - job-template: defaults: chroot-tests - name: '{name}-wheezy_install_gnome' + name: '{name}_wheezy_install_gnome' - job-template: defaults: chroot-tests - name: '{name}-wheezy_install_kde' + name: '{name}_wheezy_install_kde' - job-template: defaults: chroot-tests - name: '{name}-wheezy_install_lxde' + name: '{name}_wheezy_install_lxde' - job-template: defaults: chroot-tests - name: '{name}-wheezy_install_xfce' + name: '{name}_wheezy_install_xfce' - job-template: defaults: chroot-tests+four-trigger - name: '{name}-wheezy_bootstrap' + name: '{name}_wheezy_bootstrap' - project: name: chroot-test do_not_edit: '

Configured by jenkins-job-builder, do not edit this job through the web UI.' jobs: - - '{name}-sid_install_gnome': + - '{name}_sid_install_gnome': chroot_tester_params: 'sid gnome' my_description: 'Debootstrap sid, then install GNOME.' - - '{name}-sid_bootstrap': + - '{name}_sid_bootstrap': chroot_tester_params: 'sid' my_description: 'Debootstrap sid.' my_trigger: 'chroot-test-sid_install_gnome' - - '{name}-squeeze_install_gnome_upgrade_to_wheezy': + - '{name}_squeeze_install_gnome_upgrade_to_wheezy': chroot_tester_params: 'squeeze gnome wheezy' my_description: 'Debootstrap squeeze, install GNOME then upgrade to wheezy.' - - '{name}-squeeze_install_kde_upgrade_to_wheezy': + - '{name}_squeeze_install_kde_upgrade_to_wheezy': chroot_tester_params: 'squeeze kde wheezy' my_description: 'Debootstrap squeeze, install KDE then upgrade to wheezy.' - - '{name}-squeeze_install_lxde_upgrade_to_wheezy': + - '{name}_squeeze_install_lxde_upgrade_to_wheezy': chroot_tester_params: 'squeeze lxde wheezy' my_description: 'Debootstrap squeeze, install LXDE then upgrade to wheezy.' - - '{name}-squeeze_install_xfce_upgrade_to_wheezy': + - '{name}_squeeze_install_xfce_upgrade_to_wheezy': chroot_tester_params: 'squeeze xfce wheezy' my_description: 'Debootstrap squeeze, install KFCE then upgrade to wheezy.' - - '{name}-squeeze_bootstrap_upgrade_to_wheezy': + - '{name}_squeeze_bootstrap_upgrade_to_wheezy': chroot_tester_params: 'squeeze none wheezy' my_description: 'Debootstrap squeeze, then upgrade to wheezy.' my_1st_trigger: 'chroot-test-squeeze_install_gnome_upgrade_to_wheezy' @@ -193,23 +193,23 @@ 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': + - '{name}_wheezy_install_gnome': chroot_tester_params: 'wheezy gnome' my_description: 'Debootstrap wheezy, then install GNOME.' - - '{name}-wheezy_install_kde': + - '{name}_wheezy_install_kde': chroot_tester_params: 'wheezy kde' my_description: 'Debootstrap wheezy, then install KDE.' - - '{name}-wheezy_install_xfce': + - '{name}_wheezy_install_xfce': chroot_tester_params: 'wheezy xfce' my_description: 'Debootstrap wheezy, then install XFCE.' - - '{name}-wheezy_install_lxde': + - '{name}_wheezy_install_lxde': chroot_tester_params: 'wheezy lxde' my_description: 'Debootstrap wheezy, then install LXDE.' - - '{name}-wheezy_bootstrap': + - '{name}_wheezy_bootstrap': chroot_tester_params: 'wheezy' my_description: 'Debootstrap wheezy.' my_1st_trigger: 'chroot-test-wheezy_install_gnome' @@ -217,7 +217,7 @@ my_3rd_trigger: 'chroot-test-wheezy_install_lxde' my_4th_trigger: 'chroot-test-wheezy_install_xfce' - - '{name}-housekeeping': + - '{name}_housekeeping': my_description: 'Cleanup so that there is a predictable environment.' my_1st_trigger: 'chroot-test-sid_bootstrap' my_2nd_trigger: 'chroot-test-wheezy_bootstrap' diff --git a/job-cfg/d-i.yaml b/job-cfg/d-i.yaml index 6be2f8c5..e21749e2 100644 --- a/job-cfg/d-i.yaml +++ b/job-cfg/d-i.yaml @@ -1,5 +1,5 @@ - job-template: - name: '{name}-manual' + name: '{name}_manual' description: 'Shall build d-i manual one day, does not do that yet.{do_not_edit}' scm: - svn: @@ -24,7 +24,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/d-i_parse_logs.sh http://d-i.debian.org/daily-images/build-logs.html' @@ -53,8 +53,8 @@ name: d-i do_not_edit: '

Configured by jenkins-job-builder, do not edit this job through the web UI.' jobs: - - '{name}-manual' - - '{name}-parse_build_logs' + - '{name}_manual' + - '{name}_parse_build_logs' diff --git a/job-cfg/webcheck.yaml b/job-cfg/webcheck.yaml index 1e7a5cfa..bc1514c5 100644 --- a/job-cfg/webcheck.yaml +++ b/job-cfg/webcheck.yaml @@ -26,12 +26,22 @@ text: Sponsored by Profitbricks icon: /userContent/images/profitbricks-24x24.png +- job-template: + defaults: webcheck + name: '{name}_www_debconf_org' + +- job-template: + defaults: webcheck + name: '{name}_debconf13_debconf_org' + - project: name: webcheck do_not_edit: '

Configured by jenkins-job-builder, do not edit this job through the web UI.' jobs: - - - '{name}-www.debconf.org': + - '{name}_www_debconf_org': webcheck_url: 'http://www.debconf.org' webcheck_ignore_patterns: '^mailto:' + - '{name}_debconf13_debconf_org': + webcheck_url: 'http://debconf13.debconf.org' + webcheck_ignore_patterns: '^mailto:' diff --git a/update_jdn.sh b/update_jdn.sh index 5c0ab998..47e6445e 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -23,7 +23,7 @@ done # install packages we need # (more or less grouped into more-then-nice-to-have, needed-while-things-are-new, needed) # -sudo apt-get install vim screen less etckeeper curl mtr-tiny dstat devscripts bash-completion shorewall shorewall6 cron-apt apt-listchanges munin \ +sudo apt-get install vim screen less etckeeper moreutils curl mtr-tiny dstat devscripts bash-completion shorewall shorewall6 cron-apt apt-listchanges munin \ build-essential python-setuptools \ debootstrap sudo figlet graphviz apache2 python-yaml python-pip mr subversion subversion-tools vnstat webcheck explain "Packages installed." -- cgit v1.2.3-54-g00ecf