[Piuparts-devel] [Git][debian/piuparts][develop] config: bookworm has been released, trixie is now testing

Nicolas Dandrimont (@olasd) gitlab at salsa.debian.org
Mon Jun 12 13:50:24 BST 2023



Nicolas Dandrimont pushed to branch develop at Debian / piuparts


Commits:
57dfbde6 by Nicolas Dandrimont at 2023-06-12T14:49:12+02:00
config: bookworm has been released, trixie is now testing

- - - - -


2 changed files:

- conf/distros.conf
- instances/piuparts.conf-template.pejacevic


Changes:

=====================================
conf/distros.conf
=====================================
@@ -183,6 +183,35 @@ depends = bullseye bullseye-security bullseye-backports
 target-release = bullseye-backports-sloppy
 
 
+[bookworm-security]
+uri = http://security.debian.org
+depends = bookworm
+
+[bookworm-updates]
+depends = bookworm
+
+[bookworm-proposed-updates]
+depends = bookworm
+
+[bookworm-debug]
+uri = http://deb.debian.org/debian-debug
+depends = bookworm
+
+# this is a full distro representing an upcoming (old-)stable point release
+[bookworm-next]
+uri = None
+depends = bookworm bookworm-security bookworm-updates bookworm-proposed-updates
+candidates = bookworm bookworm-security bookworm-proposed-updates
+
+[bookworm-backports]
+depends = bookworm bookworm-security
+target-release = bookworm-backports
+
+[bookworm-backports-sloppy]
+depends = bookworm bookworm-security bookworm-backports
+target-release = bookworm-backports-sloppy
+
+
 [sid-debug]
 uri = http://deb.debian.org/debian-debug
 depends = sid


=====================================
instances/piuparts.conf-template.pejacevic
=====================================
@@ -31,12 +31,24 @@ flags-leftovers =
 	--scriptsdir /etc/piuparts/scripts-leftovers
 
 # aliases for the definitions below
-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
+flags-start-testing = %(flags-start-trixie)s
+flags-end-testing = %(flags-end-trixie)s
+flags-start-stable = %(flags-start-bookworm)s
+flags-end-stable = %(flags-end-bookworm)s
+flags-start-oldstable = %(flags-start-bullseye)s
+flags-end-oldstable = %(flags-end-bullseye)s
+flags-start-oldoldstable = %(flags-start-buster)s
+flags-end-oldoldstable = %(flags-end-buster)s
+
+# common flags for tests starting in trixie
+flags-start-trixie =
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=994388#80
+	--warn-on-usr-move fail
+
+# common flags for tests ending in trixie
+flags-end-trixie =
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=994388#80
+	--warn-on-usr-move fail
 
 # common flags for tests starting in bookworm
 flags-start-bookworm =
@@ -177,6 +189,7 @@ flags-broken-symlinks =
 basetgz-sections =
 	tarball/sid
 	tarball/sid-merged-usr
+	tarball/trixie
 	tarball/bookworm
 	tarball/bullseye
 	tarball/buster
@@ -194,6 +207,8 @@ sections =
 	sid-merged-usr
 	sid-broken-symlinks
 	testing2sid
+	trixie
+	trixie-rcmd
 	bookworm
 	bookworm-rcmd
 	bullseye
@@ -251,7 +266,7 @@ sections =
 	squeeze2squeeze-lts
 	squeeze
 	lenny2squeeze
-testing-suite = bookworm
+testing-suite = trixie
 mirror = @MIRROR@
 master-host = pejacevic.debian.org
 master-user = piupartsm
@@ -310,14 +325,24 @@ upgrade-test-distros = sid
 max-tgz-age = 259200
 
 
+[tarball/trixie]
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-trixie)s
+distro = None
+upgrade-test-distros = trixie
+# 1 week (60*60*24*7)
+max-tgz-age = 604800
+
+
 [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
+# 1 month (60*60*24*30)
+max-tgz-age = 2592000
 
 
 [tarball/bullseye]
@@ -506,8 +531,29 @@ piuparts-flags =
 distro = oldstable
 upgrade-test-distros = oldstable stable testing
 
-[bookworm]
+[trixie]
 precedence = 3
+piuparts-flags =
+	--scriptsdir /etc/piuparts/scripts-log-alternatives
+	%(flags-default)s
+	%(flags-start-trixie)s
+	%(flags-end-trixie)s
+distro = trixie
+
+
+[trixie-rcmd]
+precedence = 5
+json-sections = none
+description = + With recommended packages.
+piuparts-flags =
+	--install-recommends
+	%(flags-default)s
+	%(flags-start-trixie)s
+	%(flags-end-trixie)s
+distro = trixie
+
+[bookworm]
+precedence = 4
 piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-log-alternatives
 	%(flags-default)s
@@ -517,7 +563,7 @@ distro = bookworm
 
 
 [bookworm-rcmd]
-precedence = 5
+precedence = 6
 json-sections = none
 description = + With recommended packages.
 piuparts-flags =
@@ -528,9 +574,52 @@ piuparts-flags =
 distro = bookworm
 
 
+[bookworm-security]
+precedence = 2
+json-sections = none
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-bookworm)s
+	%(flags-end-bookworm)s
+depends-sections = bookworm
+distro = bookworm-security
+
+
+[bookworm-pu]
+precedence = 3
+json-sections = none
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-bookworm)s
+	%(flags-end-bookworm)s
+depends-sections = bookworm
+distro = bookworm-proposed-updates
+
+
+[bookworm-next]
+precedence = 3
+json-sections = none
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-bookworm)s
+	%(flags-end-bookworm)s
+distro = bookworm-next
+
+
+[bookworm2next]
+precedence = 3
+json-sections = none
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-bookworm)s
+	%(flags-end-bookworm)s
+distro = bookworm
+upgrade-test-distros = bookworm bookworm-next
+
+
 
 [bullseye]
-precedence = 4
+precedence = 5
 piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-log-alternatives
 	%(flags-default)s
@@ -540,7 +629,7 @@ distro = bullseye
 
 
 [bullseye-rcmd]
-precedence = 6
+precedence = 7
 json-sections = none
 description = + With recommended packages.
 piuparts-flags =
@@ -552,7 +641,7 @@ distro = bullseye
 
 
 [bullseye-security]
-precedence = 2
+precedence = 3
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
@@ -563,7 +652,7 @@ distro = bullseye-security
 
 
 [bullseye-pu]
-precedence = 3
+precedence = 4
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
@@ -574,7 +663,7 @@ distro = bullseye-proposed-updates
 
 
 [bullseye-next]
-precedence = 3
+precedence = 4
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
@@ -584,7 +673,7 @@ distro = bullseye-next
 
 
 [bullseye2next]
-precedence = 3
+precedence = 4
 json-sections = none
 piuparts-flags =
 	%(flags-default)s



View it on GitLab: https://salsa.debian.org/debian/piuparts/-/commit/57dfbde67c6d05541bc4dd05f35412e86ac67b99

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/commit/57dfbde67c6d05541bc4dd05f35412e86ac67b99
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/20230612/699c01f0/attachment-0001.htm>


More information about the Piuparts-devel mailing list