Merge ~fginther/+git/overlay-shiftfs-tests:fginther/riscv-skips into ~canonical-kernel-team/+git/overlay-shiftfs-tests:main

[Francis Ginther]

check-riscv64: Skip specific tests on riscv64 platforms

A couple of tests are not supported on riscv64 as they have dependencies
(zfs and a pyhton docker image) that are not yet available for riscv64.

Signed-off-by: Francis Ginther <email address hidden>

Found a few testcase issues specific to riscv64. One is caused by docker not publishing a python image for riscv64, the other by zfs support issues.

[Po-Hsu Lin (cypressyew)]

Looking good, +1.

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed. Thanks!

diff --git a/lib/check-riscv64.sh b/lib/check-riscv64.sh
 new file mode 100755
index 0000000..acf674f
--- /dev/null
+++ b/lib/check-riscv64.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Shiftfs support was added in kernel 5.0. Exit True if kernel is not compatible.
+check_riscv64() {
+    HARDWARE_PLATFORM=$(uname -i)
+    if [ "${HARDWARE_PLATFORM}" == "riscv64" ]; then
+        echo "SKIPPING $(basename ${0}): Test is not riscv64 compatible"
+        exit 0
+    fi
+}
diff --git a/tests/ovl-map-files.sh b/tests/ovl-map-files.sh
index 97bd2b2..83a930b 100755
--- a/tests/ovl-map-files.sh
+++ b/tests/ovl-map-files.sh
@@ -2,6 +2,12 @@
 #
 # See LP: #1983640
 
+. $(dirname ${0})/../lib/check-riscv64.sh
+
+# Check if this is executing on risc64 before running test
+# This test uses a python docker image for riscv64 which does not (yet) exist
+check_riscv64
+
 if [ ! -x "$(which docker)" ]; then
     echo "please install docker.io"
     exit 1
diff --git a/tests/shiftfs-lxd.sh b/tests/shiftfs-lxd.sh
index ea565c9..696072d 100755
--- a/tests/shiftfs-lxd.sh
+++ b/tests/shiftfs-lxd.sh
@@ -7,6 +7,12 @@
 # Check that this kernel supports shiftfs before running test
 check_shiftfs_compatible
 
+. $(dirname ${0})/../lib/check-riscv64.sh
+
+# Check if this is executing on risc64 before running test
+# Test will not work on riscv64 as zfs is not supported (yet)
+check_riscv64
+
 if [ ! -x $(which lxc) ]; then
     echo "please install lxd snap"
     exit 1