diff options
Diffstat (limited to 'modules/buildsystem/manifests')
-rw-r--r-- | modules/buildsystem/manifests/binrepo.pp | 8 | ||||
-rw-r--r-- | modules/buildsystem/manifests/iurt/config.pp | 5 | ||||
-rw-r--r-- | modules/buildsystem/manifests/mgarepo.pp | 2 | ||||
-rw-r--r-- | modules/buildsystem/manifests/scheduler.pp | 2 | ||||
-rw-r--r-- | modules/buildsystem/manifests/var/distros.pp | 2 | ||||
-rw-r--r-- | modules/buildsystem/manifests/var/youri.pp | 6 |
6 files changed, 16 insertions, 9 deletions
diff --git a/modules/buildsystem/manifests/binrepo.pp b/modules/buildsystem/manifests/binrepo.pp index f2f529c0..5bf16b53 100644 --- a/modules/buildsystem/manifests/binrepo.pp +++ b/modules/buildsystem/manifests/binrepo.pp @@ -3,10 +3,16 @@ class buildsystem::binrepo { include buildsystem::var::groups include sudo - # upload-bin script use the mailx command provided by nail + # upload-bin script uses the mailx command provided by nail +if versioncmp($::lsbdistrelease, '9') < 0 { package { 'nail': ensure => installed, } +} else { + package { 's-nail': + ensure => installed, + } +} user { $buildsystem::var::binrepo::login: home => $buildsystem::var::binrepo::homedir, diff --git a/modules/buildsystem/manifests/iurt/config.pp b/modules/buildsystem/manifests/iurt/config.pp index 3334df76..b8be373e 100644 --- a/modules/buildsystem/manifests/iurt/config.pp +++ b/modules/buildsystem/manifests/iurt/config.pp @@ -20,8 +20,9 @@ define buildsystem::iurt::config() { 'java-latest-openjdk' => 172800, 'kernel' => 115200, 'libreoffice' => 432000, - 'llvm' => 57600, - 'llvm17-suite' => 60000, + 'llvm' => 115200, + 'llvm17-suite' => 115200, + 'llvm19-suite' => 115200, 'openfoam' => 115200, 'paraview' => 115200, 'qgis' => 57600, diff --git a/modules/buildsystem/manifests/mgarepo.pp b/modules/buildsystem/manifests/mgarepo.pp index 2b314d3d..14e11e1a 100644 --- a/modules/buildsystem/manifests/mgarepo.pp +++ b/modules/buildsystem/manifests/mgarepo.pp @@ -27,7 +27,7 @@ class buildsystem::mgarepo { require => File["${sched_home_dir}/repsys"], } - # FIXME: disabled temporarly as upload dir is a symlink to /var/lib/repsys/uploads + # FIXME: disabled temporarily as upload dir is a symlink to /var/lib/repsys/uploads #file { "${sched_home_dir}/uploads": # ensure => "directory", # owner => $sched_login, diff --git a/modules/buildsystem/manifests/scheduler.pp b/modules/buildsystem/manifests/scheduler.pp index 7c186a19..53b248fc 100644 --- a/modules/buildsystem/manifests/scheduler.pp +++ b/modules/buildsystem/manifests/scheduler.pp @@ -1,5 +1,5 @@ class buildsystem::scheduler { - # until ulri is splitted from main iurt rpm + # until ulri is split from main iurt rpm include buildsystem::iurt::packages include buildsystem::iurt::upload include buildsystem::var::scheduler diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp index 0299c87c..9e45e2c2 100644 --- a/modules/buildsystem/manifests/var/distros.pp +++ b/modules/buildsystem/manifests/var/distros.pp @@ -5,7 +5,7 @@ # list of IP or domains allowed to access the repository. If you don't want to # filter allowed IPs, don't those values. # $distros: -# a hash variable containing distributions informations indexed by +# a hash variable containing distributions information indexed by # distribution name. Each distribution is itself an hash containing # the following infos: # { diff --git a/modules/buildsystem/manifests/var/youri.pp b/modules/buildsystem/manifests/var/youri.pp index fa8a3a1d..f20b6c7b 100644 --- a/modules/buildsystem/manifests/var/youri.pp +++ b/modules/buildsystem/manifests/var/youri.pp @@ -1,7 +1,7 @@ -# The youri configuration files are created using informations from 3 +# The youri configuration files are created using information from 3 # different hash variables : # - the $youri_conf_default variable defined in this class, containing -# the default configuration for youri. It contais the repository +# the default configuration for youri. It contains the repository # configuration, and the definitions of the checks, actions and posts. # - the $youri_conf parameter passed to this class. The values defined # in this hash override the values defined in the default configuration. @@ -17,7 +17,7 @@ # # Parameters : # $tmpl_youri_upload_conf: -# template file for youri submi-upload.conf +# template file for youri submit-upload.conf # $tmpl_youri_todo_conf: # template file for youri submit-todo.conf # $packages_archivedir: |