[Mageia-sysadm] [685] Rename submit-queue as submit-upload now that they are merged
root at mageia.org
root at mageia.org
Fri Jan 7 01:44:44 CET 2011
Revision: 685
Author: pterjan
Date: 2011-01-07 01:44:43 +0100 (Fri, 07 Jan 2011)
Log Message:
-----------
Rename submit-queue as submit-upload now that they are merged
Modified Paths:
--------------
puppet/modules/buildsystem/manifests/init.pp
Added Paths:
-----------
puppet/modules/buildsystem/templates/submit-upload.conf
Removed Paths:
-------------
puppet/modules/buildsystem/templates/submit-queue.conf
Modified: puppet/modules/buildsystem/manifests/init.pp
===================================================================
--- puppet/modules/buildsystem/manifests/init.pp 2011-01-07 00:27:40 UTC (rev 684)
+++ puppet/modules/buildsystem/manifests/init.pp 2011-01-07 00:44:43 UTC (rev 685)
@@ -142,11 +142,11 @@
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")
}
}
Deleted: puppet/modules/buildsystem/templates/submit-queue.conf
===================================================================
--- puppet/modules/buildsystem/templates/submit-queue.conf 2011-01-07 00:27:40 UTC (rev 684)
+++ puppet/modules/buildsystem/templates/submit-queue.conf 2011-01-07 00:44:43 UTC (rev 685)
@@ -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:
-# <mrl> Prior freeze
- authorized_sections: ^[a-z]+/(release|testing)$
- authorized_arches: .*
- mode: normal
-## <blino> Version freeze
-# authorized_packages: ^$
-# authorized_sections: ^main/testing|contrib/testing$
-# authorized_arches: ^$
-# authorized_users: ^blino|ennael|nvigier$
-# mode: version_freeze
-# <mrl> 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
Copied: puppet/modules/buildsystem/templates/submit-upload.conf (from rev 684, puppet/modules/buildsystem/templates/submit-queue.conf)
===================================================================
--- puppet/modules/buildsystem/templates/submit-upload.conf (rev 0)
+++ puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-07 00:44:43 UTC (rev 685)
@@ -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:
+# <mrl> Prior freeze
+ authorized_sections: ^[a-z]+/(release|testing)$
+ authorized_arches: .*
+ mode: normal
+## <blino> Version freeze
+# authorized_packages: ^$
+# authorized_sections: ^main/testing|contrib/testing$
+# authorized_arches: ^$
+# authorized_users: ^blino|ennael|nvigier$
+# mode: version_freeze
+# <mrl> 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110107/db49c8b1/attachment-0001.html>
More information about the Mageia-sysadm
mailing list