aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem/templates
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2011-01-30 11:30:22 +0000
committerPascal Terjan <pterjan@mageia.org>2011-01-30 11:30:22 +0000
commit630317720ba1c5ddf1517394a48ac1a1cf7449ce (patch)
tree40d0a97f55a043f88e2d88c15e3ec4de83e54184 /modules/buildsystem/templates
parent9a93c912b63975e51feb2849316ff52cfac56188 (diff)
downloadpuppet-630317720ba1c5ddf1517394a48ac1a1cf7449ce.tar
puppet-630317720ba1c5ddf1517394a48ac1a1cf7449ce.tar.gz
puppet-630317720ba1c5ddf1517394a48ac1a1cf7449ce.tar.bz2
puppet-630317720ba1c5ddf1517394a48ac1a1cf7449ce.tar.xz
puppet-630317720ba1c5ddf1517394a48ac1a1cf7449ce.zip
Rename testing to updates_testing
Diffstat (limited to 'modules/buildsystem/templates')
-rw-r--r--modules/buildsystem/templates/submit-todo.conf8
-rw-r--r--modules/buildsystem/templates/submit-upload.conf8
-rw-r--r--modules/buildsystem/templates/upload.conf24
3 files changed, 20 insertions, 20 deletions
diff --git a/modules/buildsystem/templates/submit-todo.conf b/modules/buildsystem/templates/submit-todo.conf
index 2485226b..67c303ac 100644
--- a/modules/buildsystem/templates/submit-todo.conf
+++ b/modules/buildsystem/templates/submit-todo.conf
@@ -123,25 +123,25 @@ checks:
options:
1.0:
authorized_packages: none_package_authorized
- authorized_sections: ^[a-z]+/(updates|testing|backports|backports_testing)$
+ authorized_sections: ^(core|nonfree|tainted)/(updates|updates_testing|backports|backports_testing)$
authorized_arches: none
mode: freeze
cauldron:
# <mrl> Prior freeze
- authorized_sections: ^[a-z]+/(release|testing)$
+ authorized_sections: ^[a-z]+/(release|updates_testing)$
authorized_arches: .*
mode: normal
## <blino> Version freeze
# authorized_packages: ^$
-# authorized_sections: ^main/testing|contrib/testing$
+# authorized_sections: ^(core|nonfree|tainted)/updates_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_sections: ^restricted/release|main/updates_testing|contrib/updates_testing$
# authorized_arches: none
# authorized_users: ^blino|ennael|nvigier$
# mode: freeze
diff --git a/modules/buildsystem/templates/submit-upload.conf b/modules/buildsystem/templates/submit-upload.conf
index 38968253..beca119f 100644
--- a/modules/buildsystem/templates/submit-upload.conf
+++ b/modules/buildsystem/templates/submit-upload.conf
@@ -125,25 +125,25 @@ checks:
options:
1:
authorized_packages: none_package_authorized
- authorized_sections: ^[a-z]+/(updates|testing|backports|backports_testing)$
+ authorized_sections: ^[a-z]+/(updates|updates_testing|backports|backports_testing)$
authorized_arches: none
mode: freeze
cauldron:
# <mrl> Prior freeze
- authorized_sections: ^[a-z]+/(release|testing)$
+ authorized_sections: ^[a-z]+/(release|updates_testing)$
authorized_arches: .*
mode: normal
## <blino> Version freeze
# authorized_packages: ^$
-# authorized_sections: ^main/testing|contrib/testing$
+# authorized_sections: ^[a-z]+/updates_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_sections: ^restricted/release|main/updates_testing|contrib/updates_testing$
# authorized_arches: none
# authorized_users: ^blino|ennael|nvigier$
# mode: freeze
diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf
index f0ad072b..fa6ab672 100644
--- a/modules/buildsystem/templates/upload.conf
+++ b/modules/buildsystem/templates/upload.conf
@@ -38,29 +38,29 @@ my $homedir = "<%= build_home_dir %>";
default => {
"core/release" => [ "core/updates", "core/release" ],
"core/updates" => [ "core/updates", "core/release" ],
- "core/testing" => [ "core/testing", "core/updates", "core/release" ],
- "core/backports" => [ "core/backports", "core/testing", "core/updates", "core/release" ],
- "core/backports_testing" => [ "core/backports_testing", "core/backports", "core/testing", "core/updates", "core/release" ],
+ "core/updates_testing" => [ "core/updates_testing", "core/updates", "core/release" ],
+ "core/backports" => [ "core/backports", "core/updates_testing", "core/updates", "core/release" ],
+ "core/backports_testing" => [ "core/backports_testing", "core/backports", "core/updates_testing", "core/updates", "core/release" ],
"nonfree/release" => [ "core/release", "nonfree/release" ],
"nonfree/updates" => [ "core/updates", "core/release", "nonfree/release", "nonfree/updates" ],
- "nonfree/testing" => [ "core/updates", "core/release", "core/testing", "nonfree/release", "nonfree/updates", "nonfree/testing" ],
- "nonfree/backports" => [ "core/backports", "core/testing", "core/updates", "core/release",
- "nonfree/release", "nonfree/updates", "nonfree/testing", "nonfree/backports" ],
- "nonfree/backports_testing" => [ "core/backports_testing", "core/backports", "core/testing", "core/updates", "core/release",
- "nonfree/release", "nonfree/updates", "nonfree/testing", "nonfree/backports", "nonfree/backports_testing" ],
+ "nonfree/updates_testing" => [ "core/updates", "core/release", "core/updates_testing", "nonfree/release", "nonfree/updates", "nonfree/updates_testing" ],
+ "nonfree/backports" => [ "core/backports", "core/updates_testing", "core/updates", "core/release",
+ "nonfree/release", "nonfree/updates", "nonfree/updates_testing", "nonfree/backports" ],
+ "nonfree/backports_testing" => [ "core/backports_testing", "core/backports", "core/updates_testing", "core/updates", "core/release",
+ "nonfree/release", "nonfree/updates", "nonfree/updates_testing", "nonfree/backports", "nonfree/backports_testing" ],
"tainted/release" => [ "core/release", "nonfree/release", "tainted/release" ],
"tainted/updates" => [ "core/release", "nonfree/release", "tainted/release",
"core/updates", "nonfree/updates", "tainted/updates" ],
- "tainted/testing" => [ "core/release", "nonfree/release", "tainted/release",
+ "tainted/updates_testing" => [ "core/release", "nonfree/release", "tainted/release",
"core/updates", "nonfree/updates", "tainted/updates",
- "core/testing", "nonfree/testing", "tainted/testing" ],
+ "core/updates_testing", "nonfree/updates_testing", "tainted/updates_testing" ],
"tainted/backports" => [ "core/release", "nonfree/release", "tainted/release",
"core/updates", "nonfree/updates", "tainted/updates",
- "core/testing", "nonfree/testing", "tainted/testing",
+ "core/updates_testing", "nonfree/updates_testing", "tainted/updates_testing",
"core/backports", "nonfree/backports", "tainted/backports" ],
"tainted/backports_testing" => [ "core/release", "nonfree/release", "tainted/release",
"core/updates", "nonfree/updates", "tainted/updates",
- "core/testing", "nonfree/testing", "tainted/testing",
+ "core/updates_testing", "nonfree/updates_testing", "tainted/updates_testing",
"core/backports", "nonfree/backports", "tainted/backports",
"core/backports_testing", "nonfree/backports_testing", "tainted/backports_testing" ],
},