[Piuparts-commits] [piuparts] 01/01: rename wheezy222testing to oldstable22testing, stable222testing to stable22testing and oldstable2222testing to oldstable222testing

Holger Levsen holger at layer-acht.org
Thu Apr 13 20:07:42 UTC 2017 

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

holger pushed a commit to branch develop
in repository piuparts.

commit e3ad84b0a8b81ec5efea177fd32b9a5500f0a7f9
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Apr 13 19:31:53 2017 +0200

    rename wheezy222testing to oldstable22testing, stable222testing to stable22testing and oldstable2222testing to oldstable222testing
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                           |  8 ++++----
 htdocs/index.tpl                           |  6 +++---
 instances/piuparts.conf-template.pejacevic | 12 ++++++------
 instances/piuparts.conf.anbe               | 16 ++++++++--------
 master-bin/reschedule_piuparts_tests.in    |  4 ++--
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d47383..211e724 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,13 +66,13 @@ piuparts (0.77) UNRELEASED; urgency=medium
     - only act on sections with precedence < 100.
   * instances/piuparts.conf-template.pejacevic: 
     - Add new suite to be tested:
-      - stable222sid, upgrading jessie -> stretch -> sid
-      - oldstable2222sid, upgrading from wheezy -> jessie -> stretch -> sid
+      - stable22sid, upgrading jessie -> stretch -> sid
+      - oldstable222sid, upgrading from wheezy -> jessie -> stretch -> sid
         (Closes: #859620)
       - wheezy2wheezy-lts, for installation in wheezy and upgrade to wheezy-lts.
     - Adjust precedences for most of the tested suites, set precedence to 100
       for suites which don't change anymore.
-      TODO: once oldstable222sid has been fully tested, change precedence to 5 or 6.
+      TODO: once oldstable22sid has been fully tested, change precedence to 5 or 6.
     - Set idle-sleep to 3600 seconds, the results pages are only updated twice
       a day anyway.
   * Update README_server.txt.
@@ -97,7 +97,7 @@ piuparts (0.76) unstable; urgency=medium
   * piuparts.conf:
     - Use --warn-on-install-over-symlink for tests ending before stretch.
     - Enable scripts-log-alternatives for [sid] and [stretch].  (See: #850917)
-    - Add new suite: wheezy222testing, upgrading wheezy -> jessie -> stretch.
+    - Add new suite: oldstable22testing, upgrading wheezy -> jessie -> stretch.
   * piuparts.conf.anbe: Add some more example sections.
   * distros.conf: Add support for sid-debug, stretch-debug.
   * piuparts-slave.py:
diff --git a/htdocs/index.tpl b/htdocs/index.tpl
index f9fe51c..7b92ca7 100644
--- a/htdocs/index.tpl
+++ b/htdocs/index.tpl
@@ -79,12 +79,12 @@
     </tr>
     <tr class="normalrow">
      <td class="contentcell2">
-      <b>2017-04-10</b> Another suite added: <a href="https://piuparts.debian.org/oldstable2222sid">oldstable2222sid</a>, to test package installation in oldstable (currently wheezy), then upgrade to stable (currently jessie), then upgrade to testung (currently stretch), then upgrade to sid (always unstable), then removal and purge..
+      <b>2017-04-10</b> Another suite added: <a href="https://piuparts.debian.org/oldstable222sid">oldstable222sid</a>, to test package installation in oldstable (currently wheezy), then upgrade to stable (currently jessie), then upgrade to testung (currently stretch), then upgrade to sid (always unstable), then removal and purge..
      </td>
     </tr>
     <tr class="normalrow">
      <td class="contentcell2">
-      <b>2017-04-07</b> Another suite added: <a href="https://piuparts.debian.org/stable222sid">stable222sid</a>, to test package installation in stable (currently jessie), then upgrade to testing (currently stretch), then upgrade to sid (always unstable), then removal and purge..
+      <b>2017-04-07</b> Another suite added: <a href="https://piuparts.debian.org/stable22sid">stable22sid</a>, to test package installation in stable (currently jessie), then upgrade to testing (currently stretch), then upgrade to sid (always unstable), then removal and purge..
      </td>
     </tr>
     <tr class="normalrow">
@@ -94,7 +94,7 @@
     </tr>
     <tr class="normalrow">
      <td class="contentcell2">
-      <b>2017-03-07</b> Another suite added: <a href="https://piuparts.debian.org/wheezy222testing">wheezy222testing</a>, to test package installation in wheezy, then upgrade to jessie, then upgrade to testing, then removal and purge..
+      <b>2017-03-07</b> Another suite added: <a href="https://piuparts.debian.org/oldstable22testing">oldstable22testing</a>, to test package installation in wheezy, then upgrade to jessie, then upgrade to testing, then removal and purge..
      </td>
     </tr>
     <tr class="normalrow">
diff --git a/instances/piuparts.conf-template.pejacevic b/instances/piuparts.conf-template.pejacevic
index e44d668..7e13ff0 100644
--- a/instances/piuparts.conf-template.pejacevic
+++ b/instances/piuparts.conf-template.pejacevic
@@ -103,7 +103,7 @@ sections =
 	stretch-pu
 #	stretch-proposed
 #	stretch2proposed
-	stable222sid
+	stable22sid
 	jessie2stretch
 	jessie2stretch-rcmd
 	jessie2bpo2stretch
@@ -114,8 +114,8 @@ sections =
 	jessie-pu
 #	jessie-proposed
 	jessie2proposed
-        oldstable2222sid
-	wheezy222testing
+        oldstable222sid
+	oldstable22testing
 	wheezy2jessie
 	wheezy2jessie-rcmd
 	wheezy2bpo2jessie
@@ -459,7 +459,7 @@ distro = jessie
 upgrade-test-distros = jessie jessie-proposed
 
 
-[stable222sid]
+[stable22sid]
 precedence = 4
 json-sections = none
 piuparts-flags =
@@ -470,7 +470,7 @@ distro = jessie
 upgrade-test-distros = jessie stretch sid
 
 
-[oldstable2222sid]
+[oldstable222sid]
 precedence = 10
 json-sections = none
 piuparts-flags =
@@ -481,7 +481,7 @@ distro = wheezy
 upgrade-test-distros = wheezy jessie stretch sid
 
 
-[wheezy222testing]
+[oldstable22testing]
 precedence = 6
 json-sections = none
 piuparts-flags =
diff --git a/instances/piuparts.conf.anbe b/instances/piuparts.conf.anbe
index d5a7140..67de3a3 100644
--- a/instances/piuparts.conf.anbe
+++ b/instances/piuparts.conf.anbe
@@ -119,7 +119,7 @@ sections =
 	wheezy2jessie-apt1st/main
 	wheezy2jessie-iri/main
 	wheezy2bpo2jessie/main
-	wheezy222testing/main
+	oldstable22testing/main
 	squeeze222testing/main
 	lenny222testing/main
 #
@@ -167,7 +167,7 @@ sections =
 	wheezy2jessie-apt1st/contrib
 	wheezy2jessie-iri/contrib
 	wheezy2bpo2jessie/contrib
-	wheezy222testing/contrib
+	oldstable22testing/contrib
 	squeeze222testing/contrib
 	lenny222testing/contrib
 #
@@ -215,7 +215,7 @@ sections =
 	wheezy2jessie-apt1st/non-free
 	wheezy2jessie-iri/non-free
 	wheezy2bpo2jessie/non-free
-	wheezy222testing/non-free
+	oldstable22testing/non-free
 	squeeze222testing/non-free
 	lenny222testing/non-free
 #
@@ -2498,7 +2498,7 @@ area = non-free
 upgrade-test-distros = wheezy wheezy-backports jessie
 
 
-[wheezy222testing/main]
+[oldstable22testing/main]
 precedence = 80
 piuparts-flags =
 	%(flags-default)s
@@ -2511,26 +2511,26 @@ distro = wheezy
 upgrade-test-distros = wheezy jessie testing
 reschedule-old-count = 100
 
-[wheezy222testing/contrib]
+[oldstable22testing/contrib]
 precedence = 95
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
 	%(flags-end-testing)s
-depends-sections = wheezy222testing/main wheezy222testing/non-free
+depends-sections = oldstable22testing/main oldstable22testing/non-free
 arch = amd64
 area = contrib
 distro = wheezy
 upgrade-test-distros = wheezy jessie testing
 reschedule-old-count = 100
 
-[wheezy222testing/non-free]
+[oldstable22testing/non-free]
 precedence = 95
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
 	%(flags-end-testing)s
-depends-sections = wheezy222testing/main wheezy222testing/contrib
+depends-sections = oldstable22testing/main oldstable22testing/contrib
 arch = amd64
 area = non-free
 distro = wheezy
diff --git a/master-bin/reschedule_piuparts_tests.in b/master-bin/reschedule_piuparts_tests.in
index 570b0c1..e33cb53 100755
--- a/master-bin/reschedule_piuparts_tests.in
+++ b/master-bin/reschedule_piuparts_tests.in
@@ -75,13 +75,13 @@ for SECTION in $SECTIONS ; do
 		go=yes
 	else
 		case "$SECTION" in
-			# don't catch old*stable222testing
+			# don't catch old*stable22testing
 			*$TESTING*|testing*|*sid*|*experimental*)
 				if [ "$current" = "yes" ]; then
 					go=yes
 				fi
 				;;
-			*222testing*)
+			*22testing*)
 				if [ "$longterm" = "yes" ]; then
 					go=yes
 				fi

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

More information about the Piuparts-commits mailing list