ci: remove miniublk.wrapper

Now blktests has support to use rublk to run './check ublk', not necessary to deal with it by miniublk.wrapper any more. Signed-off-by: Ming Lei <[email protected]>
ublk-org · Nov 13, 2023 · 02476b1 · 02476b1
1 parent 5b0d6a1
commit 02476b1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 33 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -70,9 +70,7 @@ jobs:
         mkosi ssh /usr/share/rublk/target/debug/test-basic --nocapture
         mkosi ssh "/root/bin/rublk help"
         mkosi ssh "/root/bin/rublk add help"
-        mkosi ssh "ls -l /usr/share/blktests/src/miniublk"
-        mkosi ssh "cat /usr/share/blktests/src/miniublk"
-        mkosi ssh "cd /usr/share/blktests/; ./check ublk"
+        mkosi ssh "cd /usr/share/blktests/; export PATH=/root/bin:$PATH; ./check ublk"
         mkosi ssh "/usr/share/rublk/ci/add_ublk_dev.sh /root/bin/rublk /usr/share/blktests/"
         mkosi ssh "/root/bin/rublk list"
         mkosi ssh "cat /usr/share/blktests/config"

diff --git a/ci/miniublk.wrapper b/ci/miniublk.wrapper
diff --git a/ci/mkosi.build b/ci/mkosi.build
@@ -44,7 +44,5 @@ git clone https://github.com/osandov/blktests.git
 cd blktests
 make -j4
 rm -f src/miniublk
-ln ../rublk/ci/miniublk.wrapper src/miniublk
-ls -l src/miniublk
 cd -
 cd -