diff options
| author | Dexter Morgan <dmorgan@mageia.org> | 2010-11-04 16:34:59 +0000 |
|---|---|---|
| committer | Dexter Morgan <dmorgan@mageia.org> | 2010-11-04 16:34:59 +0000 |
| commit | 66d34973be7c62c342ef2c6c050e0dcb7b43753f (patch) | |
| tree | 91f1d139e1a9b487ce71a78a1b456e906c3ca598 | |
| parent | d11452a6d4553e0d9d411b8d1a37424cbe4daa55 (diff) | |
| download | puppet-66d34973be7c62c342ef2c6c050e0dcb7b43753f.tar puppet-66d34973be7c62c342ef2c6c050e0dcb7b43753f.tar.gz puppet-66d34973be7c62c342ef2c6c050e0dcb7b43753f.tar.bz2 puppet-66d34973be7c62c342ef2c6c050e0dcb7b43753f.tar.xz puppet-66d34973be7c62c342ef2c6c050e0dcb7b43753f.zip | |
Configure iurt on bs nodes and install conf files
| -rw-r--r-- | manifests/common.pp | 10 | ||||
| -rw-r--r-- | manifests/nodes.pp | 4 | ||||
| -rw-r--r-- | modules/iurt/manifests/init.pp | 21 | ||||
| -rw-r--r-- | modules/iurt/templates/.iurt.cauldron.conf | 30 |
4 files changed, 53 insertions, 12 deletions
diff --git a/manifests/common.pp b/manifests/common.pp index c35824f9..83b7cede 100644 --- a/manifests/common.pp +++ b/manifests/common.pp @@ -92,13 +92,3 @@ class default_mageia_server { include urpmi_update } -class default_mageia_buildnode { - # build node common settings - - # we could have the following skip list to use less space: - # '/(drakx-installer-binaries|drakx-installer-advertising|gfxboot|drakx-installer-stage2|mandriva-theme)/' - $package_list = ['task-bs-cluster-chroot', 'iurt'] - package { $package_list: - ensure => installed; - } -} diff --git a/manifests/nodes.pp b/manifests/nodes.pp index 7bc14fe8..cfb4ca6f 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -83,7 +83,7 @@ node jonund { # Location: IELO datacenter (marseille) # include default_mageia_server - include default_mageia_buildnode + include iurt timezone::timezone { "Europe/Paris": } } @@ -91,7 +91,7 @@ node ecosse { # Location: IELO datacenter (marseille) # include default_mageia_server - include default_mageia_buildnode + include iurt timezone::timezone { "Europe/Paris": } } diff --git a/modules/iurt/manifests/init.pp b/modules/iurt/manifests/init.pp new file mode 100644 index 00000000..75a2f5ad --- /dev/null +++ b/modules/iurt/manifests/init.pp @@ -0,0 +1,21 @@ +class default_mageia_buildnode { + + # build node common settings + # we could have the following skip list to use less space: + # '/(drakx-installer-binaries|drakx-installer-advertising|gfxboot|drakx-installer-stage2|mandriva-theme)/' + $package_list = ['task-bs-cluster-chroot', 'iurt'] + package { $package_list: + ensure => installed; + } + + file { '/home/buildbot/.iurt.cauldron.conf': + ensure => present, + owner => buildbot, + group => buildbot, + mode => 644, + require => Package["iurt"], + content => "template("buildsystem/.iurt.cauldron.conf")" + } + +} + diff --git a/modules/iurt/templates/.iurt.cauldron.conf b/modules/iurt/templates/.iurt.cauldron.conf new file mode 100644 index 00000000..5a7f047e --- /dev/null +++ b/modules/iurt/templates/.iurt.cauldron.conf @@ -0,0 +1,30 @@ +{ + supported_arch => [ 'i586', 'x86_64' ], + all_media => { 'main' => [ 'release' ], 'contrib' => [ 'release' ] }, + upload => 'schedbot@pkgsubmit:~/uploads/', + upload_queue => 'schedbot@pkgsubmit:~/uploads/queue/', + unwanted_packages => '^monotone-', + repository => '/mnt/BIG/dis/', + rsync_to => 'schedbot@pkgsubmit:/mnt/BIG/dis/uploads/build/', + log_url => 'http://pkgsubmit.mageia.org/queue/build/', + admin => 'mageia-sysadm@mageia.org', + iurt_root_command => '/home/buildbot/iurt-trunk/iurt_root_command', + packager => 'Iurt the rebuild bot <mageia-sysadm@mageia.org>', + sendmail => 0, + build_timeout => { + 'default' => 18000, + 'gcc' => 57600, + 'paraview' => 115200, + 'salome' => 57600, + 'itk' => 115200, + 'wrapitk' => 115200, + 'kernel-rt' => 57600, + 'kernel-xen' => 57600, + 'kernel-tmb' => 57600, + 'openoffice.org' => 345600, + 'openoffice.org64' => 345600, + 'openoffice.org-go-ooo' => 345600, + 'openoffice.org64-go-ooo' => 345600 + }, +} + |