COIN: Use Ubuntu Focal chroot instead of Debian stable

We need to use older chroot to build debian packages.

Pick-to: 6.6 dev
Task-number: QTBUG-117120
Change-Id: I044e398324c380716b309dad5b087e97bc6688ab
Reviewed-by: Toni Saario <toni.saario@qt.io>

5 files changed, 19 insertions, 6 deletions

diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 7f0f7b25..5aa0b175 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -287,6 +287,8 @@ Configurations:
     Environment variables: [
         'DEBIAN_RULES_REF=6.6_dev',
         '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',
     ]
 -
     Id: 'focal-amd64-debian-pkg-packaging'
@@ -296,4 +298,7 @@ Configurations:
     Environment variables: [
         'DEBIAN_RULES_REF=6.6_dev',
         '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',
+
     ]
diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
index 54b6a3b6..08384045 100755
--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
@@ -213,6 +213,7 @@ installPackages+=(net-tools)
 installPackages+=(bridge-utils)
 ## For debian building debian packages
 installPackages+=(sbuild)
+installPackages+=(ubuntu-dev-tools)
 installPackages+=(apt-cacher-ng)
 installPackages+=(devscripts)
 installPackages+=(piuparts)
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 8392525c..16882ff7 100644
--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh
@@ -77,12 +77,15 @@ sudo sbuild-adduser $LOGNAME
 newgrp sbuild
 
 # Create chroot
-#sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64-sbuild http://127.0.0.1:3142/deb.debian.org/debian
-sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64-sbuild
+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
 sudo sbuild-update -udcar stable
-
+sudo sbuild-update -udcar focal
 
 
 
diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
index 462c61ed..b2fcdd3e 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
@@ -251,6 +251,7 @@ installPackages+=(net-tools)
 installPackages+=(bridge-utils)
 # For Debian packaging
 installPackages+=(sbuild)
+installPackages+=(ubuntu-dev-tools)
 
 echo "Running update for apt"
 waitLoop
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 f1f2e76c..ed6bad85 100644
--- 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
@@ -77,12 +77,15 @@ sudo sbuild-adduser $LOGNAME
 newgrp sbuild
 
 # Create chroot
-#sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64-sbuild http://127.0.0.1:3142/deb.debian.org/debian
-sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64-sbuild
+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
 sudo sbuild-update -udcar stable
-
+sudo sbuild-update -udcar focal