tests: Use mke2fs for sysimage creation

Signed-off-by: Alexey Gladkov <[email protected]>
osboot · Feb 11, 2022 · d9a39a5 · d9a39a5
1 parent 80ec242
commit d9a39a5
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 109 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -53,21 +53,7 @@ jobs:
         if: steps.last-status.outputs.status != 'passed'
         run: |
           sudo apt-get -qq -y update
-          sudo apt-get -qq -y install git e2fsprogs genext2fs expect qemu-kvm
-
-      - name: "Checkout genext2fs"
-        if: steps.last-status.outputs.status != 'passed'
-        uses: actions/checkout@v2
-        with:
-          repository: bestouff/genext2fs
-
-      - name: "Build genext2fs"
-        if: steps.last-status.outputs.status != 'passed'
-        run: |
-          ./autogen.sh
-          ./configure
-          make
-          sudo cp -vaf ./genext2fs /usr/bin/genext2fs
+          sudo apt-get -qq -y install git expect qemu-kvm
 
       - name: "Checkout Repository"
         if: steps.last-status.outputs.status != 'passed'

diff --git a/testing/sh-functions b/testing/sh-functions
@@ -116,33 +116,4 @@ prepare_testsuite()
 		> "$workdir/qemu-stdout"
 }
 
-convert_sysimage_ext3()
-{
-	local sysimage_tar="$1"; shift
-	local sysimage_img="$1"; shift
-
-	sz_block=4096
-	n_blocks=$(( $(stat -c %s "$sysimage_tar") / $sz_block ))
-	n_inodes=$(tar -tf "$sysimage_tar" | wc -l)
-
-	blocks=$(( $n_blocks + ( ( $n_blocks * 30 ) / 100 ) ))
-
-	(
-		flock -e 0
-
-		run genext2fs -z -N $n_inodes -B $sz_block -b $blocks \
-			-L SYSIMAGE -a "$sysimage_tar" \
-			"$sysimage_img"
-
-		run /sbin/tune2fs \
-			-O dir_index,has_journal,uninit_bg \
-			"$sysimage_img"
-	) < "$0"
-
-	qemu_args \
-	 -blockdev "driver=file,node-name=sysimage,filename=$sysimage_img" \
-	 -device "virtio-blk,drive=sysimage" \
-	> "$top_workdir/qemu-sysimage"
-}
-
 trap 'exit_handler $?' EXIT HUP INT QUIT TERM
diff --git a/testing/sh-pack-sysimage.sh b/testing/sh-pack-sysimage.sh
@@ -0,0 +1,32 @@
+#!/bin/bash -efu
+
+gh_group_start "packing sysimage"
+
+cat_exec "$top_workdir/run.sh" <<-EOF
+#!/bin/bash -efux
+
+bytes=\$(du -sb /image |cut -f1)
+bytes=\$(( \$bytes + ( ( \$bytes * 30 ) / 100 ) ))
+
+dd count=1 bs=\$bytes if=/dev/zero of=/host/$workdir/sysimage.img
+/sbin/mke2fs -t ext3 -L SYSIMAGE -d /image /host/$workdir/sysimage.img
+EOF
+
+run podman run --rm -ti \
+	--mount="type=image,src=localhost/mi-$VENDOR:sysimage,dst=/image" \
+	--mount="type=tmpfs,destination=/image$builddir" \
+	--mount="type=bind,src=$topdir/.build/dest,dst=/image$builddir/.build/dest" \
+	--mount="type=bind,src=$topdir/data,dst=/image$builddir/data" \
+	--mount="type=bind,src=$topdir/features,dst=/image$builddir/features" \
+	--mount="type=bind,src=$topdir/guess,dst=/image$builddir/guess" \
+	--mount="type=bind,src=$topdir/kmodule.deps.d,dst=/image$builddir/kmodule.deps.d" \
+	--mount="type=bind,src=$topdir/tools,dst=/image$builddir/tools" \
+	--volume="$topdir:/host" \
+	"localhost/mi-$VENDOR:sysimage" "/host/$workdir/run.sh"
+
+qemu_args \
+ -blockdev "driver=file,node-name=sysimage,filename=$top_workdir/sysimage.img" \
+ -device "virtio-blk,drive=sysimage" \
+> "$top_workdir/qemu-sysimage"
+
+gh_group_end
diff --git a/testing/sh-run-kickstart.sh b/testing/sh-run-kickstart.sh
@@ -7,10 +7,10 @@ for (( i=1; i <= KICKSTART_DISKS; i++ )); do
 
 	fn="$top_workdir/disk-$i.qcow2"
 	[ -f "$fn" ] ||
-		qemu-img create -q -f qcow2 "$fn" 3G
+		qemu-img create -q -f qcow2 -o preallocation=falloc,lazy_refcounts=on "$fn" 3G
 
 	qemu_args \
