From e5fcf54ed71c6f1bb93437af5eef506b81c32ffe Mon Sep 17 00:00:00 2001 From: Francis Ginther Date: Thu, 2 Feb 2023 09:24:24 -0600 Subject: [PATCH] UBUNTU: [Debian] Use a python3 compatable kernel-testing repo BugLink: https://bugs.launchpad.net/bugs/2004429 Switch to using a python3 compatible branch for the kernel-testing scripts used for running autopkgtest. This in turn uses a python3 compatible fork of autotest. Remove the autopkgtest dependency on python2, replacing it with python3. Also remove the dependency on bzr as it's unused. Signed-off-by: Francis Ginther Signed-off-by: Andrea Righi --- debian/tests/control | 2 +- debian/tests/ubuntu-regression-suite | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/tests/control b/debian/tests/control index 94eb9b9ed897..a3cbca260d87 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -3,5 +3,5 @@ Depends: @builddeps@, fakeroot Restrictions: allow-stderr, skippable Tests: ubuntu-regression-suite -Depends: build-essential, gcc-multilib [amd64 armhf i386], gdb, git, python2 | python, bzr +Depends: build-essential, gcc-multilib [amd64 armhf i386], gdb, git, python3 Restrictions: allow-stderr, isolation-machine, breaks-testbed, skippable diff --git a/debian/tests/ubuntu-regression-suite b/debian/tests/ubuntu-regression-suite index 7a69cfe3688b..ef73cf5f7c1d 100755 --- a/debian/tests/ubuntu-regression-suite +++ b/debian/tests/ubuntu-regression-suite @@ -41,5 +41,6 @@ if [ "$sver" != "$rver" ]; then exit 1 fi -git clone --depth=1 git://git.launchpad.net/~canonical-kernel-team/+git/kernel-testing +git clone --depth=1 -b autotest3 git://git.launchpad.net/~canonical-kernel-team/+git/kernel-testing +git -C kernel-testing/ show HEAD -q kernel-testing/run-dep8-tests