From 11b3ce482374f19af38ab190f9b26ab4ba9818a3 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Fri, 7 Jan 2011 00:44:43 +0000 Subject: Rename submit-queue as submit-upload now that they are merged --- modules/buildsystem/manifests/init.pp | 4 +- modules/buildsystem/templates/submit-queue.conf | 163 ----------------------- modules/buildsystem/templates/submit-upload.conf | 163 +++++++++++++++++++++++ 3 files changed, 165 insertions(+), 165 deletions(-) delete mode 100644 modules/buildsystem/templates/submit-queue.conf create mode 100644 modules/buildsystem/templates/submit-upload.conf (limited to 'modules') diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp index f1230c00..916c43c2 100644 --- a/modules/buildsystem/manifests/init.pp +++ b/modules/buildsystem/manifests/init.pp @@ -142,11 +142,11 @@ class buildsystem { content => template("buildsystem/submit-todo.conf") } - file { "/etc/youri/submit-queue.conf": + file { "/etc/youri/submit-upload.conf": ensure => present, mode => 644, require => File["/etc/youri"], - content => template("buildsystem/submit-queue.conf") + content => template("buildsystem/submit-upload.conf") } } diff --git a/modules/buildsystem/templates/submit-queue.conf b/modules/buildsystem/templates/submit-queue.conf deleted file mode 100644 index e709fca9..00000000 --- a/modules/buildsystem/templates/submit-queue.conf +++ /dev/null @@ -1,163 +0,0 @@ -<% -escaped_domain = domain.gsub('.','\.') -%> - -home: <%= sched_home_dir %> - -# repository declaration -repository: - class: Youri::Repository::Mageia_upload - options: - install_root: <%= repository_root %>/distrib - upload_root: ${home}/uploads/ - upload_state: queue - queue: queue - noarch: i586 - svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/ - 1: - arch: i586 x86_64 - cauldron: - arch: i586 x86_64 - -# targets definition -targets: - cauldron: - checks: - - version - - tag - - acl - - rpmlint - - recency - - queue_recency - actions: -# - sign - - install - - link -# - mail -# - archive - - clean - - 1: - checks: - - version - - tag - - acl - - rpmlint - - recency - - queue_recency - actions: -# - sign - - install - - link -# - mail -# - archive - - clean - -# checks definition -checks: - tag: - class: Youri::Submit::Check::Tag - options: - tags: - release: 'mga\d+' - # packager: '<\S+@<%= escaped_domain %>>$' - distribution: '^Mageia' - vendor: '^Mageia.org$' - - recency: - class: Youri::Submit::Check::Recency - - queue_recency: - class: Youri::Submit::Check::Queue_recency - - host: - class: Youri::Submit::Check::Host - options: - host_file: /etc/youri/host.conf - - section: - class: Youri::Submit::Check::Section - - rpmlint: - class: Youri::Submit::Check::Rpmlint - options: - config: /etc/rpmlint/config - results: - - buildprereq-use - - no-description-tag - - no-summary-tag - - non-standard-group - - non-xdg-migrated-menu - # it breaks dbus - #- patch-not-applied - - percent-in-conflicts - - percent-in-dependency - - percent-in-obsoletes - - percent-in-provides - - summary-ended-with-dot - - svn: - class: Youri::Submit::Check::SVN - - acl: - class: Youri::Submit::Check::ACL - options: - acl_file: /etc/youri/acl.conf - - history: - class: Youri::Submit::Check::History - - source: - class: Youri::Submit::Check::Source - - precedence: - class: Youri::Submit::Check::Precedence - options: - target: cauldron - - version: - class: Youri::Submit::Check::Version - options: - 1: - authorized_packages: none_package_authorized - authorized_sections: ^[a-z]+/(updates|testing|backports|backports_testing)$ - authorized_arches: none - mode: freeze - - cauldron: -# Prior freeze - authorized_sections: ^[a-z]+/(release|testing)$ - authorized_arches: .* - mode: normal -## Version freeze -# authorized_packages: ^$ -# authorized_sections: ^main/testing|contrib/testing$ -# authorized_arches: ^$ -# authorized_users: ^blino|ennael|nvigier$ -# mode: version_freeze -# Freeze config -# authorized_packages: ^mdkonline|drakxtools|urpmi|ia_ora-gnome|ldetect|ldetect-lst|rpm-mageia-setup|perl-MDK-Common$ -# authorized_packages: none_package_authorized -# authorized_sections: ^restricted/release|main/testing|contrib/testing$ -# authorized_arches: none -# authorized_users: ^blino|ennael|nvigier$ -# mode: freeze - -# actions definitions -actions: - install: - class: Youri::Submit::Action::Install - - markrelease: - class: Youri::Upload::Action::Markrelease - - link: - class: Youri::Upload::Action::Link - - archive: - class: Youri::Upload::Action::Archive - - clean: - class: Youri::Upload::Action::Clean - -# vim:ft=yaml:et:sw=4 diff --git a/modules/buildsystem/templates/submit-upload.conf b/modules/buildsystem/templates/submit-upload.conf new file mode 100644 index 00000000..e709fca9 --- /dev/null +++ b/modules/buildsystem/templates/submit-upload.conf @@ -0,0 +1,163 @@ +<% +escaped_domain = domain.gsub('.','\.') +%> + +home: <%= sched_home_dir %> + +# repository declaration +repository: + class: Youri::Repository::Mageia_upload + options: + install_root: <%= repository_root %>/distrib + upload_root: ${home}/uploads/ + upload_state: queue + queue: queue + noarch: i586 + svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/ + 1: + arch: i586 x86_64 + cauldron: + arch: i586 x86_64 + +# targets definition +targets: + cauldron: + checks: + - version + - tag + - acl + - rpmlint + - recency + - queue_recency + actions: +# - sign + - install + - link +# - mail +# - archive + - clean + + 1: + checks: + - version + - tag + - acl + - rpmlint + - recency + - queue_recency + actions: +# - sign + - install + - link +# - mail +# - archive + - clean + +# checks definition +checks: + tag: + class: Youri::Submit::Check::Tag + options: + tags: + release: 'mga\d+' + # packager: '<\S+@<%= escaped_domain %>>$' + distribution: '^Mageia' + vendor: '^Mageia.org$' + + recency: + class: Youri::Submit::Check::Recency + + queue_recency: + class: Youri::Submit::Check::Queue_recency + + host: + class: Youri::Submit::Check::Host + options: + host_file: /etc/youri/host.conf + + section: + class: Youri::Submit::Check::Section + + rpmlint: + class: Youri::Submit::Check::Rpmlint + options: + config: /etc/rpmlint/config + results: + - buildprereq-use + - no-description-tag + - no-summary-tag + - non-standard-group + - non-xdg-migrated-menu + # it breaks dbus + #- patch-not-applied + - percent-in-conflicts + - percent-in-dependency + - percent-in-obsoletes + - percent-in-provides + - summary-ended-with-dot + + svn: + class: Youri::Submit::Check::SVN + + acl: + class: Youri::Submit::Check::ACL + options: + acl_file: /etc/youri/acl.conf + + history: + class: Youri::Submit::Check::History + + source: + class: Youri::Submit::Check::Source + + precedence: + class: Youri::Submit::Check::Precedence + options: + target: cauldron + + version: + class: Youri::Submit::Check::Version + options: + 1: + authorized_packages: none_package_authorized + authorized_sections: ^[a-z]+/(updates|testing|backports|backports_testing)$ + authorized_arches: none + mode: freeze + + cauldron: +# Prior freeze + authorized_sections: ^[a-z]+/(release|testing)$ + authorized_arches: .* + mode: normal +## Version freeze +# authorized_packages: ^$ +# authorized_sections: ^main/testing|contrib/testing$ +# authorized_arches: ^$ +# authorized_users: ^blino|ennael|nvigier$ +# mode: version_freeze +# Freeze config +# authorized_packages: ^mdkonline|drakxtools|urpmi|ia_ora-gnome|ldetect|ldetect-lst|rpm-mageia-setup|perl-MDK-Common$ +# authorized_packages: none_package_authorized +# authorized_sections: ^restricted/release|main/testing|contrib/testing$ +# authorized_arches: none +# authorized_users: ^blino|ennael|nvigier$ +# mode: freeze + +# actions definitions +actions: + install: + class: Youri::Submit::Action::Install + + markrelease: + class: Youri::Upload::Action::Markrelease + + link: + class: Youri::Upload::Action::Link + + archive: + class: Youri::Upload::Action::Archive + + clean: + class: Youri::Upload::Action::Clean + +# vim:ft=yaml:et:sw=4 -- cgit v1.2.1