-	 -blockdev "driver=qcow2,node-name=disk$i,file.driver=file,file.node-name=file$i,file.filename=$fn" \
+	 -blockdev "driver=qcow2,node-name=disk$i,file.locking=off,file.driver=file,file.node-name=file$i,file.filename=$fn,cache.direct=on,cache.no-flush=on,discard=unmap,detect-zeroes=unmap" \
 	 -device "virtio-blk,drive=disk$i,id=virtio$i"
 done > "$top_workdir/qemu-disks"
 

diff --git a/testing/testing-altlinux b/testing/testing-altlinux
@@ -131,27 +131,7 @@ for step in "$@"; do
 				gh_group_end
 			fi
 
-			gh_group_start "adding make-initrd binaries"
-
-			run podman run --rm -ti \
-				--mount="type=image,src=localhost/mi-$VENDOR:sysimage,dst=/image" \
-				--mount="type=tmpfs,destination=/image$builddir" \
-				--mount="type=bind,src=$topdir/.build/dest,dst=/image$builddir/.build/dest" \
-				--mount="type=bind,src=$topdir/data,dst=/image$builddir/data" \
-				--mount="type=bind,src=$topdir/features,dst=/image$builddir/features" \
-				--mount="type=bind,src=$topdir/guess,dst=/image$builddir/guess" \
-				--mount="type=bind,src=$topdir/kmodule.deps.d,dst=/image$builddir/kmodule.deps.d" \
-				--mount="type=bind,src=$topdir/tools,dst=/image$builddir/tools" \
-				--volume="$topdir:/host" \
-				"$IMAGE" tar -C /image -cf /host/$workdir/sysimage.tar .
-
-			convert_sysimage_ext3 \
-				"$top_workdir/sysimage.tar" \
-				"$top_workdir/sysimage.img"
-
-			rm -f -- "$top_workdir/sysimage.tar"
-
-			gh_group_end
+			. "$topdir/testing/sh-pack-sysimage.sh"
 			;;
 		build-kickstart)
 			gh_group_start "creating kickstart image"

diff --git a/testing/testing-fedora b/testing/testing-fedora
@@ -124,27 +124,7 @@ for step in "$@"; do
 				gh_group_end
 			fi
 
-			gh_group_start "adding make-initrd binaries"
-
-			run podman run --rm -ti \
-				--mount="type=image,src=localhost/mi-$VENDOR:sysimage,dst=/image" \
-				--mount="type=tmpfs,destination=/image$builddir" \
-				--mount="type=bind,src=$topdir/.build/dest,dst=/image$builddir/.build/dest" \
-				--mount="type=bind,src=$topdir/data,dst=/image$builddir/data" \
-				--mount="type=bind,src=$topdir/features,dst=/image$builddir/features" \
-				--mount="type=bind,src=$topdir/guess,dst=/image$builddir/guess" \
-				--mount="type=bind,src=$topdir/kmodule.deps.d,dst=/image$builddir/kmodule.deps.d" \
-				--mount="type=bind,src=$topdir/tools,dst=/image$builddir/tools" \
-				--volume="$topdir:/host" \
-				"$IMAGE" tar -C /image -cf /host/$workdir/sysimage.tar .
-
-			convert_sysimage_ext3 \
-				"$top_workdir/sysimage.tar" \
-				"$top_workdir/sysimage.img"
-
-			rm -f -- "$top_workdir/sysimage.tar"
-
-			gh_group_end
+			. "$topdir/testing/sh-pack-sysimage.sh"
 			;;
 		build-kickstart)
 			gh_group_start "creating kickstart image"

diff --git a/testing/testing-ubuntu b/testing/testing-ubuntu
@@ -126,27 +126,7 @@ for step in "$@"; do
 				gh_group_end
 			fi
 
-			gh_group_start "adding make-initrd binaries"
-
-			run podman run --rm -ti \
-				--mount="type=image,src=localhost/mi-$VENDOR:sysimage,dst=/image" \
-				--mount="type=tmpfs,destination=/image$builddir" \
-				--mount="type=bind,src=$topdir/.build/dest,dst=/image$builddir/.build/dest" \
-				--mount="type=bind,src=$topdir/data,dst=/image$builddir/data" \
-				--mount="type=bind,src=$topdir/features,dst=/image$builddir/features" \
-				--mount="type=bind,src=$topdir/guess,dst=/image$builddir/guess" \
-				--mount="type=bind,src=$topdir/kmodule.deps.d,dst=/image$builddir/kmodule.deps.d" \
-				--mount="type=bind,src=$topdir/tools,dst=/image$builddir/tools" \
-				--volume="$topdir:/host" \
-				"$IMAGE" tar -C /image -cf /host/$workdir/sysimage.tar .
-
-			convert_sysimage_ext3 \
-				"$top_workdir/sysimage.tar" \
-				"$top_workdir/sysimage.img"
-
-			rm -f -- "$top_workdir/sysimage.tar"
-
-			gh_group_end
+			. "$topdir/testing/sh-pack-sysimage.sh"
 			;;
 		build-kickstart)
 			gh_group_start "creating kickstart image"