[Piuparts-devel] [Git][debian/piuparts][develop] 6 commits: p.conf: create bookworm tarballs

Nicolas Dandrimont (@olasd) gitlab at salsa.debian.org
Tue Aug 17 10:27:20 BST 2021



Nicolas Dandrimont pushed to branch develop at Debian / piuparts


Commits:
3ffd18dc by Andreas Beckmann at 2021-08-03T12:26:22+02:00
p.conf: create bookworm tarballs

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
ab5fc149 by Andreas Beckmann at 2021-08-03T12:33:53+02:00
update configuration for stable=bullseye

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
46a18b94 by Andreas Beckmann at 2021-08-03T13:16:22+02:00
update examples for bullseye being stable and bookworm testing

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
5a46a367 by Andreas Beckmann at 2021-08-03T13:17:12+02:00
add myself to Uploaders

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
0c6cbbbf by Andreas Beckmann at 2021-08-03T13:18:54+02:00
release piuparts (1.1.4) to unstable

- - - - -
278b808a by Nicolas Dandrimont at 2021-08-17T11:26:51+02:00
Merge branch 'master' into develop

- - - - -


8 changed files:

- conf/distros.conf
- debian/changelog
- debian/control
- docs/README_server.txt
- docs/piuparts/piuparts.1.txt
- instances/piuparts.conf-template.pejacevic
- instances/piuparts.conf.anbe
- piuparts.py


Changes:

=====================================
conf/distros.conf
=====================================
@@ -200,19 +200,19 @@ target-release = experimental
 
 # alias
 [oldoldstable]
-distribution = jessie
+distribution = stretch
 
 # alias
 [oldstable]
-distribution = stretch
+distribution = buster
 
 # alias
 [stable]
-distribution = buster
+distribution = bullseye
 
 # alias
 [testing]
-distribution = bullseye
+distribution = bookworm
 
 
 # It's also possible to have "virtual" entries by setting uri to


=====================================
debian/changelog
=====================================
@@ -1,3 +1,25 @@
+piuparts (1.1.4) unstable; urgency=medium
+
+  [ David Steele ]
+  * Make a valid pkgsummary entry for an "invalid" pkg.
+  * Remove Python2 support from pkgsummary.
+  * Reformat pkgsummary.
+
+  [ Andreas Beckmann ]
+  * piuparts.conf, distros.conf:
+    - Update for bullseye release.
+    - Create bookworm tarballs.
+    - Rename stretch-next to stretch-lts.
+  * docs/README_server.txt, docs/piuparts/piuparts.1.txt, piuparts.py:
+    Update examples for bullseye being stable and bookworm the new testing.
+  * piuparts-slave.postinst: Do not fail if no sshd is available on
+    localhost:22.
+  * scripts/pre_distupgrade_zz_database-server: bullseye/sid has postgresql-13
+    and mariadb-10.5.  (Closes: #988704)
+  * Add myself to Uploaders.
+
+ -- Andreas Beckmann <anbe at debian.org>  Tue, 03 Aug 2021 13:18:44 +0200
+
 piuparts (1.1.3) unstable; urgency=medium
 
   [ Michael Prokop ]


=====================================
debian/control
=====================================
@@ -1,6 +1,7 @@
 Source: piuparts
 Maintainer: piuparts developers team <piuparts-devel at alioth-lists.debian.net>
 Uploaders: Nicolas Dandrimont <olasd at debian.org>,
+ Andreas Beckmann <anbe at debian.org>,
  Holger Levsen <holger at debian.org>
 Section: devel
 Priority: optional


=====================================
docs/README_server.txt
=====================================
@@ -520,7 +520,7 @@ section, too, and will serve as defaults for all other sections
  distributions the slave should use for testing upgrades
  between distributions (i.e., Debian versions). Using "partial"
  distributions as defined in distros.conf is possible. Currently,
- "buster bullseye sid" is a good choice.
+ "bullseye bookworm sid" is a good choice.
  Setting this switches from doing install/purge tests to
  dist-upgrade tests. Not set by default.
 


=====================================
docs/piuparts/piuparts.1.txt
=====================================
@@ -65,7 +65,7 @@ Options must come before the other command line arguments.
   Bind-mount a directory inside the chroot.
 
 *-d* 'name', *-*-distribution*='name'::
-  Which Debian distribution to use: a code name (for example buster, bullseye or sid) or experimental. The default is sid (=unstable).
+  Which Debian distribution to use: a code name (for example bullseye, bookworm or sid) or experimental. The default is sid (=unstable).
 
 *-D* 'flavor', *-*-defaults*='flavor'::
   Use default settings suitable for a particular flavor of Debian: either debian or ubuntu. The default is debian.
@@ -356,10 +356,10 @@ If you want to do the same as above but for your changes files, pass in your cha
  piuparts -m 'http://gytha/debian main' ../foo_1.0-2_i386.changes
  ----
 
-If you want to test that a package installs properly in the stable (currently buster) Debian release, then can be upgraded to the testing (currently bullseye) and unstable (sid) versions, and then uninstalled without problems, you would give the following command::
+If you want to test that a package installs properly in the stable (currently bullseye) Debian release, then can be upgraded to the testing (currently bookworm) and unstable (sid) versions, and then uninstalled without problems, you would give the following command::
 
  ----
- piuparts -a -d buster -d bullseye -d sid foo
+ piuparts -a -d bullseye -d bookworm -d sid foo
  ----
 
 ENVIRONMENT


=====================================
instances/piuparts.conf-template.pejacevic
=====================================
@@ -31,12 +31,20 @@ flags-leftovers =
 	--scriptsdir /etc/piuparts/scripts-leftovers
 
 # aliases for the definitions below
-flags-start-testing = %(flags-start-bullseye)s
-flags-end-testing = %(flags-end-bullseye)s
-flags-start-stable = %(flags-start-buster)s
-flags-end-stable = %(flags-end-buster)s
-flags-start-oldstable = %(flags-start-stretch)s
-flags-end-oldstable = %(flags-end-stretch)s
+flags-start-testing = %(flags-start-bookworm)s
+flags-end-testing = %(flags-end-bookworm)s
+flags-start-stable = %(flags-start-bullseye)s
+flags-end-stable = %(flags-end-bullseye)s
+flags-start-oldstable = %(flags-start-buster)s
+flags-end-oldstable = %(flags-end-buster)s
+
+# common flags for tests starting in bookworm
+flags-start-bookworm =
+# no flags needed
+
+# common flags for tests ending in bookworm
+flags-end-bookworm =
+# no flags needed
 
 # common flags for tests starting in bullseye
 flags-start-bullseye =
@@ -166,6 +174,7 @@ flags-broken-symlinks =
 basetgz-sections =
 	tarball/sid
 	tarball/sid-merged-usr
+	tarball/bookworm
 	tarball/bullseye
 	tarball/buster
 	tarball/stretch
@@ -239,7 +248,7 @@ sections =
 	squeeze2squeeze-lts
 	squeeze
 	lenny2squeeze
-testing-suite = bullseye
+testing-suite = bookworm
 mirror = @MIRROR@
 master-host = pejacevic.debian.org
 master-user = piupartsm
@@ -298,14 +307,24 @@ upgrade-test-distros = sid
 max-tgz-age = 259200
 
 
+[tarball/bookworm]
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-bookworm)s
+distro = None
+upgrade-test-distros = bookworm
+# 1 week (60*60*24*7)
+max-tgz-age = 604800
+
+
 [tarball/bullseye]
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-bullseye)s
 distro = None
 upgrade-test-distros = bullseye
