[Piuparts-devel] [Git][debian/piuparts][develop] 12 commits: generate_daily_report: improve statistics.

Holger Levsen gitlab at salsa.debian.org
Tue May 21 15:34:50 BST 2019 


Holger Levsen pushed to branch develop at Debian / piuparts


Commits:
f5e026dc by Holger Levsen at 2019-05-21T12:40:05Z
generate_daily_report: improve statistics.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
30dfe89c by Andreas Beckmann at 2019-05-21T14:34:15Z
p.conf.anbe: --merged-usr tarballs for stretch

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
e26977ad by Andreas Beckmann at 2019-05-21T14:34:15Z
p.conf.anbe: add [stretch2buster-merged-usr]

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
c7dd9c11 by Andreas Beckmann at 2019-05-21T14:34:15Z
p.conf.anbe: all jessie->stretch tests go from jessie-lts to stretch-next

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
61d7699f by Andreas Beckmann at 2019-05-21T14:34:15Z
p.conf.anbe: all wheezy->jessie tests go from wheezy-lts to jessie-lts

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
81c8aa7e by Andreas Beckmann at 2019-05-21T14:34:16Z
p.conf.anbe: prepare multi-distro-upgrade tests for bullseye

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
e8128fe3 by Andreas Beckmann at 2019-05-21T14:34:16Z
add logrotate exception for chef-solr/wheezy

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
2fc55c2e by Andreas Beckmann at 2019-05-21T14:34:16Z
skip testing libdbd-oracle-perl/contrib, third-party dependencies

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
abe3b10c by Andreas Beckmann at 2019-05-21T14:34:16Z
rework the isdnutils/lenny,squeeze exceptions

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
49134def by Andreas Beckmann at 2019-05-21T14:34:16Z
freebsd-buildutils/lenny,squeeze needs the original-awk workaround

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
0c768504 by Andreas Beckmann at 2019-05-21T14:34:16Z
fusionforge-plugin-mediawiki/jessie is an uninstallable cruft package

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
28549085 by Andreas Beckmann at 2019-05-21T14:34:16Z
llvm-3.7-examples/stretch is uninstallable on !arm

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


9 changed files:

- custom-scripts/scripts-multi-distro-upgrade/pre_remove_exceptions_multi-distro-upgrade
- custom-scripts/scripts/is_testable_uninstallable
- custom-scripts/scripts/post_remove_exceptions
- custom-scripts/scripts/pre_install_exceptions
- custom-scripts/scripts/pre_remove_exceptions
- debian/changelog
- instances/piuparts.conf.anbe
- master-bin/generate_daily_report.in
- piupartslib/packagesdb.py


Changes:

=====================================
custom-scripts/scripts-multi-distro-upgrade/pre_remove_exceptions_multi-distro-upgrade
=====================================
@@ -12,6 +12,12 @@ case ${PIUPARTS_OBJECTS} in
 		log_debug
 		touch /var/log/autotrust/dummy.log
 		;;
+	chef-solr=None)
+		# removed after wheezy
+		# logrotate config references /var/log/chef/solr.log
+		log_debug
+		touch /var/log/chef/solr.log
+		;;
 	dancer-ircd=None)
 		# removed after wheezy
 		# logrotate config references /var/log/dancer-ircd/ircd.log


=====================================
custom-scripts/scripts/is_testable_uninstallable
=====================================
@@ -58,6 +58,10 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "lenny" ]; then
 		dnscache-run)
 			skip_distupgrade "#664848: breaks dns resolution in chroot"
 			;;
+		libdbd-oracle-perl|\
+		ora2pg)
+			skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient-basic"
+			;;
 		libpils0|\
 		libpils-dev|\
 		libstonith0|\
@@ -109,6 +113,10 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "squeeze" ]; then
 			# removed after squeeze
 			skip_distupgrade "#595593: fails to install"
 			;;
