Upgrade Buildserver VM to latest Debian (Bookworm)

.gitlab-ci.yml

@@ -199,7 +199,7 @@ arch_pip_install:
 # The gradlew-fdroid tests are isolated from the rest of the test
 # suite, so they run as their own job.
 gradlew-fdroid:
-  image: debian:bullseye-slim
+  image: debian:bookworm-slim
   <<: *apt-template
   only:
     changes:
@@ -371,7 +371,7 @@ macOS:
 
 
 gradle:
-  image: debian:bullseye
+  image: debian:bookworm-slim
   <<: *apt-template
   variables:
     GIT_DEPTH: 1000
@@ -469,7 +469,7 @@ fdroid build:
 # fdroiddata because that one is known to work, and this is a CI job,
 # so it should be isolated from the normal churn of fdroiddata.
 plugin_fetchsrclibs:
-  image: debian:bullseye
+  image: debian:bookworm-slim
   <<: *apt-template
   only:
     changes:
@@ -513,7 +513,7 @@ plugin_fetchsrclibs:
 
 # test a full update and deploy cycle to gitlab.com
 servergitmirrors:
-  image: debian:bullseye-backports
+  image: debian:bookworm-slim
   <<: *apt-template
   only:
     - master@fdroid/fdroidserver
@@ -534,7 +534,7 @@ servergitmirrors:
         python3-venv
         rsync
         wget
-    - apt-get install -t bullseye-backports apksigner
+    - apt-get install apksigner
     - python3 -m venv --system-site-packages env
     - . env/bin/activate
     - export PYTHONPATH=`pwd`
@@ -557,7 +557,7 @@ servergitmirrors:
     - diff repo/index-v1.jar index-v1.jar
 
 Build documentation:
-  image: debian:bookworm
+  image: debian:bookworm-slim
   <<: *apt-template
   script:
     - apt-get install make python3-sphinx python3-numpydoc python3-pydata-sphinx-theme pydocstyle fdroidserver

buildserver/Dockerfile

@@ -1,5 +1,5 @@
 
-FROM debian:bullseye
+FROM debian:bookworm-slim
 
 ENV LANG=C.UTF-8 \
     DEBIAN_FRONTEND=noninteractive

buildserver/Vagrantfile

@@ -35,7 +35,7 @@ Vagrant.configure("2") do |config|
     config.cache.enable :chef
   end
 
-  config.vm.box = "fdroid/bullseye64"
+  config.vm.box = "debian/bookworm64"
 
   if not configfile.has_key? "vm_provider" or configfile["vm_provider"] == "virtualbox"
     # default to VirtualBox if not set
@@ -53,6 +53,8 @@ Vagrant.configure("2") do |config|
       libvirt.uri = "qemu:///system"
       libvirt.cpus = configfile["cpus"]
       libvirt.memory = configfile["memory"]
+      # Debian Vagrant image is only 20G, so allocate more
+      libvirt.machine_virtual_size = 1024
       if configfile.has_key? "libvirt_disk_bus"
         libvirt.disk_bus = configfile["libvirt_disk_bus"]
       end
@@ -86,6 +88,12 @@ Vagrant.configure("2") do |config|
   # necessary with 9p synced folders
   Dir.mkdir('cache') unless File.exists?('cache')
 
+  # Root partition needs to be resized to the new allocated space
+  config.vm.provision "shell", inline: <<-SHELL
+    growpart -v -u auto /dev/vda 1
+    resize2fs /dev/vda1
+  SHELL
+
   config.vm.provision "shell", name: "setup-env-vars", path: "setup-env-vars",
     args: ["/opt/android-sdk"]
   config.vm.provision "shell", name: "apt-get-install", path: "provision-apt-get-install",

fdroidserver/checkupdates.py

@@ -617,19 +617,17 @@ def checkupdates_app(app: metadata.App) -> None:
             if not gotcur:
                 newbuilds = copy.deepcopy(builds[-len(vercodes):])
 
-                bullseye_blocklist = [
-                    'apt-get install -y openjdk-11-jdk',
-                    'apt-get install openjdk-11-jdk-headless',
-                    'apt-get install -y openjdk-11-jdk-headless',
-                    'apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless',
-                    'apt-get install -y -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless',
+                bookworm_blocklist = [
+                    'apt-get install -y openjdk-17-jdk',
+                    'apt-get install openjdk-17-jdk-headless',
+                    'apt-get install -y openjdk-17-jdk-headless',
                     'update-alternatives --auto java',
                 ]
 
                 for build in newbuilds:
                     if "sudo" in build:
                         if any("openjdk-11" in line for line in build["sudo"]):
-                            build["sudo"] = [line for line in build["sudo"] if line not in bullseye_blocklist]
+                            build["sudo"] = [line for line in build["sudo"] if line not in bookworm_blocklist]
                         if build["sudo"] == ['apt-get update']:
                             build["sudo"] = ''