New subject: [PATCH v3 compass-ci] providers/qemu: refactor kvm script

30 Dec 2020


      
...
...
+	if [ ! -f "$log_file" ]; then
...
+		touch $log_file
+		# fluentd refresh time is 1s
+		# let fluentd to monitor this file first
+		sleep 2
+	fi
how about: [ -f "$log_file" ] || { ... } ?
there are 2 line codes, if just 1 line code use like you say is good.
{} is a way to group a list of commands to be executed as a unit,
you can also use like this:
        [ ] || {
          expression1
          expression2
        }

Thanks,
RenWen
...
Thanks,
Yinsi
...
--------
Thanks
Yu Chuan
...
+}
-qemu=qemu-system-aarch64
-command -v $qemu >/dev/null || qemu=qemu-kvm
+qemu_command()
+{
+	qemu=qemu-system-aarch64
+	command -v $qemu >/dev/null || qemu=qemu-kvm
+}
-ipxe_script=ipxe_script
-curl http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/boot.ipxe/mac/${mac} > $ipxe_script
-cat $ipxe_script >> ${log_file}
+write_logfile()
+{
+	ipxe_script=ipxe_script
+	curl http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/boot.ipxe/mac/${mac} > $ipxe_script
+	cat $ipxe_script >> ${log_file}
+}
-append=
-initrds=
-while read a b c
-do
-	case "$a" in
-		'#')
-			;;
-		initrd)
-			file=$(basename "$b")
-			wget --timestamping -a ${log_file} --progress=bar:force $b
-			initrds+="$file "
-			;;
-		kernel)
-			kernel=$(basename "$b")
-			wget --timestamping -a ${log_file} --progress=bar:force $b
-			append=$(echo "$c" | sed -r "s/ initrd=[^ ]+//g")
-			;;
-		*)
-			;;
-	esac
-done < $ipxe_script
+option_value()
+{
+	append=
+	initrds=
+	while read a b c
+	do
+		case "$a" in
+			'#')
+				;;
+			initrd)
+				file=$(basename "$b")
+				wget --timestamping -a ${log_file} --progress=bar:force $b
+				initrds+="$file "
+				;;
+			kernel)
+				kernel=$(basename "$b")
+				wget --timestamping -a ${log_file} --progress=bar:force $b
+				append=$(echo "$c" | sed -r "s/ initrd=[^ ]+//g")
+				;;
+			*)
+				;;
+		esac
+	done < $ipxe_script
+}
-[ -s "$kernel" ] || {
-	echo "can't get kernel or kernel size is 0"
-	exit
+check_option_value()
+{
+	[ -s "$kernel" ] || {
+		echo "can't get kernel or kernel size is 0"
+		exit
+	}
+	
+	[ -n "$initrds" ] || exit
+
+	initrd=initrd
+	cat $initrds > $initrd
}
-[ -n "$initrds" ] || {
-	exit
+print_message()
+{
+	echo $SCHED_PORT
+	echo kernel: $kernel
+	echo initrds: $initrds
+	echo append: $append
+	echo less $log_file
+	
+	sleep 5
}
-initrd=initrd
-cat $initrds > $initrd
+run_qemu()
+{
+	kvm=(
+		$qemu
+		-machine virt-4.0,accel=kvm,gic-version=3
+		-kernel $kernel
+		-initrd $initrd
+		-smp $nr_cpu
+		-m $memory
+		-cpu Kunpeng-920
+		-bios /usr/share/qemu-efi-aarch64/QEMU_EFI.fd
+		-nic tap,model=virtio-net-pci,helper=/usr/libexec/qemu-bridge-helper,br=br0,mac=${mac}
+		-k en-us
+		-no-reboot
+		-nographic
+		-serial file:${log_file}
+		-monitor null
+	)
+
+	"${kvm[@]}" --append "${append}"
+}
-echo $SCHED_PORT
-echo kernel: $kernel
-echo initrds: $initrds
-echo append: $append
-echo less $log_file
+check_logfile
+write_logfile
-sleep 5
+qemu_command
+option_value
+check_option_value
-kvm=(
-	$qemu
-	-machine virt-4.0,accel=kvm,gic-version=3
-	-kernel $kernel
-	-initrd $initrd
-	-smp $nr_cpu
-	-m $memory
-	-cpu Kunpeng-920
-	-bios /usr/share/qemu-efi-aarch64/QEMU_EFI.fd
-	-nic tap,model=virtio-net-pci,helper=/usr/libexec/qemu-bridge-helper,br=br0,mac=${mac}
-	-k en-us
-	-no-reboot
-	-nographic
-	-serial file:${log_file}
-	-monitor null
-)
+print_message
-"${kvm[@]}" --append "${append}"
+run_qemu
--
2.23.0

Re: [PATCH v3 compass-ci] providers/qemu: refactor kvm script

Ren Wen

Liu Yinsi

tags

participants (2)