CI: fix storage & gluster test (#4199)

Co-authored-by: Zhou Cheng <[email protected]>
juicedata · Nov 27, 2023 · 2ba4130 · 2ba4130
1 parent 29b4a5b
commit 2ba4130
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/scripts/command/sync_minio.sh b/.github/scripts/command/sync_minio.sh
@@ -115,7 +115,7 @@ prepare_test(){
     (./mc rb myminio/myjfs > /dev/null 2>&1 --force || true) && ./mc mb myminio/myjfs
     ./juicefs format $META_URL myjfs
     ./juicefs mount -d $META_URL /jfs
-    lsof -i :9005 | awk 'NR!=1 {print $2}' | xargs -r kill -9
+    lsof -i :9005 | awk 'NR!=1 {print $2}' | xargs -r kill -9 || true
     MINIO_ROOT_USER=minioadmin MINIO_ROOT_PASSWORD=minioadmin ./juicefs gateway $META_URL localhost:9005 &
     ./mc alias set juicegw http://localhost:9005 minioadmin minioadmin --api S3v4
 }

diff --git a/.github/scripts/storage.sh b/.github/scripts/storage.sh
@@ -16,14 +16,15 @@ test_with_big_file(){
     rm -rf /var/jfsCache/myjfs
     ./juicefs mount $META_URL /jfs -d
     compare_md5sum /tmp/bigfile /jfs/bigfile
+    rm -rf /tmp/bigfile
 }
 
 test_with_fio(){
     prepare_test
     ./juicefs mount $META_URL /jfs -d
     dpkg -s fio || .github/scripts/apt_install.sh fio
-    fio --name=randrw --ioengine=sync --time_based=1 --runtime=180 --group_reporting  \
-        --bs=128k --filesize=1G --numjobs=1 --rw=randrw --verify=md5 --filename=/jfs/fio
+    fio --name=randrw --ioengine=sync --time_based=1 --runtime=60 --group_reporting  \
+        --bs=128k --filesize=128M --numjobs=1 --rw=randrw --verify=md5 --filename=/jfs/fio
 }
 
 test_random_read_write(){