Always update chroots inside sbuild, and update the source chroots every 6h

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index e1f47ba9fdcf3a9ffc6dc43d86a92c721fa4bfea..ea1359417e59af241e325e5f5c9a7c6986e766ba 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -514,13 +514,14 @@
         description: 'Update sbuild chroots'
         project-type: matrix
         execution-strategy:
+                sequential: true
                 touchstone:
                         expr: '(distribution=="sid") && (architecture=="amd64")'
         axes:
                 - axis: *arch_axis
                 - axis: *dist_axis
         triggers:
-                - timed: "@midnight"
+                - timed: "H */6 * * *"
         builders:
                 - shell: 'sbuild-update.sh'
         publishers:

diff --git a/jenkins/sbuild-package b/jenkins/sbuild-package
index 48f604fdedc583a0deb10fe23b85281aa13f0315..ff580ffe7d6e2a6e9a03bb302e21c270669d8677 100755 (executable)
--- a/jenkins/sbuild-package
+++ b/jenkins/sbuild-package
@@ -46,10 +46,6 @@ fi
 schroot -l | grep -q $chroot || \
   error "There is no schroot definition for $chroot"
 
-# update chroot
-sbuild-update.sh
-APT_UPDATE="--no-apt-update"
-
 # decide if we should build arch:all packages
 case $architecture in
   amd64)
@@ -67,7 +63,6 @@ esac
 export DEB_PG_SUPPORTED_VERSIONS
 
 if [ "$DEB_PG_SUPPORTED_VERSIONS" != "pgdg" ]; then
-  APT_UPDATE="--apt-update"
   ADD_DEPENDS="--add-depends=postgresql-server-dev-$DEB_PG_SUPPORTED_VERSIONS --chroot-setup-commands=sbuild-pgdg-components"
 fi
 
@@ -92,7 +87,7 @@ umask 002
   echo "Bulding $PACKAGE (DEB_PG_SUPPORTED_VERSIONS=$DEB_PG_SUPPORTED_VERSIONS)"
   set -x
   flock --shared 9
-  sbuild --nolog --batch $APT_UPDATE --no-apt-distupgrade \
+  sbuild --nolog --batch \
     -d $distribution-pgdg --arch $architecture ${ARCH_ALL:-} \
     --finished-build-commands='adt-sbuild %SBUILD_BUILD_DIR %SBUILD_PKGBUILD_DIR' \
     ${ADD_DEPENDS:-} $DSC