[Piuparts-commits] [piuparts] 08/51: p.conf: add [jessie2Xstretch]

[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 81d50f81b0eddae161fccc6082aa7bbc042665eb
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Jun 18 14:43:28 2017 +0200

    p.conf: add [jessie2Xstretch]
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                           |  6 +++---
 instances/piuparts.conf-template.pejacevic | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 219d1e2..4ca648f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ piuparts (0.78) UNRELEASED; urgency=medium
       the amount of changes needed on "moving targets" (like stable22sid)
       after a stable Debian release.
     - Set keyring for archived distros to debian-archive-removed-keys.gpg.
+    - Add new suites: jessie2Xstretch, jessie2Xstretch-rcmd, doing two-stage
+      upgrades (apt-get update && apt-get dist-upgrade) from jessie to stretch
+      (without and with --install-recommends).
     - Enable stretch2proposed.  (Closes: #864933)
     - Use --warn-on-debsums-errors for tests ending in stretch.
     - Rotate aliases for testing=buster and stable=stretch.
@@ -98,9 +101,6 @@ piuparts (0.78) UNRELEASED; urgency=medium
       - stable22sid, upgrading stretch -> buster -> sid
       - oldstable222sid, upgrading from jessie -> stretch -> buster -> sid
         (Closes: #859620)
-      - jessie2Xstretch-rcmd, doing two-stage upgrades (apt-get update &&
-        apt-get dist-upgrade) from jessie to stretch (with
-        --install-recommends)
     - Adjust precedences for most of the tested suites, set precedence to 100
       for suites which don't change anymore.
     - Set idle-sleep to 3600 seconds, the results pages are only updated twice
diff --git a/instances/piuparts.conf-template.pejacevic b/instances/piuparts.conf-template.pejacevic
index 42b33bd..7438d41 100644
--- a/instances/piuparts.conf-template.pejacevic
+++ b/instances/piuparts.conf-template.pejacevic
@@ -131,6 +131,7 @@ sections =
 	oldstable222sid
 	oldstable22testing
 	jessie2stretch
+	jessie2Xstretch
 	jessie2stretch-rcmd
 	jessie2Xstretch-rcmd
 	jessie2bpo2stretch
@@ -451,6 +452,19 @@ distro = jessie
 upgrade-test-distros = jessie stretch
 
 
+[jessie2Xstretch]
+precedence = 4
+json-sections = none
+description = + Testing two-stage upgrades.
+piuparts-flags =
+	--upgrade-before-dist-upgrade
+	%(flags-default)s
+	%(flags-start-jessie)s
+	%(flags-end-stretch)s
+distro = jessie
+upgrade-test-distros = jessie stretch
+
+
 [jessie2stretch-rcmd]
 precedence = 6
 json-sections = none

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