Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/fix-j-ubuntu_xilinx into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

On the re-provisioned KV260 with Jammy Xilinx kernel, this test will
complain about:
 1. Missing xlnx-config command, this can be fix by installing the
    xlnx-config snap. I guess we don't have this issue on F-xilinx
    because this snap has already been included in the image.
 2. Mismatched name in /proc/device-tree/compatible, we are looking
    for 'k26' here, it works for Focal but not Jammy. We will need
    'kv26' here for Jammy
    $ cat /proc/device-tree/compatible
    xlnx,zynqmp-sk-kv260-rev1xlnx,zynqmp-sk-kv260-revBxlnx,zynqmp-sk-kv260xlnx,zynqmp

[Po-Hsu Lin (cypressyew)]

We might need to figure out why it's k26 on Focal, kv26 seems more reasonable to me.

[Francis Ginther (fginther)]

Changes look fine. I agree it would be good to understand the difference in `/proc/device-tree/compatible`. Is this a different kernel with a different device tree?

review: Approve

[Po-Hsu Lin (cypressyew)]

Here is the output from F-xilinx on KV260:
$ cat /proc/device-tree/compatible
xlnx,zynqmp-smk-k26-rev1xlnx,zynqmp-smk-k26-revBxlnx,zynqmp-smk-k26-revAxlnx,zynqmp-smk-k26xlnx,zynqmp

From what I can found on the Internet, KV260 is "a vision application development platform for Kria K26 SOMs (system-on-module)".
I will get this merged now and open a bug to track this /proc/device-tree/compatible difference, make sure it is expected.

[Po-Hsu Lin (cypressyew)]

Bug: https://bugs.launchpad.net/ubuntu/+source/linux-xilinx-zynqmp/+bug/2021962

Applied and pushed, thanks!

diff --git a/ubuntu_xilinx/lib/run-test b/ubuntu_xilinx/lib/run-test
index 652e6ef..89dd4d3 100755
--- a/ubuntu_xilinx/lib/run-test
+++ b/ubuntu_xilinx/lib/run-test
@@ -115,7 +115,7 @@ function _set_globals()
 						 tr -d '\0\n')
 
 	# Find the board
-	if [ $(cat /proc/device-tree/compatible | grep -ao k26 | head -1) ] ; then
+	if [ $(cat /proc/device-tree/compatible | grep -ao -e k26 -e kv26 | head -1) ] ; then
 		RT_XILINX_BOARD="kv260"
 	fi
 
diff --git a/ubuntu_xilinx/ubuntu_xilinx.py b/ubuntu_xilinx/ubuntu_xilinx.py
index af14a86..f362792 100644
--- a/ubuntu_xilinx/ubuntu_xilinx.py
+++ b/ubuntu_xilinx/ubuntu_xilinx.py
@@ -7,6 +7,11 @@ 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)