[Piuparts-commits] [piuparts] 01/01: Revert "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 4a77b74709aec6d02057e80f7c9546f44bd20b6f
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Apr 29 18:32:03 2017 +0200

    Revert "p.conf: use moving aliases for the moving upgrade test suites"
    
    This reverts commit 5feaf3c691dd901975b741071577eccb1ee78e08.
---
 instances/piuparts.conf-template.pejacevic | 36 +++++++++++++-----------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/instances/piuparts.conf-template.pejacevic b/instances/piuparts.conf-template.pejacevic
index ee5eecc..4f0bdb9 100644
--- a/instances/piuparts.conf-template.pejacevic
+++ b/instances/piuparts.conf-template.pejacevic
@@ -23,14 +23,6 @@ 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
@@ -87,7 +79,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]
@@ -123,7 +115,7 @@ sections =
 	jessie-pu
 #	jessie-proposed
 	jessie2proposed
-	oldstable222sid
+        oldstable222sid
 	oldstable22testing
 	wheezy2jessie
 	wheezy2jessie-rcmd
@@ -352,7 +344,7 @@ piuparts-flags =
 	%(flags-default)s
 	%(flags-start-stretch)s
 	%(flags-end-stretch)s
-distro = stretch-proposed
+distro = jessie-stretch
 
 
 [stretch2proposed]
@@ -483,9 +475,10 @@ precedence = 4
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
-	%(flags-start-stable)s
-distro = stable
-upgrade-test-distros = stable testing sid
+	%(flags-start-jessie)s
+	%(flags-end-stretch)s
+distro = jessie
+upgrade-test-distros = jessie stretch sid
 
 
 [oldstable222sid]
@@ -493,9 +486,10 @@ precedence = 10
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
-	%(flags-start-oldstable)s
-distro = oldstable
-upgrade-test-distros = oldstable stable testing sid
+	%(flags-start-wheezy)s
+	%(flags-end-stretch)s
+distro = wheezy
+upgrade-test-distros = wheezy jessie stretch sid
 
 
 [oldstable22testing]
@@ -503,10 +497,10 @@ precedence = 6
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
-	%(flags-start-oldstable)s
-	%(flags-end-testing)s
-distro = oldstable
-upgrade-test-distros = oldstable stable testing
+	%(flags-start-wheezy)s
+	%(flags-end-stretch)s
+distro = wheezy
+upgrade-test-distros = wheezy jessie stretch
 
 
 [wheezy2jessie]

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