COIN: Update used chroot for Debian packages

Use Ubuntu 22.04 instead of 20.04

Change-Id: If03ba14555fdcd0c98fab3843bdfd5c2ca1eba3f
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 54245a4888c6f1e05a5f7a8568e2659507d62aa0)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

5 files changed, 45 insertions, 55 deletions

diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 68c56058..bc924913 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -270,26 +270,28 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
     ]
 -
-    Id: 'focal-arm64-debian-pkg-packaging'
+    Id: 'jammy-arm64-debian-pkg-packaging'
     Template: 'qtci-linux-Debian-11.6-aarch64-50'
     Compiler: 'GCC'
     Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
     Environment variables: [
         'DEBIAN_RULES_REF=6.7_dev',
+        'COIN_TARGET_DIST=tqtc-jammy',
         'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
-        'COIN_SBUILD_CHROOT=focal-arm64-sbuild',
-        'COIN_EXTRA_DEBIAN_REPO=deb http://ports.ubuntu.com/ubuntu-ports/ focal main universe multiverse',
+        'COIN_SBUILD_CHROOT=jammy-arm64-sbuild',
+        'COIN_EXTRA_DEBIAN_REPO=deb http://ports.ubuntu.com/ubuntu-ports/ jammy main universe multiverse',
         'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
     ]
 -
-    Id: 'focal-amd64-debian-pkg-packaging'
+    Id: 'jammy-amd64-debian-pkg-packaging'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
     Environment variables: [
         'DEBIAN_RULES_REF=6.7_dev',
+        'COIN_TARGET_DIST=tqtc-jammy',
         'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
-        'COIN_SBUILD_CHROOT=focal-amd64-sbuild',
-        'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ focal main universe multiverse',
+        'COIN_SBUILD_CHROOT=jammy-amd64-sbuild',
+        'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse',
         'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
     ]
diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh
index 801b242c..82ca4884 100755
--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh
@@ -39,18 +39,24 @@ EOF
 sudo sbuild-adduser "$LOGNAME"
 newgrp sbuild
 
-# Create chroot
+# Create chroot for debian stable
 sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64
-# For ubuntu 20.04
-echo "Create chroot for Ubuntu Focal"
-sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates focal /srv/chroot/focal-arm64 http://ports.ubuntu.com/ubuntu-ports/
-echo "Done creating chroot for Ubuntu Focal"
 
-# Update chroot
+echo "Create chroot for Ubuntu Jammy"
+# First we need update the deboostrap scripts
+mkdir -p $HOME/deboot
+cd $HOME/deboot
+# Orig url http://ftp.fi.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.134~bpo12+1.tar.gz
+# we have to update the debootstrap so that sbuild-createroot will recognize jammy code name
+wget http://ci-files01-hki.ci.qt.io/input/debian/debootstrap/debootstrap_1.0.134~bpo12+1.tar.gz
+tar xzvf debootstrap_1.0.134~bpo12+1.tar.gz
+cd debootstrap
+sudo make install
+cd
+rm -rf $HOME/deboot
+sudo sbuild-createchroot --include=gnupg,ca-certificates jammy /srv/chroot/jammy-arm64 http://ports.ubuntu.com/ubuntu-ports/
+echo "Done creating chroot for Ubuntu Jammy"
+
+# Update chroot.
 sudo sbuild-update -udcar stable
-sudo sbuild-update -udcar focal
-
-
-
-
-
+sudo sbuild-update -udcar jammy
diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh
index d4b9ec98..b31a86f2 100755
--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh
@@ -6,23 +6,13 @@
 mkdir -p /home/qt/debian_packages
 cd /home/qt/debian_packages || exit
 # Backported cmake 3.24
-wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/arm64-focal/cmake-3.24-deb.tar.gz
+wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/arm64-jammy/cmake-3.24-deb.tar.gz
 tar xzf cmake-3.24-deb.tar.gz
-# get rest of ready made Ubuntu focal arm debian packages
+# get rest of ready made Ubuntu arm debian packages
 # so that sbuild can find those
