diff options
| -rw-r--r-- | modules/buildsystem/manifests/create_upload_dir.rb | 7 | ||||
| -rw-r--r-- | modules/buildsystem/templates/iurt/infra_1.conf | 13 | ||||
| -rw-r--r-- | modules/buildsystem/templates/mgarepo.conf | 4 | ||||
| -rw-r--r-- | modules/buildsystem/templates/submit-todo.conf | 15 | ||||
| -rw-r--r-- | modules/buildsystem/templates/submit-upload.conf | 23 |
5 files changed, 60 insertions, 2 deletions
diff --git a/modules/buildsystem/manifests/create_upload_dir.rb b/modules/buildsystem/manifests/create_upload_dir.rb index c90b5ddf..36732006 100644 --- a/modules/buildsystem/manifests/create_upload_dir.rb +++ b/modules/buildsystem/manifests/create_upload_dir.rb @@ -25,5 +25,12 @@ define "create_upload_dir", :owner, :group do end end end + + rel 'infra_1' + rep = 'core' + med = 'release' + file [@name, st, rel].join('/'), :ensure => 'directory', :owner => @owner, :group => @group + file [@name, st, rel, rep].join('/'), :ensure => 'directory', :owner => @owner, :group => @group + file [@name, st, rel, rep, med].join('/'), :ensure => 'directory', :owner => @owner, :group => @group, :mode => 0775 end end diff --git a/modules/buildsystem/templates/iurt/infra_1.conf b/modules/buildsystem/templates/iurt/infra_1.conf new file mode 100644 index 00000000..8b36b4a3 --- /dev/null +++ b/modules/buildsystem/templates/iurt/infra_1.conf @@ -0,0 +1,13 @@ +{ + supported_arch => [ 'i586', 'x86_64' ], + all_media => { 'core' => [ 'release' ] }, + base_media => [ 'core/release' ], + upload => '<%= build_login %>@pkgsubmit:~/uploads/', + upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', + repository => 'http://repository.<%= domain %>/distrib/', + log_url => 'http://pkgsubmit.<%= domain %>/queue/build/', + admin => 'mageia-sysadm@mageia.org', + packager => 'Iurt the rebuild bot <mageia-sysadm@mageia.org>', + sendmail => 0, +} + diff --git a/modules/buildsystem/templates/mgarepo.conf b/modules/buildsystem/templates/mgarepo.conf index a7b8c43a..ac343431 100644 --- a/modules/buildsystem/templates/mgarepo.conf +++ b/modules/buildsystem/templates/mgarepo.conf @@ -47,6 +47,10 @@ target = <%= sched_home_dir %>/repsys/srpms allowed = svn://svn.<%= domain %>/svn/packages/updates/1 rpm-macros = global 1 +[submit infra_1] +target = <%= sched_home_dir %>/repsys/srpms +rpm-macros = global 1 + [macros global] distsuffix = .mga # mkrel definition to be removed when rpm-setup is updated on main build node diff --git a/modules/buildsystem/templates/submit-todo.conf b/modules/buildsystem/templates/submit-todo.conf index 94b250b1..e4fddadc 100644 --- a/modules/buildsystem/templates/submit-todo.conf +++ b/modules/buildsystem/templates/submit-todo.conf @@ -16,6 +16,8 @@ repository: svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/ 1: arch: i586 x86_64 + infra_1: + arch: i586 x86_64 cauldron: arch: i586 x86_64 @@ -56,6 +58,19 @@ targets: - send - rpminfo + infra_1: + checks: + - source + - version + - tag + - acl + - rpmlint + - recency + - queue_recency + actions: + - send + - rpminfo + # checks definition checks: tag: diff --git a/modules/buildsystem/templates/submit-upload.conf b/modules/buildsystem/templates/submit-upload.conf index da0262e4..ea49f511 100644 --- a/modules/buildsystem/templates/submit-upload.conf +++ b/modules/buildsystem/templates/submit-upload.conf @@ -17,6 +17,8 @@ repository: svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/ 1: arch: i586 x86_64 + infra_1: + arch: i586 x86_64 cauldron: arch: i586 x86_64 @@ -80,6 +82,21 @@ targets: - clean_rpmsrate - mirror + infra_1: + checks: + - version + - tag + - acl + - rpmlint + - recency + actions: + - sign + - install + - link + - archive + posts: + - genhdlist2 + # checks definition checks: tag: @@ -165,10 +182,12 @@ checks: authorized_arches: none mode: freeze + infra_1: + authorized_users: ^blino|boklm|buchan|colin|dams|dmorgan|misc|nanardon|pterjan|tmb$ + mode: freeze + cauldron: # <mrl> Prior freeze - authorized_sections: ^(debug/)?(core|nonfree|tainted)/(release|updates_testing)$ - authorized_arches: .* mode: normal ## <blino> Version freeze # authorized_packages: ^$ |