Merge ~canonical-kernel-team/+git/autotest-client-tests:portias/fix-xlnx into ~canonical-kernel-team/+git/autotest-client-tests:master

[Portia Stephens]

[Po-Hsu Lin (cypressyew)]

LGTM.

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed, tests restarted.

diff --git a/ubuntu_xilinx/lib/run-test b/ubuntu_xilinx/lib/run-test
index 89dd4d3..1cd64d5 100755
--- a/ubuntu_xilinx/lib/run-test
+++ b/ubuntu_xilinx/lib/run-test
@@ -131,6 +131,10 @@ function _set_globals()
 		RT_XILINX_BOARD="zcu106"
 	fi
 
+	if [ $(cat /proc/device-tree/compatible | grep -ao -e kr26 | head -1) ] ; then
+		RT_XILINX_BOARD="kr260"
+	fi
+
 
 	# Compute the model revision
 	RT_XILINX_REV=${RT_XILINX_MODEL#* Rev}
@@ -190,6 +194,10 @@ function _install_deps()
 		rt_echo "Installing depedencies for Focal"
 		sudo snap install \
 			xlnx-config --classic --channel=1.x
+	elif [ ${RT_OS_CODENAME} == "Jammy" ] ; then
+		rt_echo "Installing depedencies for Jammy"
+		sudo snap install \
+			xlnx-config --classic
 	fi
 }
 
diff --git a/ubuntu_xilinx/ubuntu_xilinx.py b/ubuntu_xilinx/ubuntu_xilinx.py
index f362792..af14a86 100644
--- a/ubuntu_xilinx/ubuntu_xilinx.py
+++ b/ubuntu_xilinx/ubuntu_xilinx.py
@@ -7,11 +7,6 @@ class ubuntu_xilinx(test.test):
     def initialize(self):
         pass
 
-    def setup(self):
-        snap_pkgs = ['xlnx-config']
-        cmd = 'snap install --classic ' + ' '.join(snap_pkgs)
-        utils.system_output(cmd, retain_output=True)
-
     def run_once(self, test_name):
         cmd = os.path.join(self.bindir, 'tests', test_name)
         utils.system_output(cmd, retain_output=True)