[Piuparts-commits] [piuparts] 03/03: add piuparts.conf.lamarr to be used for multi arch master-slave mode development

Holger Levsen holger at moszumanska.debian.org
Sun Oct 19 23:50:57 UTC 2014


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit de2d6a56f6812f361ff5a78dea294b1d6f9339ae
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Oct 20 01:49:18 2014 +0200

    add piuparts.conf.lamarr to be used for multi arch master-slave mode development
---
 instances/piuparts.conf.goldwasser                 | 59 ++++++++++++--------
 ...uparts.conf.goldwasser => piuparts.conf.lamarr} | 62 +++++++++++++---------
 2 files changed, 75 insertions(+), 46 deletions(-)

diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index d4c24da..45ceae1 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -44,15 +44,29 @@ flags-start-squeeze =
 # and removing a shell would remove its entry from /etc/shells
 	-i /etc/shells
 
+# common flags for tests ending in squeeze
+flags-end-squeeze =
+# extra fake-essential packages for successfully purging in squeeze
+	--scriptsdir /etc/piuparts/scripts-squeeze
+# debsums failures won't be fixed in squeeze
+	--warn-on-debsums-errors
+
+# common flags for starting a test in lenny
+flags-start-lenny =
+# dpkg --force-unsafe-io was added in squeeze
+	--dpkg-noforce-unsafe-io
+# same flags needed as in squeeze
+        %(flags-start-squeeze)s
+
+
 [global]
 sections =
 #	sid
 #	jessie
 #	wheezy2jessie
-	wheezy
-#	squeeze2wheezy
-#	testing2sid
-#
+#	wheezy
+	squeeze-lts
+
 mirror = http://ftp.de.debian.org/debian/
 master-host = localhost
 master-user = piupartsm
@@ -72,6 +86,7 @@ backup-directory = /srv/piuparts.debian.org/backup
 tmpdir = /srv/piuparts.debian.org/tmp
 doc-root = /
 components = main
+slave-count = 2
 # 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
@@ -83,25 +98,15 @@ max-reserved = 50
 description = + Fails if there are leftover files after purge.
 piuparts-flags =
 	%(flags-leftovers)s
-distro = sid
+
 # Once there are no packages left which leave files on purge behind,
 # --pedantic-purge-test should be added
 
-
-[testing2sid]
-piuparts-flags =
-	%(flags-default)s
-distro = testing
-upgrade-test-distros = testing sid
-reschedule-old-count = 0
-
-
 [jessie]
 piuparts-flags =
 	%(flags-default)s
 distro = jessie
 
-
 [wheezy2jessie]
 piuparts-flags =
 	%(flags-default)s
@@ -109,22 +114,32 @@ piuparts-flags =
 distro = wheezy
 upgrade-test-distros = wheezy jessie
 
-
 [wheezy]
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
 	%(flags-end-wheezy)s
 distro = wheezy
-reschedule-old-count = 0
-
 
-[squeeze2wheezy]
+[squeeze]
+json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-squeeze)s
-	%(flags-end-wheezy)s
+	%(flags-end-squeeze)s
 distro = squeeze
-upgrade-test-distros = squeeze wheezy
-reschedule-old-count = 0
+reschedule-old-count = 50
+# 1 month (60*60*24*30)
+max-tgz-age = 2592000
 
+[squeeze2squeeze-lts]
+json-sections = none
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-squeeze)s
+	%(flags-end-squeeze)s
+depends-sections = squeeze
+arch = amd64
+area = main
+distro = squeeze-lts
+upgrade-test-distros = squeeze squeeze-lts
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.lamarr
similarity index 76%
copy from instances/piuparts.conf.goldwasser
copy to instances/piuparts.conf.lamarr
index d4c24da..34b5243 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.lamarr
@@ -1,5 +1,5 @@
 #
-# This is the configuration file for piuparts running in master-slave mode on a (development) host called goldwasser
+# This is the configuration file for piuparts running in master-slave mode on a (development) host called lamarr
 #
 # For more information on this setup see /usr/share/doc/piuparts-master/README_server.txt
 #
@@ -44,17 +44,31 @@ flags-start-squeeze =
 # and removing a shell would remove its entry from /etc/shells
 	-i /etc/shells
 
+# common flags for tests ending in squeeze
+flags-end-squeeze =
+# extra fake-essential packages for successfully purging in squeeze
+	--scriptsdir /etc/piuparts/scripts-squeeze
+# debsums failures won't be fixed in squeeze
+	--warn-on-debsums-errors
+
+# common flags for starting a test in lenny
+flags-start-lenny =
+# dpkg --force-unsafe-io was added in squeeze
+	--dpkg-noforce-unsafe-io
+# same flags needed as in squeeze
+        %(flags-start-squeeze)s
+
+
 [global]
 sections =
 #	sid
 #	jessie
 #	wheezy2jessie
-	wheezy
-#	squeeze2wheezy
-#	testing2sid
-#
+#	wheezy
+	squeeze-lts
+
 mirror = http://ftp.de.debian.org/debian/
-master-host = localhost
+master-host = goldwasser
 master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
 master-command = /srv/piuparts.debian.org/share/piuparts/piuparts-master
@@ -83,25 +97,15 @@ max-reserved = 50
 description = + Fails if there are leftover files after purge.
 piuparts-flags =
 	%(flags-leftovers)s
-distro = sid
+
 # Once there are no packages left which leave files on purge behind,
 # --pedantic-purge-test should be added
 
-
-[testing2sid]
-piuparts-flags =
-	%(flags-default)s
-distro = testing
-upgrade-test-distros = testing sid
-reschedule-old-count = 0
-
-
 [jessie]
 piuparts-flags =
 	%(flags-default)s
 distro = jessie
 
-
 [wheezy2jessie]
 piuparts-flags =
 	%(flags-default)s
@@ -109,22 +113,32 @@ piuparts-flags =
 distro = wheezy
 upgrade-test-distros = wheezy jessie
 
-
 [wheezy]
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
 	%(flags-end-wheezy)s
 distro = wheezy
-reschedule-old-count = 0
-
 
-[squeeze2wheezy]
+[squeeze]
+json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-squeeze)s
-	%(flags-end-wheezy)s
+	%(flags-end-squeeze)s
 distro = squeeze
-upgrade-test-distros = squeeze wheezy
-reschedule-old-count = 0
+reschedule-old-count = 50
+# 1 month (60*60*24*30)
+max-tgz-age = 2592000
 
+[squeeze2squeeze-lts]
+json-sections = none
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-squeeze)s
+	%(flags-end-squeeze)s
+depends-sections = squeeze
+arch = amd64
+area = main
+distro = squeeze-lts
+upgrade-test-distros = squeeze squeeze-lts

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git



More information about the Piuparts-commits mailing list