Fix testing -$PG_DEVEL_VERSION packages
authorChristoph Berg <christoph.berg@credativ.de>
Fri, 20 Aug 2021 11:34:07 +0000 (13:34 +0200)
committerChristoph Berg <christoph.berg@credativ.de>
Fri, 20 Aug 2021 11:34:07 +0000 (13:34 +0200)
jenkins/debcheck-pgapt

index b93046f5ec882f81bb88a2a11f31bcc98bf8c8f0..ea521a2bfb6c6ffb35e99337ea08e04f8df46acb 100755 (executable)
@@ -67,7 +67,7 @@ if [ "${PG_BETA_VERSION:-}" ] && echo "$COMPONENTS" | grep -qw "$PG_BETA_VERSION
 
   echo "### Running debcheck: main, packages matching '$PG_BETA_VERSION'"
   ( set -x; $DEBCHECK \
-    --bg $DISTSDIR/$DIST/$PG_BETA_VERSION/binary-${architecture}/Packages \
+    --fg $DISTSDIR/$DIST/$PG_BETA_VERSION/binary-${architecture}/Packages \
     --fg $DISTSDIR/$DIST/main/binary-${architecture}/Packages \
     --checkonly $betapkg ) || EXIT=$?
   echo
@@ -86,16 +86,14 @@ if [ "${PG_DEVEL_VERSION:-}" ] && echo "$COMPONENTS" | grep -qw "$PG_DEVEL_VERSI
   fi
   develpkg=$(fold $(echo "$MAINPKG" | fgrep "$PG_DEVEL_VERSION"))
 
-  if [ "$architecture" = "amd64" ] && [ "$develpkg" ]; then
+  if [ "$develpkg" ]; then
     echo "### Running debcheck: main, packages matching '$PG_DEVEL_VERSION'"
     ( set -x; $DEBCHECK \
-      --bg $DISTSDIR/$BGDIST/$PG_DEVEL_VERSION/binary-${architecture}/Packages \
+      --fg $DISTSDIR/$BGDIST/$PG_DEVEL_VERSION/binary-${architecture}/Packages \
       --fg $DISTSDIR/$DIST/main/binary-${architecture}/Packages \
-      ) || EXIT=$?
-  else
-    echo "### Skipping '$PG_DEVEL_VERSION' packages on $architecture"
+      --checkonly $develpkg ) || EXIT=$?
+    echo
   fi
-  echo
 
   # exclude packages from further testing
   MAINPKG=$(echo "$MAINPKG" | fgrep -v "$PG_DEVEL_VERSION")