[Piuparts-commits] [piuparts] 02/02: piuparts.conf.piu-slave-1und1-01: merge changes from pejacevic config but replace amd64 with i386.

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit 437a99e6e93a34beb6d3ed0a4a8f9a5abad35967
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Dec 5 18:19:28 2014 +0100

    piuparts.conf.piu-slave-1und1-01: merge changes from pejacevic config but replace amd64 with i386.
---
 debian/changelog                           |  2 +
 instances/piuparts.conf.piu-slave-1und1-01 | 61 +++++++++++++++++++++++++-----
 2 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec045e8..983f1a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ piuparts (0.62) UNRELEASED; urgency=medium
 
   [ Holger Levsen ]
   * piuparts.conf.pejacevic: add new suite: jessie2proposed.
+  * piuparts.conf.piu-slave-1und1-01: merge changes from pejacevic config but
+    replace amd64 with i386. 
 
  -- Andreas Beckmann <anbe at debian.org>  Wed, 03 Dec 2014 20:36:30 +0100
 
diff --git a/instances/piuparts.conf.piu-slave-1und1-01 b/instances/piuparts.conf.piu-slave-1und1-01
index 48a9d50..d794848 100644
--- a/instances/piuparts.conf.piu-slave-1und1-01
+++ b/instances/piuparts.conf.piu-slave-1und1-01
@@ -29,7 +29,23 @@ flags-leftovers =
 # perform some additional cleanup
 	--scriptsdir /etc/piuparts/scripts-leftovers
 
-# common flags for starting a test in wheezy
+# common flags for tests starting in jessie
+flags-start-jessie =
+# no flags needed
+
+# common flags for tests ending in jessie
+flags-end-jessie =
+# extra fake-essential packages for successfully purging in jessie
+	--scriptsdir /etc/piuparts/scripts-jessie
+
+# common flags for tests ending in jessie after a distupgrade
+flags-end-jessie-upgrade =
+	%(flags-end-jessie)s
+# debsums failures won't be fixed in jessie, mostly related to
+# obsolete/renamed conffiles that moved to different packages
+	--warn-on-debsums-errors
+
+# common flags for tests starting in wheezy
 flags-start-wheezy =
 # no flags needed
 
@@ -40,7 +56,7 @@ flags-end-wheezy =
 # debsums failures won't be fixed in wheezy
 	--warn-on-debsums-errors
 
-# common flags for starting a test in squeeze
+# common flags for tests starting in squeeze
 flags-start-squeeze =
 # up to squeeze a non-empty /etc/shells was shipped, actually installing
 # and removing a shell would remove its entry from /etc/shells
@@ -53,7 +69,7 @@ flags-end-squeeze =
 # debsums failures won't be fixed in squeeze
 	--warn-on-debsums-errors
 
-# common flags for starting a test in lenny
+# common flags for tests starting in lenny
 flags-start-lenny =
 # dpkg --force-unsafe-io was added in squeeze
 	--dpkg-noforce-unsafe-io
@@ -69,6 +85,8 @@ sections =
 	sid-nodoc
 	testing2sid
 	jessie
+#	jessie-proposed
+	jessie2proposed
 	wheezy2jessie
 	wheezy2bpo2jessie
 #	wheezy-proposed
@@ -81,7 +99,6 @@ sections =
 	squeeze2squeeze-lts
 	squeeze
 	lenny2squeeze
-#
 mirror = http://mirror.1und1.de/debian/
 master-host = pejacevic.debian.org
 master-user = piupartsm
@@ -101,6 +118,7 @@ backup-directory = /srv/piuparts.debian.org/backup
 tmpdir = /srv/piuparts.debian.org/tmp
 doc-root = /
 components = main
+# the slave-count setting is for the slave(s)
 slave-count = 4
 # 30*60
 idle-sleep = 1800
@@ -160,7 +178,7 @@ piuparts-flags =
 	%(flags-default)s
 depends-sections = sid
 distro = experimental
-arch = amd64
+arch = i386
 area = main
 upgrade-test-distros = sid experimental
 
@@ -169,17 +187,41 @@ upgrade-test-distros = sid experimental
 precedence = 3
 piuparts-flags =
 	%(flags-default)s
+	%(flags-start-jessie)s
+	%(flags-end-jessie)s
 distro = jessie
 # 1 week (60*60*24*7)
 max-tgz-age = 604800
 
 
+[jessie-proposed]
+precedence = 3
+json-sections = none
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-jessie)s
+	%(flags-end-jessie)s
+distro = jessie-proposed
+
+
+[jessie2proposed]
+precedence = 3
+json-sections = none
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-jessie)s
+	%(flags-end-jessie)s
+distro = jessie
+upgrade-test-distros = jessie jessie-proposed
+
+
 [wheezy2jessie]
 precedence = 3
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
+	%(flags-end-jessie-upgrade)s
 distro = wheezy
 upgrade-test-distros = wheezy jessie
 
@@ -190,8 +232,9 @@ json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
+	%(flags-end-jessie-upgrade)s
 depends-sections = wheezy
-arch = amd64
+arch = i386
 area = main
 distro = wheezy-backports
 upgrade-test-distros = wheezy wheezy-backports jessie
@@ -260,7 +303,7 @@ piuparts-flags =
 	%(flags-start-squeeze)s
 	%(flags-end-wheezy)s
 depends-sections = squeeze
-arch = amd64
+arch = i386
 area = main
 distro = squeeze-backports
 upgrade-test-distros = squeeze squeeze-backports wheezy
@@ -274,7 +317,7 @@ piuparts-flags =
 	%(flags-start-squeeze)s
 	%(flags-end-squeeze)s
 depends-sections = squeeze squeeze2bpo2wheezy
-arch = amd64
+arch = i386
 area = main
 upgrade-test-distros = squeeze squeeze-backports-sloppy
 
@@ -298,7 +341,7 @@ piuparts-flags =
 	%(flags-start-squeeze)s
 	%(flags-end-squeeze)s
 depends-sections = squeeze
-arch = amd64
+arch = i386
 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