Merge #2490

2490: spread: move cross builds to jammy r=AlanGriffiths a=Saviq The newer QEMU may have a better time running wlcs tests. Co-authored-by: Michał Sawicz (Saviq) <michal@sawicz.net> Co-authored-by: Alan Griffiths <alan@octopull.co.uk>
canonical · Jun 23, 2022 · 361f2df · 361f2df
2 parents 026c8c0 + 5e70604
commit 361f2df
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/spread.yml b/.github/workflows/spread.yml
@@ -38,18 +38,18 @@ jobs:
 
           # Only run if we have access to secrets.
           if ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }}; then
-            TASKS+='"google:ubuntu-20.04-64:spread/build/sbuild:debian_sid"
-                    "google:ubuntu-20.04-64:spread/build/sbuild:ubuntu"
-                    "google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_impish"
-                    "google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_jammy"
-                    "google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_arm64"
-                    "google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_armhf"
+            TASKS+='"google:ubuntu-22.04-64:spread/build/sbuild:debian_sid"
+                    "google:ubuntu-22.04-64:spread/build/sbuild:ubuntu"
+                    "google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_impish"
+                    "google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_jammy"
+                    "google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_arm64"
+                    "google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_armhf"
                     "google:ubuntu-20.04-64:spread/build/ubuntu:rpi"
                     "google:ubuntu-20.04-64:spread/build/ubuntu:clang"
                     "google:fedora-35-64:spread/build/fedora:amd64"
                     "google:fedora-36-64:spread/build/fedora:amd64"
-                    "google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_devel"
-                    "google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_proposed"
+                    "google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_devel"
+                    "google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_proposed"
                     "google:fedora-rawhide-64:spread/build/fedora:amd64"'
           fi
         fi

diff --git a/bors.toml b/bors.toml
@@ -1,10 +1,10 @@
 status = [
           "BuildAndTest (lxd:alpine-3.15:spread/build/alpine:amd64)",
-          "BuildAndTest (google:ubuntu-20.04-64:spread/build/sbuild:ubuntu)",
-          "BuildAndTest (google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_impish)",
-          "BuildAndTest (google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_jammy)",
-          "BuildAndTest (google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_arm64)",
-          "BuildAndTest (google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_armhf)",
+          "BuildAndTest (google:ubuntu-22.04-64:spread/build/sbuild:ubuntu)",
+          "BuildAndTest (google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_impish)",
+          "BuildAndTest (google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_jammy)",
+          "BuildAndTest (google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_arm64)",
+          "BuildAndTest (google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_armhf)",
           "BuildAndTest (google:ubuntu-20.04-64:spread/build/ubuntu:clang)",
           "BuildAndTest (google:fedora-35-64:spread/build/fedora:amd64)",
           "BuildAndTest (google:fedora-36-64:spread/build/fedora:amd64)",

diff --git a/spread.yaml b/spread.yaml
@@ -8,6 +8,7 @@ backends:
             - alpine-3.15
             - alpine-edge
             - ubuntu-20.04
+            - ubuntu-22.04
             - fedora-35
             - fedora-36
     google:
@@ -17,6 +18,7 @@ backends:
         halt-timeout: 2h
         systems:
             - ubuntu-20.04-64
+            - ubuntu-22.04-64
             - fedora-35-64
             - fedora-36-64
             - fedora-rawhide-64

diff --git a/spread/build/sbuild/task.yaml b/spread/build/sbuild/task.yaml
@@ -37,7 +37,6 @@ execute: |
 
     MKSBUILD_OPTS=(
       mk-sbuild
-      --eatmydata
       --distro ${DISTRO}
       ${RELEASE}
     )
@@ -77,7 +76,7 @@ execute: |
     echo "export XDG_RUNTIME_DIR=/tmp" >> debian/opts.mk
 
     # Running the tests under QEMU fails to entirely correctly support libwayland's SIGSEGV handler
-    if [[ ${DEB_HOST_ARCH} == arm* ]]; then
+    if [[ ${DEB_HOST_ARCH} == armhf ]]; then
       echo "OVERRIDE_CONFIGURE_OPTIONS += -DMIR_BAD_BUFFER_TEST_ENVIRONMENT_BROKEN=ON" >> debian/opts.mk
     fi