Merge branch '2.6.x' into 2.7.x

Closes gh-32947

Author: wilkinsona

ci/scripts/detect-ubuntu-image-updates.sh

@@ -2,7 +2,7 @@
 
 ISSUE_TITLE="Upgrade Ubuntu version in CI images"
 
-ubuntu="focal"
+ubuntu="jammy"
 latest=$( curl -s "https://hub.docker.com/v2/repositories/library/ubuntu/tags/?page_size=1&page=1&name=$ubuntu" | jq -c -r '.results[0].name' | awk '{split($0, parts, "-"); print parts[2]}' )
 current=$( grep "ubuntu:$ubuntu" git-repo/ci/images/ci-image/Dockerfile | awk '{split($0, parts, "-"); print parts[2]}' )