[Piuparts-commits] [piuparts] 05/05: p.conf: enable --warn-on-debsums-errors for wheezy2jessie upgrades

[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 bc72f49a222f50522778070c350a41cf41833c1a
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Dec 2 01:20:42 2014 +0100

    p.conf: enable --warn-on-debsums-errors for wheezy2jessie upgrades
    
    mostly for the benefit of the apache stack due to renaming conffiles and
    moving them to a different package at the same time
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog                  |  1 +
 instances/piuparts.conf.pejacevic | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a364875..8f08f63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ piuparts (0.61) UNRELEASED; urgency=medium
   * piuparts.conf:
     - Add flags-start-jessie, flags-end-jessie global variables.
     - Use --scriptsdir .../scripts-jessie for tests ending in jessie.
+    - Enable --warn-on-debsums-errors for wheezy2jessie upgrades.
   * distros.conf:
     - Add *updates, *backports, *proposed for jessie.
     - Switch 'testing' alias to 'stretch', but deactivate it for stable.
diff --git a/instances/piuparts.conf.pejacevic b/instances/piuparts.conf.pejacevic
index eaa980e..e9a8d62 100644
--- a/instances/piuparts.conf.pejacevic
+++ b/instances/piuparts.conf.pejacevic
@@ -38,6 +38,13 @@ 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
@@ -191,7 +198,7 @@ json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
-	%(flags-end-jessie)s
+	%(flags-end-jessie-upgrade)s
 distro = wheezy
 upgrade-test-distros = wheezy jessie
 
@@ -202,7 +209,7 @@ json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
-	%(flags-end-jessie)s
+	%(flags-end-jessie-upgrade)s
 depends-sections = wheezy
 arch = amd64
 area = main

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