encapsulating into functions.
test: /srv/result/host-info/2020-12-30/vm-2p8g/openeuler-20.09-aarch64/z9.275242
Signed-off-by: Liu Yinsi liuyinsi@163.com --- providers/qemu/kvm.sh | 156 +++++++++++++++++++++++++----------------- 1 file changed, 93 insertions(+), 63 deletions(-)
diff --git a/providers/qemu/kvm.sh b/providers/qemu/kvm.sh index fd921dc..c48c0c7 100755 --- a/providers/qemu/kvm.sh +++ b/providers/qemu/kvm.sh @@ -7,78 +7,108 @@ : ${nr_cpu:=1} : ${memory:=1G}
-log_file=/srv/cci/serial/logs/${hostname} -if [ ! -f "$log_file" ]; then - touch $log_file - # fluentd refresh time is 1s - # let fluentd to monitor this file first - sleep 2 -fi +check_logfile() +{ + log_file=/srv/cci/serial/logs/${hostname} + if [ ! -f "$log_file" ]; then + touch $log_file + # fluentd refresh time is 1s + # let fluentd to monitor this file first + sleep 2 + fi +}
-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://$%7BSCHED_HOST:-172.17.0.1%7D:$%7BSCHED_PORT:-3000%7D/boot.ipxe/mac/$... > $ipxe_script -cat $ipxe_script >> ${log_file} +write_logfile() +{ + ipxe_script=ipxe_script + curl http://$%7BSCHED_HOST:-172.17.0.1%7D:$%7BSCHED_PORT:-3000%7D/boot.ipxe/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
+option_value()
this function is parse ipxe_script, then load kernel and initrd
so, the name should more detailed dessription
+{
- append=
- initrds=
- while read a b c
- do
case "$a" in'#');;initrd)file=$(basename "$b")wget --timestamping -a ${log_file} --progress=bar:force $binitrds+="$file ";;kernel)kernel=$(basename "$b")wget --timestamping -a ${log_file} --progress=bar:force $bappend=$(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
this step is generate initrd not check_option_value
Thanks, Shenwei
}
-[ -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
On Wed, Dec 30, 2020 at 11:55:28AM +0800, Xiao Shenwei wrote:
+option_value()
this function is parse ipxe_script, then load kernel and initrd
so, the name should more detailed dessription
ok, how about parse_ipxe_script()
+{
- append=
- initrds=
- while read a b c
- do
case "$a" in'#');;initrd)file=$(basename "$b")wget --timestamping -a ${log_file} --progress=bar:force $binitrds+="$file ";;kernel)kernel=$(basename "$b")wget --timestamping -a ${log_file} --progress=bar:force $bappend=$(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
this step is generate initrd not check_option_value
ok
Thanks, Yinsi
Thanks, Shenwei
}
-[ -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
+check_logfile() +{
- log_file=/srv/cci/serial/logs/${hostname}
- if [ ! -f "$log_file" ]; then
touch $log_file# fluentd refresh time is 1s# let fluentd to monitor this file firstsleep 2- fi
how about: [ -f "$log_file" ] || { ... } ?
-------- 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://$%7BSCHED_HOST:-172.17.0.1%7D:$%7BSCHED_PORT:-3000%7D/boot.ipxe/mac/$... > $ipxe_script -cat $ipxe_script >> ${log_file} +write_logfile() +{
- ipxe_script=ipxe_script
- curl http://$%7BSCHED_HOST:-172.17.0.1%7D:$%7BSCHED_PORT:-3000%7D/boot.ipxe/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 $binitrds+="$file ";;kernel)kernel=$(basename "$b")wget --timestamping -a ${log_file} --progress=bar:force $bappend=$(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 $binitrds+="$file ";;kernel)kernel=$(basename "$b")wget --timestamping -a ${log_file} --progress=bar:force $bappend=$(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
On Wed, Dec 30, 2020 at 02:14:54PM +0800, Yu Chuan wrote:
+check_logfile() +{
- log_file=/srv/cci/serial/logs/${hostname}
- if [ ! -f "$log_file" ]; then
touch $log_file# fluentd refresh time is 1s# let fluentd to monitor this file firstsleep 2- fi
how about: [ -f "$log_file" ] || { ... } ?
there are 2 line codes, if just 1 line code use like you say is good.
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://$%7BSCHED_HOST:-172.17.0.1%7D:$%7BSCHED_PORT:-3000%7D/boot.ipxe/mac/$... > $ipxe_script -cat $ipxe_script >> ${log_file} +write_logfile() +{
- ipxe_script=ipxe_script
- curl http://$%7BSCHED_HOST:-172.17.0.1%7D:$%7BSCHED_PORT:-3000%7D/boot.ipxe/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 $binitrds+="$file ";;kernel)kernel=$(basename "$b")wget --timestamping -a ${log_file} --progress=bar:force $bappend=$(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 $binitrds+="$file ";;kernel)kernel=$(basename "$b")wget --timestamping -a ${log_file} --progress=bar:force $bappend=$(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
-
Liu Yinsi -
Xiao Shenwei -
Yu Chuan