-# 1 week (60*60*24*7)
-max-tgz-age = 604800
+# 1 month (60*60*24*30)
+max-tgz-age = 2592000
 
 
 [tarball/buster]


=====================================
instances/piuparts.conf.anbe
=====================================
@@ -22,12 +22,15 @@ flags-leftovers =
 	--scriptsdir /etc/piuparts/scripts-leftovers
 
 flags-start-testing =
-	%(flags-start-bullseye)s
+	%(flags-start-bookworm)s
 flags-end-testing =
-	%(flags-end-bullseye)s
+	%(flags-end-bookworm)s
 
 flags-start-stable =
-	%(flags-start-buster)s
+	%(flags-start-bullseye)s
+
+flags-start-bookworm =
+flags-end-bookworm =
 
 flags-start-bullseye =
 flags-end-bullseye =
@@ -120,6 +123,8 @@ basetgz-sections =
 	tarball/sid/i386
 	tarball/sid-merged-usr/amd64
 	tarball/sid-merged-usr/i386
+	tarball/bookworm/amd64
+	tarball/bookworm/i386
 	tarball/bullseye/amd64
 	tarball/bullseye/i386
 	tarball/buster/amd64
@@ -428,7 +433,7 @@ sections =
 	lenny2squeeze/non-free
 	lenny2squeeze_i386/non-free
 #
-testing-suite = bullseye
+testing-suite = bookworm
 #
 json-sections = none
 #
@@ -525,6 +530,33 @@ components = main
 max-tgz-age = 172800
 
 
+[tarball/bookworm/amd64]
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-bookworm)s
+distro = None
+upgrade-test-distros = bookworm
+arch = amd64
+area = main
+components = main
+# 60*60*24*7
+max-tgz-age = 604800
+
+
+[tarball/bookworm/i386]
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-bookworm)s
+distro = None
+upgrade-test-distros = bookworm
+arch = i386
+setarch = linux32
+area = main
+components = main
+# 60*60*24*7
+max-tgz-age = 604800
+
+
 [tarball/bullseye/amd64]
 piuparts-flags =
 	%(flags-default)s
@@ -534,8 +566,8 @@ upgrade-test-distros = bullseye
 arch = amd64
 area = main
 components = main
-# 60*60*24*7
-max-tgz-age = 604800
+# 60*60*24*30
+max-tgz-age = 2592000
 
 
 [tarball/bullseye/i386]
@@ -548,8 +580,8 @@ arch = i386
 setarch = linux32
 area = main
 components = main
-# 60*60*24*7
-max-tgz-age = 604800
+# 60*60*24*30
+max-tgz-age = 2592000
 
 
 [tarball/buster/amd64]


=====================================
piuparts.py
=====================================
@@ -2711,7 +2711,7 @@ def parse_command_line():
 
     parser.add_option("-d", "--distribution", action="append", metavar="NAME",
                       help="Which Debian distribution to use: a code name " +
-                           "(for example buster, bullseye, sid) or experimental. The " +
+                           "(for example bullseye, bookworm, sid) or experimental. The " +
                            "default is sid (=unstable).")
 
     parser.add_option("-D", "--defaults", action="store",



View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/e62b812a9059533482e2a65882fb4ca1ec9332eb...278b808a09a27dfa316bef337a3bfe89b62b9328

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/e62b812a9059533482e2a65882fb4ca1ec9332eb...278b808a09a27dfa316bef337a3bfe89b62b9328
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20210817/f4119f34/attachment-0001.htm>


More information about the Piuparts-devel mailing list