+		libdbd-oracle-perl|\
+		ora2pg)
+			skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient11.2-basic"
+			;;
 		mini-buildd-bld|\
 		mini-buildd-rep)
 			skip_distupgrade "#632955, #656746: time limit exceeded during install"
@@ -127,6 +135,10 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "wheezy" ]; then
 		geoip-database-contrib)
 			skip_distupgrade "#885441: download location no longer available"
 			;;
+		libdbd-oracle-perl|\
+		ora2pg)
+			skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient11.2-basic"
+			;;
 		nautilus-dropbox)
 			skip_distupgrade "#770402: downloads awfully slow, hangs during installation"
 			;;
@@ -137,6 +149,9 @@ fi
 if [ "${PIUPARTS_DISTRIBUTION}" = "jessie" ]; then
 
 	case ${PIUPARTS_OBJECTS%%=*} in
+		fusionforge-plugin-mediawiki)
+			skip_distupgrade "#929139: fusionforge-plugin-mediawiki: uninstallable cruft package"
+			;;
 		geoip-database-contrib)
 			skip_distupgrade "#885441: download location no longer available"
 			;;
@@ -156,6 +171,36 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "stretch" ]; then
 		geoip-database-contrib)
 			skip_distupgrade "#885441: download location no longer available"
 			;;
+		libdbd-oracle-perl|\
+		libdbd-oracle-perl-dbgsym|\
+		ora2pg)
+			skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient12.1-basic"
+			;;
+		llvm-3.7-examples)
+			skip_distupgrade "#929138: uninstallable on !arm*"
+			;;
+	esac
+
+fi
+
+if [ "${PIUPARTS_DISTRIBUTION}" = "buster" ]; then
+
+	case ${PIUPARTS_OBJECTS%%=*} in
+		libdbd-oracle-perl|\
+		libdbd-oracle-perl-dbgsym)
+			skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient12.1-basic"
+			;;
+	esac
+
+fi
+
+if [ "${PIUPARTS_DISTRIBUTION}" = "sid" ]; then
+
+	case ${PIUPARTS_OBJECTS%%=*} in
+		libdbd-oracle-perl|\
+		libdbd-oracle-perl-dbgsym)
+			skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient12.1-basic"
+			;;
 	esac
 
 fi


=====================================
custom-scripts/scripts/post_remove_exceptions
=====================================
@@ -21,4 +21,20 @@ case ${PIUPARTS_OBJECTS%%=*} in
 				;;
 		esac
 		;;
