diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2012-08-30 12:34:28 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2012-08-30 12:34:28 +0000 |
| commit | 0efb19436a9ddf902a5508b430fa37923e95ca42 (patch) | |
| tree | ad76e8105747c1c1f8d637a3a451a2e86a20705a /modules/buildsystem/templates | |
| parent | ec534eb4a0fa7235d6ddbdb3d2af1ca8ba87c307 (diff) | |
| download | puppet-0efb19436a9ddf902a5508b430fa37923e95ca42.tar puppet-0efb19436a9ddf902a5508b430fa37923e95ca42.tar.gz puppet-0efb19436a9ddf902a5508b430fa37923e95ca42.tar.bz2 puppet-0efb19436a9ddf902a5508b430fa37923e95ca42.tar.xz puppet-0efb19436a9ddf902a5508b430fa37923e95ca42.zip | |
add infra_2 repository
Diffstat (limited to 'modules/buildsystem/templates')
4 files changed, 43 insertions, 0 deletions
diff --git a/modules/buildsystem/templates/mgarepo.conf b/modules/buildsystem/templates/mgarepo.conf index b3ce20c7..81c21d3b 100644 --- a/modules/buildsystem/templates/mgarepo.conf +++ b/modules/buildsystem/templates/mgarepo.conf @@ -57,6 +57,11 @@ target = <%= sched_home_dir %>/repsys/srpms allowed = svn://svn.mageia.org/svn/packages/ rpm-macros = global 1 +[submit infra_2] +target = <%= sched_home_dir %>/repsys/srpms +allowed = svn://svn.mageia.org/svn/packages/ +rpm-macros = global 2 + [macros global] distsuffix = .mga # mkrel definition to be removed when rpm-setup is updated on main build node diff --git a/modules/buildsystem/templates/vhost_repository.conf b/modules/buildsystem/templates/vhost_repository.conf index 50d42b3b..03dc1fd3 100644 --- a/modules/buildsystem/templates/vhost_repository.conf +++ b/modules/buildsystem/templates/vhost_repository.conf @@ -8,6 +8,7 @@ buildsystem_nodes = "2a02:2178:2:7::3/64 2a02:2178:2:7::4/64 2a02:2178:2:7::5/64 ServerName repository.<%= domain %> DocumentRoot <%= mirror_root %> Alias /distrib/infra_1/ "/distrib/bootstrap/distrib/infra_1/" + Alias /distrib/infra_2/ "/distrib/bootstrap/distrib/infra_2/" Alias /mandriva/ "/distrib/mandriva/" Alias /mageiatools/ "/distrib/mageiatools/" diff --git a/modules/buildsystem/templates/youri/submit-todo.conf b/modules/buildsystem/templates/youri/submit-todo.conf index c32c62f5..aa27c3c5 100644 --- a/modules/buildsystem/templates/youri/submit-todo.conf +++ b/modules/buildsystem/templates/youri/submit-todo.conf @@ -20,6 +20,8 @@ repository: arch: i586 x86_64 infra_1: arch: i586 x86_64 + infra_2: + arch: i586 x86_64 cauldron: arch: i586 x86_64 @@ -93,6 +95,20 @@ targets: - rpminfo - ulri + infra_2: + checks: + - source + - version + - tag + - acl + - rpmlint + - recency + - queue_recency + actions: + - send + - rpminfo + - ulri + # checks definition checks: tag: diff --git a/modules/buildsystem/templates/youri/submit-upload.conf b/modules/buildsystem/templates/youri/submit-upload.conf index cbb74f96..d5bdff1f 100644 --- a/modules/buildsystem/templates/youri/submit-upload.conf +++ b/modules/buildsystem/templates/youri/submit-upload.conf @@ -22,6 +22,8 @@ repository: arch: i586 x86_64 infra_1: arch: i586 x86_64 + infra_2: + arch: i586 x86_64 cauldron: arch: i586 x86_64 @@ -128,6 +130,21 @@ targets: posts: - genhdlist2 + infra_2: + checks: + - version + - tag + - acl + - rpmlint + - recency + actions: + - sign + - install + - link + - archive + posts: + - genhdlist2 + # checks definition checks: tag: @@ -223,6 +240,10 @@ checks: authorized_users: ^<%= scope.function_group_members(['mga-sysadmin']).join('|') %>$ mode: freeze + infra_2: + authorized_users: ^<%= scope.function_group_members(['mga-sysadmin']).join('|') %>$ + mode: freeze + cauldron: # <mrl> Prior freeze mode: normal |