diff options
| -rw-r--r-- | modules/buildsystem/manifests/iurt.pp | 2 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/mgarepo.pp | 3 | ||||
| -rw-r--r-- | modules/buildsystem/templates/mgarepo.conf | 5 | ||||
| -rw-r--r-- | modules/buildsystem/templates/vhost_repository.conf | 1 | ||||
| -rw-r--r-- | modules/buildsystem/templates/youri/submit-todo.conf | 16 | ||||
| -rw-r--r-- | modules/buildsystem/templates/youri/submit-upload.conf | 21 |
6 files changed, 47 insertions, 1 deletions
diff --git a/modules/buildsystem/manifests/iurt.pp b/modules/buildsystem/manifests/iurt.pp index a8e01348..e0856a23 100644 --- a/modules/buildsystem/manifests/iurt.pp +++ b/modules/buildsystem/manifests/iurt.pp @@ -19,7 +19,7 @@ class buildsystem::iurt { ensure => directory, } - buildsystem::iurt::config { ['2','1','cauldron','mandriva2010.1','infra_1']: } + buildsystem::iurt::config { ['2','1','cauldron','mandriva2010.1','infra_1', 'infra_2']: } sudo::sudoers_config { 'iurt': content => template('buildsystem/iurt/sudoers.iurt') diff --git a/modules/buildsystem/manifests/mgarepo.pp b/modules/buildsystem/manifests/mgarepo.pp index 4520d49a..70b71202 100644 --- a/modules/buildsystem/manifests/mgarepo.pp +++ b/modules/buildsystem/manifests/mgarepo.pp @@ -51,6 +51,9 @@ class buildsystem::mgarepo { 'infra_1' => { 'infra' => ['release'] }, + 'infra_2' => { + 'infra' => ['release'] + }, } import 'create_upload_dir.rb' 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 |