Merge branch 'dev' into staging

Author: mutability

Diff for: Jenkinsfile

@@ -4,9 +4,24 @@ node(label: 'raspberrypi') {
             durabilityHint(hint: 'PERFORMANCE_OPTIMIZED')
         ])
 
+    // --- configuration for an arch-indep package ---
+
+    // The distributions we build on
+    def build_dist_list = [
+      "bullseye"
+    ]
+
+    // The distribution/architecture combinations we test-install on.
+    def test_dist_arch_list = [
+      ["bullseye", "armhf"]
+    ]
+
+    // The list of packages to test-install, in the correct order to install.
+    def test_package_list = ["piaware-ble-connect"]
+
+    // --- implementation ---
+
     def srcdir = "${WORKSPACE}/src"
-    def resultsdir = "results"
-    def dist = "bullseye"
 
     stage("Checkout") {
         sh "rm -fr ${srcdir}"
@@ -16,20 +31,51 @@ node(label: 'raspberrypi') {
         }
     }
 
-    stage("Build") {
-        sh "rm -fr ${resultsdir}"
-        sh "mkdir -p ${resultsdir}"
-        dir(srcdir) {
-            sh "DIST=${dist} BRANCH=${env.BRANCH_NAME} pdebuild --use-pdebuild-internal --debbuildopts -b --buildresult ${WORKSPACE}/${resultsdir}"
+    def resultdirs = [:]
+    for (int i = 0; i < build_dist_list.size(); ++i) {
+        def dist = build_dist_list[i]
+
+        String pkgdir = "pkg-${dist}"
+        stage("Prepare source for ${dist}") {
+            sh "rm -fr ${pkgdir}"
+            sh "${srcdir}/prepare-build.sh ${dist} ${pkgdir}"
+        }
+
+        def resultdir = "results-${dist}"
+        resultdirs[dist] = resultdir
+
+        stage("Build for ${dist}") {
+          sh "rm -fr ${resultdir}"
+          sh "mkdir -p ${resultdir}"
+          dir(pkgdir) {
+            sh "DIST=${dist} BRANCH=${env.BRANCH_NAME} pdebuild --use-pdebuild-internal --debbuildopts -b --buildresult ${WORKSPACE}/${resultdir}"
+          }
+          archiveArtifacts artifacts: "${resultdir}/*.deb", fingerprint: true
         }
-        archiveArtifacts artifacts: "${resultsdir}/*.deb", fingerprint: true
     }
 
-    stage("Test install on ${dist}") {
-        sh "BRANCH=${env.BRANCH_NAME} /build/pi-builder/scripts/validate-packages.sh ${dist} ${resultsdir}/piaware-ble-connect_*.deb"
+    for (int i = 0; i < test_dist_arch_list.size(); ++i) {
+      def dist_and_arch = test_dist_arch_list[i]
+      def dist = dist_and_arch[0]
+      def arch = dist_and_arch[1]
+      def resultdir = resultdirs[dist]
+
+      def test_debs = ""
+      for (int j = 0; j < test_package_list.size(); ++j) {
+        test_debs += "${resultdir}/${test_package_list[j]}_*.deb "
+      }
+
+      stage("Test install on ${dist} (${arch})") {
+        sh "BRANCH=${env.BRANCH_NAME} ARCH=${arch} /build/pi-builder/scripts/validate-packages.sh ${dist} ${test_debs}"
+      }
     }
 
-    stage("Deployment to internal repository") {
-        sh "/build/pi-builder/scripts/deploy.sh -distribution ${dist} -branch ${env.BRANCH_NAME} ${resultsdir}/*.deb"
+    stage("Deploy to internal repository") {
+        for (int i = 0; i < build_dist_list.size(); ++i) {
+            def dist = build_dist_list[i]
+            def resultdir = resultdirs[dist]
+
+            sh "/build/pi-builder/scripts/deploy.sh -distribution ${dist} -branch ${env.BRANCH_NAME} ${resultdir}/*.deb"
+        }
     }
 }

Diff for: prepare-build.sh

@@ -0,0 +1,59 @@
+#!/bin/sh
+
+# This script prepares a package tree for building on different target
+# distributions
+
+if [ $# -lt 1 ]
+then
+    echo "Syntax: $0 <distribution> [target]" >&2
+    echo "" >&2
+    echo "Prepares a package tree in <target> (default package-<distribution>) ready for building" >&2
+    exit 1
+fi
+
+export DEBFULLNAME="${DEBFULLNAME:-FlightAware build automation}"
+export DEBEMAIL="${DEBEMAIL:-adsb-devs@flightaware.com}"
+
+TOP=`dirname $0`
+DIST=$1
+OUT=$2
+
+if [ -n "$OUT" ]
+then
+    OUT=$(realpath $OUT)
+else
+    OUT=$(realpath package-$DIST)
+fi
+
+if [ -e $OUT ]
+then
+    echo "$OUT already exists, refusing to overwrite it" >&2
+    exit 1
+fi
+
+FILES=$(find $TOP -mindepth 1 -maxdepth 1 -name .git -prune -o -name 'debian*' -prune -o -name 'package-*' -prune -o -print)
+mkdir -p $OUT
+cp -a $FILES $OUT
+cp -a $TOP/debian $OUT
+[ -d $TOP/debian-$DIST ] && cp -a $TOP/debian-$DIST/* $OUT/debian/
+
+case "$DIST" in
+    bullseye)
+        echo "Updating changelog for bullseye backport build" >&2
+        dch --changelog $OUT/debian/changelog --local ~bpo11+ --force-distribution --distribution bullseye-backports "Automated backport build for bullseye"
+        ;;
+
+    bookworm)
+        # Bookworm full sdcard image support isn't ready yet, but we still
+        # consider older distributions to be "backports" for the sake of
+        # consistent version numbers
+        echo "Bookworm support isn't done yet!" >&2
+        exit 1
+        ;;
+
+    *)
+        echo "Don't know how to build for a distribution named $DIST" >&2
+        exit 1
+esac
+
+echo "Package tree prepared in $OUT" >&2