[Piuparts-commits] [piuparts] 08/11: p.conf: use moving aliases for the moving upgrade test suites

[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 5feaf3c691dd901975b741071577eccb1ee78e08
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Apr 25 03:25:15 2017 +0200

    p.conf: use moving aliases for the moving upgrade test suites
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 instances/piuparts.conf-template.pejacevic | 36 +++++++++++++++++-------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/instances/piuparts.conf-template.pejacevic b/instances/piuparts.conf-template.pejacevic
index 3ae1454..fcf2d05 100644
--- a/instances/piuparts.conf-template.pejacevic
+++ b/instances/piuparts.conf-template.pejacevic
@@ -23,6 +23,14 @@ flags-leftovers =
 # perform some additional cleanup
 	--scriptsdir /etc/piuparts/scripts-leftovers
 
+# aliases for the definitions below
+flags-start-testing = %(flags-start-stretch)s
+flags-stop-testing = %(flags-stop-stretch)s
+flags-start-stable = %(flags-start-jessie)s
+flags-stop-stable = %(flags-stop-jessie)s
+flags-start-oldstable = %(flags-start-wheezy)s
+flags-stop-oldstable = %(flags-stop-wheezy)s
+
 # common flags for tests starting in stretch
 flags-start-stretch =
 # no flags needed
@@ -79,7 +87,7 @@ 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
+	%(flags-start-squeeze)s
 
 
 [global]
@@ -114,7 +122,7 @@ sections =
 	jessie-pu
 #	jessie-proposed
 	jessie2proposed
-        oldstable222sid
+	oldstable222sid
 	oldstable22testing
 	wheezy2jessie
 	wheezy2jessie-rcmd
@@ -332,7 +340,7 @@ piuparts-flags =
 	%(flags-default)s
 	%(flags-start-stretch)s
 	%(flags-end-stretch)s
-distro = jessie-stretch
+distro = stretch-proposed
 
 
 [stretch2proposed]
@@ -463,10 +471,9 @@ precedence = 4
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
-	%(flags-start-jessie)s
-	%(flags-end-stretch)s
-distro = jessie
-upgrade-test-distros = jessie stretch sid
+	%(flags-start-stable)s
+distro = stable
+upgrade-test-distros = stable testing sid
 
 
 [oldstable222sid]
@@ -474,10 +481,9 @@ precedence = 10
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
-	%(flags-start-wheezy)s
-	%(flags-end-stretch)s
-distro = wheezy
-upgrade-test-distros = wheezy jessie stretch sid
+	%(flags-start-oldstable)s
+distro = oldstable
+upgrade-test-distros = oldstable stable testing sid
 
 
 [oldstable22testing]
@@ -485,10 +491,10 @@ precedence = 6
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
-	%(flags-start-wheezy)s
-	%(flags-end-stretch)s
-distro = wheezy
-upgrade-test-distros = wheezy jessie stretch
+	%(flags-start-oldstable)s
+	%(flags-end-testing)s
+distro = oldstable
+upgrade-test-distros = oldstable stable testing
 
 
 [wheezy2jessie]

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