+	ibod|\
+	isdnactivecards|\
+	isdneurofile|\
+	isdnlog|\
+	isdnutils|\
+	isdnutils-xtools|\
+	isdnvbox|\
+	isdnvboxserver|\
+	INVALID)
+		case "$PIUPARTS_DISTRIBUTION" in
+			lenny|squeeze)
+				#431855: isdnutils-base fails to purge with "There are still files in /etc/isdn/ that you may want to remove manually."
+				log_debug
+				rm -fv /etc/isdn/*
+		esac
+		;;
 esac


=====================================
custom-scripts/scripts/pre_install_exceptions
=====================================
@@ -259,8 +259,10 @@ if [ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then
 			;;
 		ipppd|ibod|isdnutils)
 			#542156
-			log_debug
-			test -e /dev/MAKEDEV || ln -sfv /sbin/MAKEDEV /dev/MAKEDEV
+			if [ ! -e /dev/MAKEDEV ]; then
+				log_debug
+				ln -sfv /sbin/MAKEDEV /dev/MAKEDEV
+			fi
 			;;
 	esac
 


=====================================
custom-scripts/scripts/pre_remove_exceptions
=====================================
@@ -25,18 +25,20 @@ case ${PIUPARTS_OBJECTS%%=*} in
 				;;
 		esac
 		;;
-	isdnlog|isdnutils)
-		#WORKSAROUND #431855: fails with "There are still files in /etc/isdn/ that you may want to remove manually."
-		if [ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then
-			log_debug
-			rm -fv /etc/isdn/*
-		fi
+	freebsd-buildutils)
+		case "$PIUPARTS_DISTRIBUTION" in
+			lenny|squeeze)
+				# apt considers original-awk as essential
+				log_debug
+				apt-get -y remove freebsd-buildutils
+				echo 'Yes, do as I say!' | apt-get -y --force-yes remove original-awk
+		esac
 		;;
 	original-awk)
 		case "$PIUPARTS_DISTRIBUTION" in
-			lenny)
+			lenny|squeeze)
+				# apt considers original-awk as essential
 				log_debug
-				# apt considers this as essential
 				echo 'Yes, do as I say!' | apt-get -y --force-yes remove original-awk
 		esac
 		;;


=====================================
debian/changelog
=====================================
@@ -5,9 +5,13 @@ piuparts (1.0.1) UNRELEASED; urgency=medium
     - Add '--max-command-output-size' option to allow overriding the default
       of 8 MB for debugging runs.
     - Run pre_remove scripts before computing packages to be removed.
+  * piuparts.conf.anbe: Add some more example sections.
   * piuparts-slave.py:
     - Generate separate tarball names for --merged-usr chroots.
 
+  [ Holger Levsen ]
+  * generate_daily_report: improve statistics.
+
  -- Holger Levsen <holger at debian.org>  Sat, 04 May 2019 21:53:16 +0200
 
 piuparts (1.0.0) unstable; urgency=medium


=====================================
instances/piuparts.conf.anbe
=====================================
@@ -126,6 +126,8 @@ basetgz-sections =
 	tarball/buster/i386
 	tarball/stretch/amd64
 	tarball/stretch/i386
+	tarball/stretch-merged-usr/amd64
+	tarball/stretch-merged-usr/i386
 	tarball/jessie/amd64
 	tarball/jessie/i386
 	tarball/wheezy/amd64
@@ -178,6 +180,7 @@ sections =
 	stretch3buster-rcmd/main
 	stretch2buster-rcmd_i386/main
 	stretch3buster-rcmd_i386/main
+	stretch2buster-merged-usr/main
 	stretch2buster-iri/main
 	stretch2bpo2buster/main
 	jessie2lts/main
@@ -243,6 +246,7 @@ sections =
 	stretch3buster-rcmd/contrib
 	stretch2buster-rcmd_i386/contrib
 	stretch3buster-rcmd_i386/contrib
+	stretch2buster-merged-usr/contrib
 	stretch2buster-iri/contrib
 	stretch2bpo2buster/contrib
 	jessie2lts/contrib
@@ -308,6 +312,7 @@ sections =
 	stretch3buster-rcmd/non-free
 	stretch2buster-rcmd_i386/non-free
 	stretch3buster-rcmd_i386/non-free
+	stretch2buster-merged-usr/non-free
 	stretch2buster-iri/non-free
 	stretch2bpo2buster/non-free
 	jessie2lts/non-free
@@ -574,6 +579,33 @@ components = main
 max-tgz-age = 2592000
 
 
+[tarball/stretch-merged-usr/amd64]
+piuparts-flags =
+	%(flags-merged-usr)s
+	%(flags-start-stretch)s
+distro = None
+upgrade-test-distros = stretch
+arch = amd64
+area = main
+components = main
+# 60*60*24*30
+max-tgz-age = 2592000
+
+
+[tarball/stretch-merged-usr/i386]
+piuparts-flags =
+	%(flags-merged-usr)s
+	%(flags-start-stretch)s
+distro = None
+upgrade-test-distros = stretch
+arch = i386
+setarch = linux32
+area = main
+components = main
+# 60*60*24*30
+max-tgz-age = 2592000
+
+
 [tarball/jessie/amd64]
 piuparts-flags =
 	%(flags-default)s
@@ -2348,7 +2380,8 @@ arch = amd64
 area = main
 components = main
 distro = lenny
-upgrade-test-distros = lenny squeeze wheezy jessie stretch testing
+upgrade-test-distros = lenny squeeze wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 reschedule-fail-days = 12
 expire-fail-days = +8
@@ -2364,7 +2397,8 @@ depends-sections = lenny222testing/main lenny222testing/non-free
 arch = amd64
 area = contrib
 distro = lenny
-upgrade-test-distros = lenny squeeze wheezy jessie stretch testing
+upgrade-test-distros = lenny squeeze wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [lenny222testing/non-free]
@@ -2378,7 +2412,8 @@ depends-sections = lenny222testing/main lenny222testing/contrib
 arch = amd64
 area = non-free
 distro = lenny
-upgrade-test-distros = lenny squeeze wheezy jessie stretch testing
+upgrade-test-distros = lenny squeeze wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 
@@ -2394,7 +2429,8 @@ setarch = linux32
 area = main
 components = main
 distro = lenny
-upgrade-test-distros = lenny squeeze wheezy jessie stretch testing
+upgrade-test-distros = lenny squeeze wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 reschedule-fail-days = 12
 expire-fail-days = +8
@@ -2411,7 +2447,8 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = lenny
-upgrade-test-distros = lenny squeeze wheezy jessie stretch testing
+upgrade-test-distros = lenny squeeze wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [lenny222testing_i386/non-free]
@@ -2426,7 +2463,8 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = lenny
-upgrade-test-distros = lenny squeeze wheezy jessie stretch testing
+upgrade-test-distros = lenny squeeze wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 
@@ -2741,7 +2779,8 @@ arch = amd64
 area = main
 components = main
 distro = squeeze
-upgrade-test-distros = squeeze wheezy jessie stretch testing
+upgrade-test-distros = squeeze wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [squeeze222testing/contrib]
@@ -2755,7 +2794,8 @@ depends-sections = squeeze222testing/main squeeze222testing/non-free
 arch = amd64
 area = contrib
 distro = squeeze
-upgrade-test-distros = squeeze wheezy jessie stretch testing
+upgrade-test-distros = squeeze wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [squeeze222testing/non-free]
@@ -2769,7 +2809,8 @@ depends-sections = squeeze222testing/main squeeze222testing/contrib
 arch = amd64
 area = non-free
 distro = squeeze
-upgrade-test-distros = squeeze wheezy jessie stretch testing
+upgrade-test-distros = squeeze wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 
@@ -2785,7 +2826,8 @@ setarch = linux32
 area = main
 components = main
 distro = squeeze
-upgrade-test-distros = squeeze wheezy jessie stretch testing
+upgrade-test-distros = squeeze wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [squeeze222testing_i386/contrib]
@@ -2800,7 +2842,8 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = squeeze
-upgrade-test-distros = squeeze wheezy jessie stretch testing
+upgrade-test-distros = squeeze wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [squeeze222testing_i386/non-free]
@@ -2815,7 +2858,8 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = squeeze
-upgrade-test-distros = squeeze wheezy jessie stretch testing
+upgrade-test-distros = squeeze wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 
@@ -2868,8 +2912,8 @@ piuparts-flags =
 arch = amd64
 area = main
 components = main
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 [wheezy2jessie/contrib]
 precedence = 95
@@ -2880,8 +2924,8 @@ piuparts-flags =
 depends-sections = wheezy2jessie/main wheezy2jessie/non-free
 arch = amd64
 area = contrib
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 [wheezy2jessie/non-free]
 precedence = 95
@@ -2892,8 +2936,8 @@ piuparts-flags =
 depends-sections = wheezy2jessie/main wheezy2jessie/contrib
 arch = amd64
 area = non-free
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 
 [wheezy2jessie_i386/main]
@@ -2906,8 +2950,8 @@ arch = i386
 setarch = linux32
 area = main
 components = main
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 [wheezy2jessie_i386/contrib]
 precedence = 95
@@ -2919,8 +2963,8 @@ depends-sections = wheezy2jessie_i386/main wheezy2jessie_i386/non-free
 arch = i386
 setarch = linux32
 area = contrib
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 [wheezy2jessie_i386/non-free]
 precedence = 95
@@ -2932,8 +2976,8 @@ depends-sections = wheezy2jessie_i386/main wheezy2jessie_i386/contrib
 arch = i386
 setarch = linux32
 area = non-free
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 
 [wheezy2jessie-rcmd/main]
@@ -2948,8 +2992,8 @@ piuparts-flags =
 arch = amd64
 area = main
 components = main
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 [wheezy2jessie-rcmd/contrib]
 precedence = 95
@@ -2963,8 +3007,8 @@ piuparts-flags =
 depends-sections = wheezy2jessie-rcmd/main wheezy2jessie-rcmd/non-free
 arch = amd64
 area = contrib
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 [wheezy2jessie-rcmd/non-free]
 precedence = 95
@@ -2978,8 +3022,8 @@ piuparts-flags =
 depends-sections = wheezy2jessie-rcmd/main wheezy2jessie-rcmd/contrib
 arch = amd64
 area = non-free
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 
 [wheezy2jessie-rcmd_i386/main]
@@ -2995,8 +3039,8 @@ arch = i386
 setarch = linux32
 area = main
 components = main
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 [wheezy2jessie-rcmd_i386/contrib]
 precedence = 95
@@ -3011,8 +3055,8 @@ depends-sections = wheezy2jessie-rcmd_i386/main wheezy2jessie-rcmd_i386/non-free
 arch = i386
 setarch = linux32
 area = contrib
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 [wheezy2jessie-rcmd_i386/non-free]
 precedence = 95
@@ -3027,8 +3071,8 @@ depends-sections = wheezy2jessie-rcmd_i386/main wheezy2jessie-rcmd_i386/contrib
 arch = i386
 setarch = linux32
 area = non-free
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 
 [wheezy2jessie-sysv/main]
@@ -3134,8 +3178,8 @@ piuparts-flags =
 arch = amd64
 area = main
 components = main
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 [wheezy2jessie-iri/contrib]
 precedence = 95
@@ -3148,8 +3192,8 @@ piuparts-flags =
 depends-sections = wheezy2jessie-iri/main wheezy2jessie-iri/non-free
 arch = amd64
 area = contrib
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 [wheezy2jessie-iri/non-free]
 precedence = 95
@@ -3162,8 +3206,8 @@ piuparts-flags =
 depends-sections = wheezy2jessie-iri/main wheezy2jessie-iri/contrib
 arch = amd64
 area = non-free
-distro = wheezy
-upgrade-test-distros = wheezy jessie
+distro = wheezy-lts
+upgrade-test-distros = wheezy-lts jessie-lts
 
 
 [wheezy2bpo2jessie/main]
@@ -3177,7 +3221,7 @@ distro = wheezy-backports
 arch = amd64
 area = main
 components = main
-upgrade-test-distros = wheezy wheezy-backports jessie
+upgrade-test-distros = wheezy-lts wheezy-backports jessie-lts
 
 [wheezy2bpo2jessie/contrib]
 precedence = 95
@@ -3189,7 +3233,7 @@ depends-sections = wheezy/main wheezy/non-free wheezy2bpo2jessie/main wheezy2bpo
 distro = wheezy-backports
 arch = amd64
 area = contrib
-upgrade-test-distros = wheezy wheezy-backports jessie
+upgrade-test-distros = wheezy-lts wheezy-backports jessie-lts
 
 [wheezy2bpo2jessie/non-free]
 precedence = 95
@@ -3201,7 +3245,7 @@ depends-sections = wheezy/main wheezy2bpo2jessie/main wheezy2bpo2jessie/contrib
 distro = wheezy-backports
 arch = amd64
 area = non-free
-upgrade-test-distros = wheezy wheezy-backports jessie
+upgrade-test-distros = wheezy-lts wheezy-backports jessie-lts
 
 
 [wheezy222testing/main]
@@ -3215,7 +3259,8 @@ arch = amd64
 area = main
 components = main
 distro = wheezy
-upgrade-test-distros = wheezy jessie stretch testing
+upgrade-test-distros = wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [wheezy222testing/contrib]
@@ -3229,7 +3274,8 @@ depends-sections = wheezy222testing/main wheezy222testing/non-free
 arch = amd64
 area = contrib
 distro = wheezy
-upgrade-test-distros = wheezy jessie stretch testing
+upgrade-test-distros = wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [wheezy222testing/non-free]
@@ -3243,7 +3289,8 @@ depends-sections = wheezy222testing/main wheezy222testing/contrib
 arch = amd64
 area = non-free
 distro = wheezy
-upgrade-test-distros = wheezy jessie stretch testing
+upgrade-test-distros = wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 
@@ -3259,7 +3306,8 @@ setarch = linux32
 area = main
 components = main
 distro = wheezy
-upgrade-test-distros = wheezy jessie stretch testing
+upgrade-test-distros = wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [wheezy222testing_i386/contrib]
@@ -3274,7 +3322,8 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = wheezy
-upgrade-test-distros = wheezy jessie stretch testing
+upgrade-test-distros = wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [wheezy222testing_i386/non-free]
@@ -3289,7 +3338,8 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = wheezy
-upgrade-test-distros = wheezy jessie stretch testing
+upgrade-test-distros = wheezy jessie stretch buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 
@@ -3340,7 +3390,7 @@ arch = amd64
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 [jessie2stretch/contrib]
 precedence = 95
@@ -3352,7 +3402,7 @@ depends-sections = jessie2stretch/main jessie2stretch/non-free
 arch = amd64
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 [jessie2stretch/non-free]
 precedence = 95
@@ -3364,7 +3414,7 @@ depends-sections = jessie2stretch/main jessie2stretch/contrib
 arch = amd64
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 
 [jessie3stretch/main]
@@ -3379,7 +3429,7 @@ arch = amd64
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch/contrib]
@@ -3394,7 +3444,7 @@ depends-sections = jessie3stretch/main jessie3stretch/non-free
 arch = amd64
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch/non-free]
@@ -3409,7 +3459,7 @@ depends-sections = jessie3stretch/main jessie3stretch/contrib
 arch = amd64
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 
@@ -3424,7 +3474,7 @@ setarch = linux32
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 [jessie2stretch_i386/contrib]
 precedence = 95
@@ -3437,7 +3487,7 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 [jessie2stretch_i386/non-free]
 precedence = 95
@@ -3450,7 +3500,7 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 
 [jessie3stretch_i386/main]
@@ -3466,7 +3516,7 @@ setarch = linux32
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch_i386/contrib]
@@ -3482,7 +3532,7 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch_i386/non-free]
@@ -3498,7 +3548,7 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 
@@ -3514,7 +3564,7 @@ arch = amd64
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 [jessie2stretch-rcmd/contrib]
 precedence = 95
@@ -3528,7 +3578,7 @@ depends-sections = jessie2stretch-rcmd/main jessie2stretch-rcmd/non-free
 arch = amd64
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 [jessie2stretch-rcmd/non-free]
 precedence = 95
@@ -3542,7 +3592,7 @@ depends-sections = jessie2stretch-rcmd/main jessie2stretch-rcmd/contrib
 arch = amd64
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 
 [jessie3stretch-rcmd/main]
@@ -3558,7 +3608,7 @@ arch = amd64
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch-rcmd/contrib]
@@ -3574,7 +3624,7 @@ depends-sections = jessie3stretch-rcmd/main jessie3stretch-rcmd/non-free
 arch = amd64
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch-rcmd/non-free]
@@ -3590,7 +3640,7 @@ depends-sections = jessie3stretch-rcmd/main jessie3stretch-rcmd/contrib
 arch = amd64
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 
@@ -3607,7 +3657,7 @@ setarch = linux32
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 [jessie2stretch-rcmd_i386/contrib]
 precedence = 95
@@ -3622,7 +3672,7 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 [jessie2stretch-rcmd_i386/non-free]
 precedence = 95
@@ -3637,7 +3687,7 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 
 [jessie3stretch-rcmd_i386/main]
@@ -3654,7 +3704,7 @@ setarch = linux32
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch-rcmd_i386/contrib]
@@ -3671,7 +3721,7 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch-rcmd_i386/non-free]
@@ -3688,7 +3738,7 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 
@@ -3704,7 +3754,7 @@ arch = amd64
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 [jessie2stretch-iri/contrib]
 precedence = 95
@@ -3718,7 +3768,7 @@ depends-sections = jessie2stretch-iri/main jessie2stretch-iri/non-free
 arch = amd64
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 [jessie2stretch-iri/non-free]
 precedence = 95
@@ -3732,7 +3782,7 @@ depends-sections = jessie2stretch-iri/main jessie2stretch-iri/contrib
 arch = amd64
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch
+upgrade-test-distros = jessie-lts stretch-next
 
 
 [jessie2bpo2stretch/main]
@@ -3741,12 +3791,12 @@ piuparts-flags =
 	%(flags-default)s
 	%(flags-start-jessie)s
 	%(flags-end-stretch)s
-depends-sections = jessie/main
+depends-sections = jessie-lts/main
 distro = jessie-backports
 arch = amd64
 area = main
 components = main
-upgrade-test-distros = jessie-lts jessie-backports stretch
+upgrade-test-distros = jessie-lts jessie-backports stretch-next
 
 [jessie2bpo2stretch/contrib]
 precedence = 95
@@ -3754,11 +3804,11 @@ piuparts-flags =
 	%(flags-default)s
 	%(flags-start-jessie)s
 	%(flags-end-stretch)s
-depends-sections = jessie/main jessie/contrib jessie/non-free jessie2bpo2stretch/main jessie2bpo2stretch/non-free
+depends-sections = jessie-lts/main jessie-lts/contrib jessie-lts/non-free jessie2bpo2stretch/main jessie2bpo2stretch/non-free
 distro = jessie-backports
 arch = amd64
 area = contrib
-upgrade-test-distros = jessie-lts jessie-backports stretch
+upgrade-test-distros = jessie-lts jessie-backports stretch-next
 
 [jessie2bpo2stretch/non-free]
 precedence = 95
@@ -3766,11 +3816,11 @@ piuparts-flags =
 	%(flags-default)s
 	%(flags-start-jessie)s
 	%(flags-end-stretch)s
-depends-sections = jessie/main jessie/contrib jessie/non-free jessie2bpo2stretch/main jessie2bpo2stretch/contrib
+depends-sections = jessie-lts/main jessie-lts/contrib jessie-lts/non-free jessie2bpo2stretch/main jessie2bpo2stretch/contrib
 distro = jessie-backports
 arch = amd64
 area = non-free
-upgrade-test-distros = jessie-lts jessie-backports stretch
+upgrade-test-distros = jessie-lts jessie-backports stretch-next
 
 
 [jessie222testing/main]
@@ -3784,7 +3834,8 @@ arch = amd64
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next testing
+upgrade-test-distros = jessie-lts stretch-next buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [jessie222testing/contrib]
@@ -3798,7 +3849,8 @@ depends-sections = jessie222testing/main jessie222testing/non-free
 arch = amd64
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next testing
+upgrade-test-distros = jessie-lts stretch-next buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [jessie222testing/non-free]
@@ -3812,7 +3864,8 @@ depends-sections = jessie222testing/main jessie222testing/contrib
 arch = amd64
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next testing
+upgrade-test-distros = jessie-lts stretch-next buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 
@@ -3828,7 +3881,8 @@ setarch = linux32
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next testing
+upgrade-test-distros = jessie-lts stretch-next buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [jessie222testing_i386/contrib]
@@ -3843,7 +3897,8 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next testing
+upgrade-test-distros = jessie-lts stretch-next buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 [jessie222testing_i386/non-free]
@@ -3858,7 +3913,8 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next testing
+upgrade-test-distros = jessie-lts stretch-next buster testing
+max-reserved = 25
 reschedule-old-count = 100
 
 
@@ -4282,6 +4338,49 @@ upgrade-test-distros = stretch buster
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 
+[stretch2buster-merged-usr/main]
+precedence = 90
+description = + In --merged-usr environment.
+piuparts-flags =
+	%(flags-merged-usr)s
+	%(flags-start-stretch)s
+	%(flags-end-buster)s
+	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
+arch = amd64
+area = main
+components = main
+distro = stretch
+upgrade-test-distros = stretch buster
+
+[stretch2buster-merged-usr/contrib]
+precedence = 95
+description = + In --merged-usr environment.
+piuparts-flags =
+	%(flags-merged-usr)s
+	%(flags-start-stretch)s
+	%(flags-end-buster)s
+	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
+depends-sections = stretch2buster-merged-usr/main stretch2buster-merged-usr/non-free
+arch = amd64
+area = contrib
+distro = stretch
+upgrade-test-distros = stretch buster
+
+[stretch2buster-merged-usr/non-free]
+precedence = 95
+description = + In --merged-usr environment.
+piuparts-flags =
+	%(flags-merged-usr)s
+	%(flags-start-stretch)s
+	%(flags-end-buster)s
+	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
+depends-sections = stretch2buster-merged-usr/main stretch2buster-merged-usr/contrib
+arch = amd64
+area = non-free
+distro = stretch
+upgrade-test-distros = stretch buster
+
+
 [stretch2buster-iri/main]
 precedence = 90
 description = Debian %(area)s: package installation and removal in stretch, then upgrade to buster, installation, removal, and purge test.


=====================================
master-bin/generate_daily_report.in
=====================================
@@ -82,7 +82,8 @@ for SECTION in $SECTIONS ; do
 		-type f -name '*.log' -newer $FAILURESTAMP -exec ls -1 {} + 2>/dev/null
 done | sed s#^$MASTER#$URLBASE# >> $DAILYTMP
 
-echo "$(cat $DAILYTMP | wc -l) new failures:" >> $DAILYREPORT
+echo -n "$(cat $DAILYTMP | wc -l) new failures in total, " >> $DAILYREPORT
+echo "$(cat $DAILYTMP | (egrep "/(sid|$TESTING|testing2sid)/" 2>/dev/null || true) | wc -l) new failures sid, $TESTING and testing2sid:" >> $DAILYREPORT
 # show failures (and show failures in sid, $TESTING and testing2sid first
 cat $DAILYTMP | (egrep "/(sid|$TESTING|testing2sid)/" 2>/dev/null || true) >> $DAILYREPORT
 echo >> $DAILYREPORT


=====================================
piupartslib/packagesdb.py
=====================================
@@ -302,6 +302,13 @@ class PackagesDB:
     _ignored_missing_dependencies = [
         "kbdcontrol",
         "vidcontrol",
+        "oracle-instantclient-basic",
+        "oracle-instantclient11.2-basic",
+        "oracle-instantclient12.1-basic",
+        # jessie
+        "mediawiki",
+        # stretch
+        "llvm-3.7-dev",
     ]
 
     # keep in sync with piuparts-report.py: emphasize_reason()



View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/c176ddaba4c0526501b8567431136f65b5dee7e9...28549085a2b2a6a7622cfdce6d0b16ac2a903b4c

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/c176ddaba4c0526501b8567431136f65b5dee7e9...28549085a2b2a6a7622cfdce6d0b16ac2a903b4c
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/20190521/69a07651/attachment-0001.html>

More information about the Piuparts-devel mailing list