buildsystem: add support for mga 2

7 files changed, 104 insertions, 4 deletions

diff --git a/modules/buildsystem/manifests/config.pp b/modules/buildsystem/manifests/config.pp
index 0fa25279..b038da21 100644
--- a/modules/buildsystem/manifests/config.pp
+++ b/modules/buildsystem/manifests/config.pp
@@ -1,7 +1,7 @@
 class buildsystem::config(
     architectures = ['i586', 'x86_64'],
     dev_distros = ['cauldron'],
-    stable_distros = ['1'],
+    stable_distros = ['1', '2'],
     distrosections = ['core', 'nonfree', 'tainted'],
     sectionsrepos = ['release', 'updates', 'updates_testing', 'backports',
     		     'backports_testing']
diff --git a/modules/buildsystem/manifests/iurt.pp b/modules/buildsystem/manifests/iurt.pp
index 6c26e867..a8e01348 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 { ['1','cauldron','mandriva2010.1','infra_1']: }
+    buildsystem::iurt::config { ['2','1','cauldron','mandriva2010.1','infra_1']: }
 
     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 86eaedd7..4520d49a 100644
--- a/modules/buildsystem/manifests/mgarepo.pp
+++ b/modules/buildsystem/manifests/mgarepo.pp
@@ -43,6 +43,11 @@ class buildsystem::mgarepo {
             'nonfree' => ['release','updates_testing','backports_testing','backports','updates'],
             'tainted' => ['release','updates_testing','backports_testing','backports','updates'],
         },
+        '2'        => {
+            'core'    => ['release','updates_testing','backports_testing','backports','updates'],
+            'nonfree' => ['release','updates_testing','backports_testing','backports','updates'],
+            'tainted' => ['release','updates_testing','backports_testing','backports','updates'],
+        },
         'infra_1'  => {
             'infra' => ['release']
         },
diff --git a/modules/buildsystem/templates/iurt/2.conf b/modules/buildsystem/templates/iurt/2.conf
new file mode 100644
index 00000000..a37f336c
--- /dev/null
+++ b/modules/buildsystem/templates/iurt/2.conf
@@ -0,0 +1,23 @@
+{
+ supported_arch => [ 'i586', 'x86_64' ],
+ all_media => { 'core' => [ 'release' ], 'nonfree' => [ 'release' ], 'tainted' => [ 'release' ] },
+ base_media => [ 'core/release' ],
+ upload => '<%= build_login %>@pkgsubmit:~/uploads/',
+ upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/',
+ unwanted_packages => '^monotone-',
+ 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,
+ build_timeout => {
+  'default' => 18000,
+   'gcc' => 57600,
+   'paraview' => 115200,
+   'salome' => 57600,
+   'itk' => 115200,
+   'wrapitk' => 115200,
+   'libreoffice' => 345600
+ },
+}
+
diff --git a/modules/buildsystem/templates/mgarepo.conf b/modules/buildsystem/templates/mgarepo.conf
index c6969c08..b3ce20c7 100644
--- a/modules/buildsystem/templates/mgarepo.conf
+++ b/modules/buildsystem/templates/mgarepo.conf
@@ -47,6 +47,11 @@ target = <%= sched_home_dir %>/repsys/srpms
 allowed = svn://svn.<%= domain %>/svn/packages/updates/1
 rpm-macros = global 1
 
+[submit 2]
+target = <%= sched_home_dir %>/repsys/srpms
+allowed = svn://svn.<%= domain %>/svn/packages/updates/2
+rpm-macros = global 2
+
 [submit infra_1]
 target = <%= sched_home_dir %>/repsys/srpms
 allowed = svn://svn.mageia.org/svn/packages/
@@ -61,9 +66,9 @@ vendor = Mageia.Org
 _real_vendor = mageia
 
 [macros cauldron]
-distro_release = 2
+distro_release = 3
 # 100 * major + minor
-mgaversion = 200
+mgaversion = 300
 mageia_branch = cauldron
 
 [macros 1]
@@ -71,6 +76,11 @@ distro_release = 1
 # 100 * major + minor
 mgaversion = 100
 
+[macros 2]
+distro_release = 2
+# 100 * major + minor
+mgaversion = 200
+
 [helper]
 create-srpm = /usr/share/repsys/create-srpm
 upload-srpm = /usr/local/bin/mga-youri-submit
diff --git a/modules/buildsystem/templates/youri/submit-todo.conf b/modules/buildsystem/templates/youri/submit-todo.conf
index 75347608..a4467c76 100644
--- a/modules/buildsystem/templates/youri/submit-todo.conf
+++ b/modules/buildsystem/templates/youri/submit-todo.conf
@@ -14,6 +14,8 @@ repository:
         queue: todo
         noarch: i586
         svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/
+        2:
+            arch: i586 x86_64
         1:
             arch: i586 x86_64
         infra_1:
@@ -59,6 +61,24 @@ targets:
             - rpminfo
             - ulri
 
+    2:
+        checks:
+            - source
+            - version
+            #- svn
+            - tag
+            - acl
+            - host
+            #- section
+            - rpmlint
+            - recency
+            #- history
+            - queue_recency
+        actions:
+            - send
+            - rpminfo
+            - ulri
+
     infra_1:
         checks:
             - source
@@ -139,6 +159,12 @@ checks:
     version:
         class: Youri::Submit::Check::Version
         options:
+           2:
+               authorized_packages: none_package_authorized
+               authorized_sections: ^(core|nonfree|tainted)/(updates_testing|backports|backports_testing)$
+               authorized_arches: none
+               mode: freeze
+
            1:
                authorized_packages: none_package_authorized
                authorized_sections: ^(core|nonfree|tainted)/(updates_testing|backports|backports_testing)$
diff --git a/modules/buildsystem/templates/youri/submit-upload.conf b/modules/buildsystem/templates/youri/submit-upload.conf
index 93195369..cbb74f96 100644
--- a/modules/buildsystem/templates/youri/submit-upload.conf
+++ b/modules/buildsystem/templates/youri/submit-upload.conf
@@ -16,6 +16,8 @@ repository:
         queue: queue
         noarch: i586
         svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/
+        2:
+            arch: i586 x86_64
         1:
             arch: i586 x86_64
         infra_1:
@@ -83,6 +85,34 @@ targets:
             - clean_rpmsrate    
             - mirror
 
+    2:
+        checks:
+            - version
+            - tag
+            - acl
+            - rpmlint
+            - recency
+        actions:
+#            - markrelease
+            - sign
+            - install
+            - link
+#            - unpack_release_notes
+#            - unpack_gfxboot_theme
+#            - unpack_meta_task
+#            - unpack_installer_images
+#            - unpack_installer_stage2
+#            - unpack_installer_advertising
+#            - unpack_installer_rescue
+#            - dkms_module_info
+            - archive
+            - mail
+#            - maintdb
+        posts:
+            - genhdlist2
+            - clean_rpmsrate    
+            - mirror
+
     infra_1:
         checks:
             - version
@@ -177,6 +207,12 @@ checks:
     version:
         class: Youri::Submit::Check::Version
         options:
+           2:
+               authorized_packages: none_package_authorized
+               authorized_sections: ^(debug/)?(core|nonfree|tainted)/(updates_testing|backports_testing)$
+               authorized_arches: none
+               mode: freeze
+
            1:
                authorized_packages: none_package_authorized
                authorized_sections: ^(debug/)?(core|nonfree|tainted)/(updates_testing|backports_testing)$