aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-05-23 15:05:05 +0000
committerNicolas Vigier <boklm@mageia.org>2013-05-23 15:05:05 +0000
commit4eb559d5ffedcaf108102c1ff5895a22c23b4fce (patch)
tree800e1468dfdef0418f1b9e624ed8e8e55105ad8d /modules
parente8ed74b839b0cf72550dff89138a4dca8b544900 (diff)
downloadpuppet-4eb559d5ffedcaf108102c1ff5895a22c23b4fce.tar
puppet-4eb559d5ffedcaf108102c1ff5895a22c23b4fce.tar.gz
puppet-4eb559d5ffedcaf108102c1ff5895a22c23b4fce.tar.bz2
puppet-4eb559d5ffedcaf108102c1ff5895a22c23b4fce.tar.xz
puppet-4eb559d5ffedcaf108102c1ff5895a22c23b4fce.zip
buildsystem::iurt: remove mandriva2010.1
Iurt config for Mandriva 2010.1 was used when the servers were running Mandriva 2010.1, but it is no longer used.
Diffstat (limited to 'modules')
-rw-r--r--modules/buildsystem/manifests/iurt.pp2
-rw-r--r--modules/buildsystem/templates/iurt/mandriva2010.1.conf23
2 files changed, 1 insertions, 24 deletions
diff --git a/modules/buildsystem/manifests/iurt.pp b/modules/buildsystem/manifests/iurt.pp
index bdee8ac5..703541ee 100644
--- a/modules/buildsystem/manifests/iurt.pp
+++ b/modules/buildsystem/manifests/iurt.pp
@@ -16,7 +16,7 @@ class buildsystem::iurt {
ensure => directory,
}
- buildsystem::iurt::config { ['2','1','cauldron','mandriva2010.1','infra_1', 'infra_2']: }
+ buildsystem::iurt::config { ['2','1','cauldron','infra_1', 'infra_2']: }
sudo::sudoers_config { 'iurt':
content => template('buildsystem/iurt/sudoers.iurt')
diff --git a/modules/buildsystem/templates/iurt/mandriva2010.1.conf b/modules/buildsystem/templates/iurt/mandriva2010.1.conf
deleted file mode 100644
index 124625f6..00000000
--- a/modules/buildsystem/templates/iurt/mandriva2010.1.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- supported_arch => [ 'i586', 'x86_64' ],
- all_media => { 'main' => [ 'release' ], 'contrib' => [ 'release' ] },
- base_media => [ 'main/release' ],
- upload => '<%= build_login %>@pkgsubmit:~/uploads/',
- upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/',
- unwanted_packages => '^monotone-',
- repository => 'http://repository.<%= domain %>/mandriva/',
- rsync_to => '<%= build_login %>@pkgsubmit:/mnt/BIG/dis/uploads/build/',
- log_url => 'http://pkgsubmit.<%= domain %>/queue/build/',
- admin => 'mageia-sysadm@mageia.org',
- 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
- },
-}
-