aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-05-23 15:07:22 +0000
committerNicolas Vigier <boklm@mageia.org>2013-05-23 15:07:22 +0000
commit64bd769839db37ddcc613f0aa2e0cc699f878701 (patch)
tree7c5fa8d1859016a5d3cb9ea20041270486af554e /modules/buildsystem
parent631faf15d5c65a1a576efd0c912343f9714a1c54 (diff)
downloadpuppet-64bd769839db37ddcc613f0aa2e0cc699f878701.tar
puppet-64bd769839db37ddcc613f0aa2e0cc699f878701.tar.gz
puppet-64bd769839db37ddcc613f0aa2e0cc699f878701.tar.bz2
puppet-64bd769839db37ddcc613f0aa2e0cc699f878701.tar.xz
puppet-64bd769839db37ddcc613f0aa2e0cc699f878701.zip
buildsystem/upload.conf: add arch and mandatory_arch
Add arch and mandatory_arch settings in iurt/upload.conf template. The arch setting is used by ulri to know the list of architectures for which the packages need to be built. The mandatory_arch setting is used by emi to know the list of architectures for which a package needs to be built successfully before it can be installed in the repository.
Diffstat (limited to 'modules/buildsystem')
-rw-r--r--modules/buildsystem/templates/upload.conf25
1 files changed, 25 insertions, 0 deletions
diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf
index 2d39bb76..19290e2f 100644
--- a/modules/buildsystem/templates/upload.conf
+++ b/modules/buildsystem/templates/upload.conf
@@ -101,4 +101,29 @@ my $homedir = "<%= scope.lookupvar('buildsystem::var::iurt::homedir') %>";
http_queue => 'http://<%= scope.lookupvar('buildsystem::var::webstatus::hostname') %>/uploads',
upload_user => '<%= scope.lookupvar('buildsystem::var::scheduler::login') %>',
email_domain => '<%= domain %>',
+ arch => {
+ <%-
+ distros.keys.sort.each{|distroname|
+ -%>
+ <%= distroname -%> => [ '<%= distros[distroname]['arch'].join("', '") %>' ],
+ <%-
+ }
+ -%>
+ default => [ 'i586', 'x86_64' ],
+ },
+ mandatory_arch => {
+ <%-
+ distros.keys.sort.each{|distroname|
+ if distros[distroname]['mandatory_arch'] != nil
+ march = distros[distroname]['mandatory_arch']
+ else
+ march = distros[distroname]['arch']
+ end
+ -%>
+ <%= distroname -%> => [ '<%= march.join("', '") %>' ],
+ <%-
+ }
+ -%>
+ default => [ 'i586', 'x86_64' ],
+ },
}