-# QtWebEngine dependencies
-wget http://ci-files01-hki.ci.qt.io/input/debian/libuv1/arm64-focal/libuv1_1.43.0.tar.gz
-tar -xzf libuv1_1.43.0.tar.gz
-rm -rf libuv1_1.43.0.tar.gz
-wget http://ci-files01-hki.ci.qt.io/input/debian/nghttp2/arm64-focal/nghttp2_1.43.0.tar.gz
-tar -xzf nghttp2_1.43.0.tar.gz
-rm -rf nghttp2_1.43.0.tar.gz
-wget http://ci-files01-hki.ci.qt.io/input/debian/nodejs/arm64-focal/nodejs_12.22.9.tar.gz
-tar -xzf nodejs_12.22.9.tar.gz
-rm -rf nodejs_12.22.9.tar.gz
-# get ICU
-wget http://ci-files01-hki.ci.qt.io/input/debian/icu/arm64-focal/libicu-56.1-qt_56.1-1_arm64.deb
-wget http://ci-files01-hki.ci.qt.io/input/debian/icu/arm64-focal/libicu-56.1-qt-dev_56.1-1_arm64.deb
+
+wget http://ci-files01-hki.ci.qt.io/input/debian/icu/arm64-jammy/libicu-56.1-qt_56.1-1_arm64.deb
+wget http://ci-files01-hki.ci.qt.io/input/debian/icu/arm64-jammy/libicu-56.1-qt-dev_56.1-1_arm64.deb
 
 
 
diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh
index 0ede658a..b178d71a 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh
@@ -41,14 +41,15 @@ newgrp sbuild
 
 # Create chroot
 sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64
-# For ubuntu 20.04
-echo "Create chroot for Ubuntu Focal"
-sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates focal /srv/chroot/focal-amd64 http://archive.ubuntu.com/ubuntu/
-echo "Done creating chroot for Ubuntu Focal"
 
-# Update chroot
+# For ubuntu 22.04
+echo "Create chroot for Ubuntu Jammy"
+## ccache can't be found with Jammy
+sudo sbuild-createchroot --include=eatmydata,gnupg,ca-certificates jammy /srv/chroot/jammy-amd64 http://archive.ubuntu.com/ubuntu/
+echo "Done creating chroot for Ubuntu Jammy"
+
+# Update chroot.
 sudo sbuild-update -udcar stable
-sudo sbuild-update -udcar focal
 
 
 
diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh
index a30bc13e..8b8530a3 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh
@@ -2,24 +2,15 @@
 # Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-# Get required deb files for sbuild to build qt debian packages for Ubuntu focal
+# Get required deb files for sbuild to build qt debian packages for Ubuntu jammy
 mkdir -p /home/qt/debian_packages
 cd /home/qt/debian_packages || exit
 # Backported cmake 3.24
-wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/amd64-focal/cmake-3.24-deb.tar.gz
+wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/amd64-jammy/cmake-3.24-deb.tar.gz
 tar xzf cmake-3.24-deb.tar.gz
-# get rest of ready made Ubuntu focal arm debian packages
+rm -rf cmake-3.24-deb.tar.gz
+# get rest of ready made Ubuntu jammy arm debian packages
 # so that sbuild can find those
-# QtWebEngine dependencies
-wget http://ci-files01-hki.ci.qt.io/input/debian/libuv1/amd64-focal/libuv1_1.43.0.tar.gz
-tar -xzf libuv1_1.43.0.tar.gz
-rm -rf libuv1_1.43.0.tar.gz
-wget http://ci-files01-hki.ci.qt.io/input/debian/nghttp2/amd64-focal/nghttp2_1.43.0.tar.gz
-tar -xzf nghttp2_1.43.0.tar.gz
-rm -rf nghttp2_1.43.0.tar.gz
-wget http://ci-files01-hki.ci.qt.io/input/debian/nodejs/amd64-focal/nodejs_12.22.9.tar.gz
-tar -xzf nodejs_12.22.9.tar.gz
-rm -rf nodejs_12.22.9.tar.gz
-# get ICU
-wget http://ci-files01-hki.ci.qt.io/input/debian/icu/amd64-focal/libicu-56.1-qt_56.1-1_amd64.deb
-wget http://ci-files01-hki.ci.qt.io/input/debian/icu/amd64-focal/libicu-56.1-qt-dev_56.1-1_amd64.deb
+
+wget http://ci-files01-hki.ci.qt.io/input/debian/icu/amd64-jammy/libicu-56.1-qt_56.1-1_amd64.deb
+wget http://ci-files01-hki.ci.qt.io/input/debian/icu/amd64-jammy/libicu-56.1-qt-dev_56.1-1_amd64.deb