[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.49-105-gac1319a
Andreas Beckmann
anbe at debian.org
Fri Mar 1 15:33:02 UTC 2013
The following commit has been merged in the piatti branch:
commit 4035e25d2613b883358bc7b123b2c239370a0c01
Author: Andreas Beckmann <anbe at debian.org>
Date: Sat Feb 23 17:36:59 2013 +0100
p.conf: wrap sections, piuparts-command, and piuparts-flags
for better readability and easier patching
Signed-off-by: Andreas Beckmann <anbe at debian.org>
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index ea36368..9903adf 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -6,13 +6,22 @@
#
[global]
-#sections = sid wheezy squeeze2wheezy testing2sid
-sections = wheezy
+sections =
+# sid
+ wheezy
+# squeeze2wheezy
+# testing2sid
#
mirror = http://ftp.de.debian.org/debian/
master-host = localhost
master-user = piupartsm
bts-from = piuparts-devel at lists.alioth.debian.org
+piuparts-command =
+ sudo
+ /org/piuparts.debian.org/sbin/piuparts
+ --skip-logrotatefiles-test
+ --warn-on-others
+ --scriptsdir /etc/piuparts/scripts
PYTHONPATH = /org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages
master-directory = /org/piuparts.debian.org/master
slave-directory = /org/piuparts.debian.org/slave
@@ -21,7 +30,6 @@ backup-directory = /org/piuparts.debian.org/backup
tmpdir = /org/piuparts.debian.org/tmp
doc-root = /
master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master
-piuparts-command = sudo /org/piuparts.debian.org/sbin/piuparts --skip-logrotatefiles-test --warn-on-others --scriptsdir /etc/piuparts/scripts
# this value is too high for production (it will cause piuparts-slave to sleep
# for a whole day) but useful for testing master-slave mode, for running on a
# test system 24/7 without causing load for 24/7
@@ -30,7 +38,8 @@ idle-sleep = 86400
[sid]
description = Debian sid / main: package installation, removal and purge test.
-piuparts-flags = --scriptsdir /etc/piuparts/scripts-leftovers
+piuparts-flags =
+ --scriptsdir /etc/piuparts/scripts-leftovers
distro = sid
chroot-tgz = sid.tar.gz
max-reserved = 50
@@ -41,7 +50,8 @@ log-file = sid.log
[testing2sid]
description = Debian main: package installation in testing and dist-upgrade to sid, then removal and purge test.
-piuparts-flags = --warn-on-leftovers-after-purge
+piuparts-flags =
+ --warn-on-leftovers-after-purge
distro = testing
upgrade-test-distros = testing sid
upgrade-test-chroot-tgz = testing.tar.gz
@@ -52,7 +62,8 @@ log-file = testing2sid.log
[wheezy]
description = Debian wheezy / main: package installation, removal and purge test.
-piuparts-flags = --warn-on-leftovers-after-purge
+piuparts-flags =
+ --warn-on-leftovers-after-purge
distro = wheezy
chroot-tgz = wheezy.tar.gz
max-reserved = 50
@@ -62,7 +73,11 @@ log-file = wheezy.log
[squeeze2wheezy]
description = Debian main: package installation in squeeze and dist-upgrade to wheezy, then removal and purge test.
-piuparts-flags = --warn-on-leftovers-after-purge --no-eatmydata --dpkg-noforce-unsafe-io -i /etc/shells
+piuparts-flags =
+ --warn-on-leftovers-after-purge
+ --no-eatmydata
+ --dpkg-noforce-unsafe-io
+ -i /etc/shells
distro = squeeze
upgrade-test-distros = squeeze wheezy
upgrade-test-chroot-tgz = squeeze.tar.gz
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piatti
index a24130a..773fe6c 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -6,12 +6,24 @@
#
[global]
-sections = sid testing2sid wheezy squeeze2wheezy squeeze lenny2squeeze
+sections =
+ sid
+ testing2sid
+ wheezy
+ squeeze2wheezy
+ squeeze
+ lenny2squeeze
#
mirror = http://piatti.debian.org/debian/
master-host = localhost
master-user = piupartsm
bts-from = piuparts-devel at lists.alioth.debian.org
+piuparts-command =
+ sudo
+ /org/piuparts.debian.org/sbin/piuparts
+ --skip-logrotatefiles-test
+ --warn-on-others
+ --scriptsdir /etc/piuparts/scripts
PYTHONPATH = /org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages
master-directory = /org/piuparts.debian.org/master
slave-directory = /org/piuparts.debian.org/slave
@@ -20,7 +32,6 @@ backup-directory = /org/piuparts.debian.org/backup
tmpdir = /org/piuparts.debian.org/tmp
doc-root = /
master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master
-piuparts-command = sudo /org/piuparts.debian.org/sbin/piuparts --skip-logrotatefiles-test --warn-on-others --scriptsdir /etc/piuparts/scripts
# 30*60
idle-sleep = 1800
# 60*60*24*7
@@ -37,7 +48,8 @@ reschedule-fail-count = 15
[sid]
precedence = 1
description = Debian sid / main: package installation, removal and purge test.
-piuparts-flags = --scriptsdir /etc/piuparts/scripts-leftovers
+piuparts-flags =
+ --scriptsdir /etc/piuparts/scripts-leftovers
# Once there are no packages left which leave files on purge behind,
# --pedantic-purge-test should be added
distro = sid
@@ -49,7 +61,8 @@ log-file = sid.log
[testing2sid]
precedence = 4
description = Debian main: package installation in sid and dist-upgrade to testing, then removal and purge test.
-piuparts-flags = --warn-on-leftovers-after-purge
+piuparts-flags =
+ --warn-on-leftovers-after-purge
distro = testing
upgrade-test-distros = testing sid
upgrade-test-chroot-tgz = testing.tar.gz
@@ -61,7 +74,8 @@ log-file = testing2sid.log
[wheezy]
precedence = 2
description = Debian wheezy / main: package installation, removal and purge test.
-piuparts-flags = --warn-on-leftovers-after-purge
+piuparts-flags =
+ --warn-on-leftovers-after-purge
distro = wheezy
chroot-tgz = wheezy.tar.gz
max-reserved = 100
@@ -71,7 +85,10 @@ log-file = wheezy.log
[squeeze2wheezy]
precedence = 3
description = Debian main: package installation in squeeze and dist-upgrade to wheezy, then removal and purge test.
-piuparts-flags = --warn-on-leftovers-after-purge --no-eatmydata -i /etc/shells
+piuparts-flags =
+ --warn-on-leftovers-after-purge
+ --no-eatmydata
+ -i /etc/shells
distro = squeeze
upgrade-test-distros = squeeze wheezy
upgrade-test-chroot-tgz = squeeze.tar.gz
@@ -82,7 +99,12 @@ log-file = squeeze2wheezy.log
[squeeze]
precedence = 5
description = Debian squeeze / main: package installation, removal and purge test.
-piuparts-flags = --warn-on-leftovers-after-purge --no-eatmydata --scriptsdir /etc/piuparts/scripts-squeeze --warn-on-debsums-errors -i /etc/shells
+piuparts-flags =
+ --warn-on-leftovers-after-purge
+ --no-eatmydata
+ --scriptsdir /etc/piuparts/scripts-squeeze
+ --warn-on-debsums-errors
+ -i /etc/shells
distro = squeeze
chroot-tgz = squeeze.tar.gz
max-reserved = 50
@@ -95,7 +117,13 @@ log-file = squeeze.log
max-reserved = 0
precedence = 99
description = Debian main: package installation in lenny and dist-upgrade to squeeze, then removal and purge test.
-piuparts-flags = --warn-on-leftovers-after-purge --dpkg-noforce-unsafe-io --no-eatmydata --scriptsdir /etc/piuparts/scripts-squeeze --warn-on-debsums-errors -i /etc/shells
+piuparts-flags =
+ --warn-on-leftovers-after-purge
+ --dpkg-noforce-unsafe-io
+ --no-eatmydata
+ --scriptsdir /etc/piuparts/scripts-squeeze
+ --warn-on-debsums-errors
+ -i /etc/shells
distro = lenny
upgrade-test-distros = lenny squeeze
upgrade-test-chroot-tgz = lenny.tar.gz
--
piuparts git repository
More information about the Piuparts-commits
mailing list