Always include -testing in B-D checks

diff --git a/jenkins/builddebcheck-pgapt b/jenkins/builddebcheck-pgapt
index 5251c1a6556918d6e59e559a9050467f2aa75ee9..5e4563b35c96e67064eb38fb46f3fcec0170c1c4 100755 (executable)
--- a/jenkins/builddebcheck-pgapt
+++ b/jenkins/builddebcheck-pgapt
@@ -5,11 +5,8 @@ set -eu
 LISTSDIR="/home/chroot/$distribution-$architecture/var/lib/apt/lists"
 DISTSDIR="/home/jenkins/dists"
 
-case $stage in
-       production) DIST="$distribution-pgdg" ;;
-       testing)    DIST="$distribution-pgdg-testing" ;;
-       *) echo "Bad stage $stage" ; exit 1 ;;
-esac
+# main package list
+PKG="$LISTSDIR/*_dists_${distribution}_main_binary-${architecture}_Packages"
 
 # include universe on ubuntu
 for FILE in $LISTSDIR/*_dists_${distribution}_universe_binary-${architecture}_Packages ; do
@@ -18,20 +15,31 @@ for FILE in $LISTSDIR/*_dists_${distribution}_universe_binary-${architecture}_Pa
        TMPPKG=$(mktemp ${distribution}_universe_binary-${architecture}_Packages.XXXXXX)
        trap "rm -f $TMPPKG" 0 2 3 15
        sed -e 's/^Python_/Python-/' $FILE > $TMPPKG
-       EXTRAPKG="$TMPPKG"
+       PKG="$PKG $TMPPKG"
 done
 
 # include backports on debian
 for FILE in $LISTSDIR/*_dists_${distribution}-backports_main_binary-${architecture}_Packages ; do
        [ -f "$FILE" ] || continue
-       EXTRAPKG="${EXTRAPKG:-} $FILE"
+       PKG="$PKG $FILE"
 done
 
+# include pgdg dists
+case $stage in
+       production)
+               DIST="$distribution-pgdg"
+               PKG="$PKG $DISTSDIR/$DIST/main/binary-${architecture}/Packages"
+               PKG="$PKG $DISTSDIR/$DIST-testing/main/binary-${architecture}/Packages"
+               ;;
+       testing)
+               DIST="$distribution-pgdg-testing"
+               PKG="$PKG $DISTSDIR/$DIST/main/binary-${architecture}/Packages"
+               ;;
+       *) echo "Bad stage $stage" ; exit 1 ;;
+esac
+
 set -x
 
 # run builddebcheck
 dose-builddebcheck -v -f -e --deb-native-arch=$architecture \
-       $LISTSDIR/*_dists_${distribution}_main_binary-${architecture}_Packages \
-       $EXTRAPKG \
-       $DISTSDIR/$DIST/main/binary-${architecture}/Packages \
-       $DISTSDIR/$DIST/main/source/Sources.gz
+       $PKG $DISTSDIR/$DIST/main/source/Sources.gz

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index 80f07001eb420c421294018eb7bf258a4e204f6e..395dc372512c503196d1fe609c3d0452fa945367 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -486,8 +486,6 @@
         description: 'Run dose-debcheck on all distributions'
         project-type: matrix
         child-workspace: .
-        execution-strategy:
-                sequential: true
         axes:
                 - axis: *dist_axis
                 - axis: *arch_axis