ci: split root and non-root storage tests

Fixes: oVirt#128
Signed-off-by: Albert Esteve <[email protected]>

Author: aesteve-rh

.github/workflows/ci.yml

@@ -20,7 +20,9 @@ jobs:
       options: --privileged
     steps:
     - uses: actions/checkout@v2
-    - name: Run storage tests
+    - name: Run storage tests marked as root
+      run: ./automation/tests-storage.sh --root
+    - name: Run storage tests not marked as root
       run: ./automation/tests-storage.sh
   tests:
     env:

automation/tests-storage.sh

@@ -12,21 +12,31 @@ create_loop_devices() {
 }
 
 setup_storage() {
-    python3 tests/storage/userstorage.py setup
+    make storage
 }
 
 teardown_storage() {
-    python3 tests/storage/userstorage.py teardown \
+    make clean-storage \
         || echo "WARNING: Ingoring error while tearing down user storage"
 }
 
-# Configure lvm to ignore udev events, otherwise some lvm tests hang.
-mkdir -p /etc/lvm
-cp docker/lvmlocal.conf /etc/lvm/
+run_as_root=false
+if [ ! -z "$1" ]; then
+    flag=$1
+    if [ "$flag" = "--root" ]; then
+        run_as_root=true
+    fi
+fi
 
-# Make sure we have enough loop device nodes. Using 16 devices since with 8
-# devices we have random mount failures.
-create_loop_devices 16
+if [ "$run_as_root" = true ]; then
+    # Configure lvm to ignore udev events, otherwise some lvm tests hang.
+    mkdir -p /etc/lvm
+    cp docker/lvmlocal.conf /etc/lvm/
+
+    # Make sure we have enough loop device nodes. Using 16 devices since with 8
+    # devices we have random mount failures.
+    create_loop_devices 16
+fi
 
 # Build vdsm.
 ./autogen.sh --system
@@ -36,4 +46,9 @@ make
 trap teardown_storage EXIT
 setup_storage
 
-make tests-storage
+if [ "$run_as_root" = true ]; then
+    # Run only tests marked as root
+    tox -e storage -- -m root --cov-fail-under=30 tests/storage
+else
+    tox -e storage -- -m 'not root' tests/storage
+fi