From 465594ad98b388e782bb12a445160fd6f8bd89bb Mon Sep 17 00:00:00 2001
From: Ke Zhiming <kezhiming@huawei.com>
Date: Wed, 25 Nov 2020 15:25:52 +0800
Subject: [PATCH 01/10] depends: depends change

Add dependencies and merge all dependencies into the same file

Signed-off-by: Ke Zhiming <kezhiming@huawei.com>
---
 distro/depends/virttest     | 19 +++++++++++++++++++
 distro/depends/virttest-dev |  2 --
 2 files changed, 19 insertions(+), 2 deletions(-)
 delete mode 100644 distro/depends/virttest-dev

diff --git a/distro/depends/virttest b/distro/depends/virttest
index 2ac12a4..b03aed4 100644
--- a/distro/depends/virttest
+++ b/distro/depends/virttest
@@ -2,3 +2,22 @@ tcpdump
 nc
 qemu
 qemu-img
+edk2-aarch64
+edk2-devel
+libvirt
+python3-libvirt
+openssh-server
+wget
+expect
+psmisc
+device-mapper-multipath
+numactl
+gdb
+bridge-utils
+targetcli
+python3-pip
+pciutils
+dmidecode
+firewalld
+gcc
+python3-devel
diff --git a/distro/depends/virttest-dev b/distro/depends/virttest-dev
deleted file mode 100644
index c5a8616..0000000
--- a/distro/depends/virttest-dev
+++ /dev/null
@@ -1,2 +0,0 @@
-gcc
-python3-devel
-- 
Gitee


From 1ba1d41b5790765a108b464996b7577a74cf2fb1 Mon Sep 17 00:00:00 2001
From: Ke Zhiming <kezhiming@huawei.com>
Date: Wed, 25 Nov 2020 15:41:56 +0800
Subject: [PATCH 02/10] pkgbuild: add packing for lkp_test_virttest

1. Add packing for lkp_test_virttest
2. Avocado packaging adds new parts

Signed-off-by: Ke Zhiming <kezhiming@huawei.com>
---
 pkg/virttest/PKGBUILD | 95 +++++++++++++++++++++++++++----------------
 1 file changed, 61 insertions(+), 34 deletions(-)

diff --git a/pkg/virttest/PKGBUILD b/pkg/virttest/PKGBUILD
index 5aee2a4..e2a0b12 100644
--- a/pkg/virttest/PKGBUILD
+++ b/pkg/virttest/PKGBUILD
@@ -3,46 +3,73 @@ pkgver=git
 pkgrel=1
 arch=('i386' 'x86_64' 'aarch64')
 url="https://gitee.com/openeuler/avocado-vt"
-license=('GPL' 'GPL' 'GPL' 'GPL')
-source=("https://gitee.com/openeuler/avocado.git" "https://gitee.com/openeuler/avocado-vt.git" "https://gitee.com/openeuler/tp-qemu.git" "https://gitee.com/openeuler/tp-libvirt.git")
-md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP')
+license=('GPL' 'GPL' 'GPL' 'GPL' 'GPL')
+source=("https://gitee.com/openeuler/avocado.git" "https://gitee.com/openeuler/avocado-vt.git" "https://gitee.com/openeuler/tp-qemu.git" "https://gitee.com/openeuler/tp-libvirt.git" "https://gitee.com/openeuler/EulerRobot.git")
+md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') 
 
 install_virttest() {
-	local branch=$1
-
-	cd "$srcdir/tp-qemu"
-	git checkout -f "$branch"
-
-	cd "$srcdir/tp-libvirt"
-	git checkout -f "$branch"
-
-	cd "$srcdir/avocado"
-	git checkout -f "$branch"
-	sed -i "s/^libvirt-python/#&/" requirements-selftests.txt
-	pip3 install -r requirements-selftests.txt
-	python3 setup.py install
-
-	cd "$srcdir/avocado-vt"
-	git checkout -f "$branch"
-	sed -i "/^branch: /d" test-providers.d/io-github-autotest-qemu.ini
-	sed -i "/^uri: /c uri: $srcdir/tp-qemu" test-providers.d/io-github-autotest-qemu.ini
-	sed -i "/^uri: /a branch: $branch" test-providers.d/io-github-autotest-qemu.ini
-	sed -i "/^branch: /d" test-providers.d/io-github-autotest-libvirt.ini
-	sed -i "/^uri: /c uri: $srcdir/tp-libvirt" test-providers.d/io-github-autotest-libvirt.ini
-	sed -i "/^uri: /a branch: $branch" test-providers.d/io-github-autotest-libvirt.ini
-	rm -f test-providers.d/io-github-spiceqa-spice.ini
-	pip3 install -r requirements.txt
-	python3 setup.py install
-
-	avocado vt-bootstrap --vt-type qemu --vt-skip-verify-download-assets --yes-to-all
-	avocado vt-bootstrap --vt-type libvirt --vt-skip-verify-download-assets --yes-to-all
+    local branch=$1
+
+    cd "$srcdir/tp-qemu"
+    git checkout -f "$branch"
+
+    cd "$srcdir/tp-libvirt"
+    git checkout -f "$branch"
+
+    cd "$srcdir/avocado"
+    git checkout -f "$branch"
+    sed -i "s/^libvirt-python/#&/" requirements-selftests.txt
+    pip3 install -r requirements-selftests.txt
+    python3 setup.py install
+
+    cd "$srcdir/avocado-vt"
+    git checkout -f "$branch"
+    sed -i "/^branch: /d" test-providers.d/io-github-autotest-qemu.ini
+    sed -i "/^uri: /c uri: $srcdir/tp-qemu" test-providers.d/io-github-autotest-qemu.ini
+    sed -i "/^uri: /a branch: $branch" test-providers.d/io-github-autotest-qemu.ini
+    sed -i "/^branch: /d" test-providers.d/io-github-autotest-libvirt.ini
+    sed -i "/^uri: /c uri: $srcdir/tp-libvirt" test-providers.d/io-github-autotest-libvirt.ini
+    sed -i "/^uri: /a branch: $branch" test-providers.d/io-github-autotest-libvirt.ini
+    rm -f test-providers.d/io-github-spiceqa-spice.ini
+    pip3 install -r requirements.txt
+    python3 setup.py install
+
+    avocado vt-bootstrap --vt-type qemu --vt-skip-verify-download-assets --yes-to-all
+    avocado vt-bootstrap --vt-type libvirt --vt-skip-verify-download-assets --yes-to-all
 }
 
 build() {
-	install_virttest "openEuler-20.03"
+    install_virttest "openEuler-20.03"
+}
+
+avocado_copy() {
+    mkdir -p "${pkgdir}/lkp/benchmarks"
+    cp -rf "/usr/local/bin/avocado" "${pkgdir}/lkp/benchmarks"
+    mkdir -p "${pkgdir}/usr/local/bin/"
+    cp -rf "/usr/local/bin/"* "${pkgdir}/usr/local/bin/"
+    mkdir -p "${pkgdir}/usr/local/lib"
+    cp -rf "/usr/local/lib/"* "${pkgdir}/usr/local/lib/"
+    mkdir -p "${pkgdir}/usr/share/"
+    cp -rf "/usr/share/avocado-plugins-vt" "${pkgdir}/usr/share/"
+    mkdir -p "${pkgdir}/var/lib/avocado"
+    cp -rf "/var/lib/avocado/"* "${pkgdir}/var/lib/avocado/"
+    mkdir -p "{$pkgdir}/root/avocado/job-results/"
+}
+
+lkp_virttest_copy() {
+    mkdir -p "${pkgdir}/${LKP_SRC}/distro/depends"
+    cp -rf "${srcdir}/EulerRobot/distro/depends/"* "${pkgdir}/${LKP_SRC}/distro/depends/"
+    mkdir -p "${pkgdir}/${LKP_SRC}/pkg/virttest"
+    cp -rf "${srcdir}/EulerRobot/pkg/virttest"* "${pkgdir}/${LKP_SRC}/pkg/virttest/"
+    mkdir -p "${pkgdir}/${LKP_SRC}/stats"
+    cp -rf "${srcdir}/EulerRobot/stats/"* "${pkgdir}/${LKP_SRC}/stats/"
+    mkdir -p "${pkgdir}/${LKP_SRC}/tests"
+    cp -rf "${srcdir}/EulerRobot/tests/"* "${pkgdir}/${LKP_SRC}/tests/"
+    mkdir -p "${pkgdir}/${LKP_SRC}/virttest"
+    cp -rf "${srcdir}/EulerRobot/config/vmxml/"* "${pkgdir}/${LKP_SRC}/virttest/"
 }
 
 package() {
-	mkdir -p "${pkgdir}/lkp/benchmarks"
-	cp -f "/usr/local/bin/avocado" "${pkgdir}/lkp/benchmarks"
+    lkp_virttest_copy
+    avocado_copy
 }
-- 
Gitee


From b97b341f8e12cd36496851d344dd180171057a81 Mon Sep 17 00:00:00 2001
From: Ke Zhiming <kezhiming@huawei.com>
Date: Wed, 25 Nov 2020 15:54:31 +0800
Subject: [PATCH 03/10] xml2yaml: yaml format adjustment of output

1. Yaml format adjustment of output
2. Script format correction
3. Variable delte duplicate
4. Add serial number to virttest item

Signed-off-by: Ke Zhiming <kezhiming@huawei.com>
---
 script/xml2yaml.sh | 88 ++++++++++++++++++++--------------------------
 1 file changed, 39 insertions(+), 49 deletions(-)

diff --git a/script/xml2yaml.sh b/script/xml2yaml.sh
index 128818c..7b044bf 100755
--- a/script/xml2yaml.sh
+++ b/script/xml2yaml.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
 write_line() {
-	echo "$*" | tee -a virttest_tmp.yaml
+    echo "$*" | tee -a virttest_tmp.yaml
 }
 
 write_lines() {
-	local line=""
-	for line; do
-		write_line "$line"
-	done
+    local line=""
+    for line; do
+        write_line "$line"
+    done
 }
 
 rm -f virttest_tmp.yaml
@@ -17,54 +17,44 @@ write_line "testcase: virttest"
 write_line "category: functional"
 
 extra_keys=(VT_GUEST_OS VT_MACHINE_TYPE VT_NO_FILTER VT_ONLY_FILTER ENV_TYPE NO_FILTER ONLY_FILTER VT_QEMU_BIN VT_QEMU_DST_BIN VT_EXTRA_PARAMS)
-all_keys=(NAME SUFFIX REFERENCE VT_TYPE VT_GUEST_OS VT_MACHINE_TYPE)
+all_keys=(NAME SUFFIX REFERENCE VT_TYPE)
 vt_keys=(SUFFIX VT_GUEST_OS VT_MACHINE_TYPE)
 all_keys+=("${extra_keys[@]}")
 vt_keys+=("${extra_keys[@]}")
 yaml_lines=()
 yaml_state=0
+test_num=0
 while read xml_line; do
-	case "$xml_line" in
-		*\<TEST_CASE\>*)
-			TEST_CASE=start
-			for key in "${all_keys[@]}"; do
-				eval "$key="
-			done
-			;;
-		*\<*\>*\</*\>*)
-			[ "$TEST_CASE" = "start" ] || continue
-			eval "$(echo "$xml_line" | awk -F'<|>' '{print$2}')='$(echo "$xml_line" | awk -F'<|>' '{print$3}')'"
-			;;
-		*\</TEST_CASE\>*)
-			TEST_CASE=""
-			vt_params=""
-			for key in "${vt_keys[@]}"; do
-				vt_params="$vt_params$(eval echo \$$key)"
-			done
-			case_lines=("" "---")
-			for key in "${all_keys[@]}"; do
-				case "$key" in
-					REFERENCE) ;;
-					VT_TYPE) case_lines+=("vt_type: ${VT_TYPE:-libvirt}") ;;
-					NAME) [ "$NAME" != "$REFERENCE" ] && case_lines+=("vt_name: $NAME") ;;
-					ENV_TYPE) [ -n "$ENV_TYPE" ] && case_lines+=("vt_env_type: $ENV_TYPE") ;;
-					*) [ -n "$(eval echo \$$key)" ] && case_lines+=("$(echo "$key" | tr [A-Z] [a-z]): $(eval echo \$$key)") ;;
-				esac
-			done
-			case_lines+=("" "virttest:" "  vt_reference:" "  - $REFERENCE")
-			if [ $yaml_state -eq 0 ]; then
-				if [ ${#case_lines[@]} -eq 7 ]; then
-					yaml_state=1
-					unset case_lines[1]
-					write_lines "${case_lines[@]}"
- 					write_lines "${yaml_lines[@]}"
-					unset yaml_lines
-				else
-					yaml_lines+=("${case_lines[@]}")
-				fi
-			else
-				write_lines "${case_lines[@]}"
-			fi
-			;;
-	esac
+
+    case "$xml_line" in
+        *\<TEST_CASE\>*)
+            TEST_CASE=start
+            for key in "${all_keys[@]}"; do
+                eval "$key="
+            done
+            ;;
+        *\<*\>*\</*\>*)
+            [ "$TEST_CASE" = "start" ] || continue
+            eval "$(echo "$xml_line" | awk -F'<|>' '{print$2}')='$(echo "$xml_line" | awk -F'<|>' '{print$3}')'"
+            ;;
+        *\</TEST_CASE\>*)
+            TEST_CASE=""
+            vt_params=""
+            for key in "${vt_keys[@]}"; do
+                vt_params="$vt_params$(eval echo \$$key)"
+            done
+            case_lines=("" "virttest-$test_num:" "  vt_reference:" "  - $REFERENCE")
+            let test_num++
+            for key in "${all_keys[@]}"; do
+                case "$key" in
+                    REFERENCE) ;;
+                    VT_TYPE) case_lines+=("  vt_type: ${VT_TYPE:-libvirt}") ;;
+                    NAME) [ "$NAME" != "$REFERENCE" ] && case_lines+=("  vt_name: $NAME") ;;
+                    ENV_TYPE) [ -n "$ENV_TYPE" ] && case_lines+=("  vt_env_type: $ENV_TYPE") ;;
+                    *) [ -n "$(eval echo \$$key)" ] && case_lines+=("  $(echo "$key" | tr [A-Z] [a-z]): $(eval echo \$$key)") ;;
+                esac
+            done
+            write_lines "${case_lines[@]}"
+            ;;
+    esac
 done <<< "$(xmllint --format "$@")"
-- 
Gitee


From bd673db3c64d9eb0fa7e3d2dc02b7cc20a00c0bb Mon Sep 17 00:00:00 2001
From: Ke Zhiming <kezhiming@huawei.com>
Date: Wed, 25 Nov 2020 16:05:06 +0800
Subject: [PATCH 04/10] stats: results statistical modification

1. Add overall result statistics
2. Add failure feature statistics

Signed-off-by: Ke Zhiming <kezhiming@huawei.com>
---
 stats/virttest | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/stats/virttest b/stats/virttest
index 90ea7b2..26d6145 100755
--- a/stats/virttest
+++ b/stats/virttest
@@ -1,3 +1,20 @@
 #!/bin/bash
 
-grep -E ".+\.result\..+: [0-9]+$"
+tmp_log=$HOME/$(basename $0)_$RANDOM
+
+tee -a ${tmp_log:?} > /dev/null 2>&1
+
+cat $tmp_log |grep -E ".+\.result\..+: [0-9]+$"
+
+echo "--------------rate not 100------------"
+cat $tmp_log |grep -E ".+\.result\.rate: [0-9]+$" |grep -v 100
+
+echo "--------------result stats------------"
+ok=`cat $tmp_log |grep -E ".+\.result\.ok: [0-9]+$" |awk '{sum += $2} END {print sum}'`
+all=`cat $tmp_log |grep -E ".+\.result\.all: [0-9]+$" |awk '{sum += $2} END {print sum}'`
+
+echo "result.ok: $ok"
+echo "result.all: $all"
+echo "result.rate: $(($ok*100/$all))"
+
+rm -rf ${tmp_log:?}
-- 
Gitee


From 0c13ac1fa9f13a8071ed122c6886c845694b7b72 Mon Sep 17 00:00:00 2001
From: Ke Zhiming <kezhiming@huawei.com>
Date: Mon, 7 Dec 2020 16:21:26 +0800
Subject: [PATCH 05/10] vmxml: add vm template xml

Add vm template xml, including aarch64 and x86_64

Signed-off-by: Ke Zhiming <kezhiming@huawei.com>
---
 config/vmxml/avocado-vt-vm1-aarch64.xml | 156 ++++++++++++++++
 config/vmxml/avocado-vt-vm1-x86_64.xml  | 235 ++++++++++++++++++++++++
 2 files changed, 391 insertions(+)
 create mode 100644 config/vmxml/avocado-vt-vm1-aarch64.xml
 create mode 100644 config/vmxml/avocado-vt-vm1-x86_64.xml

diff --git a/config/vmxml/avocado-vt-vm1-aarch64.xml b/config/vmxml/avocado-vt-vm1-aarch64.xml
new file mode 100644
index 0000000..0d74d4e
--- /dev/null
+++ b/config/vmxml/avocado-vt-vm1-aarch64.xml
@@ -0,0 +1,156 @@
+<domain type='kvm' id='7147'>
+  <name>avocado-vt-vm1</name>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>8</vcpu>
+  <resource>
+    <partition>/machine</partition>
+  </resource>
+  <os>
+    <type arch='aarch64' machine='virt'>hvm</type>
+    <loader readonly='yes' type='pflash'>/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw</loader>
+    <nvram>/var/lib/libvirt/qemu/nvram/avocado-vt-vm1.fd</nvram>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <gic version='3'/>
+  </features>
+  <cpu mode='host-passthrough' check='none'>
+   <topology cores="2" sockets="4" threads="1" />
+ </cpu>
+  <clock offset='utc'>
+    <timer name='rtc' tickpolicy='catchup' track='guest'/>
+    <timer name='hpet' present='no'/>
+    <timer name='pit' tickpolicy='delay'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/libexec/qemu-kvm</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2' cache='none'/>
+      <source file='/var/lib/avocado/data/avocado-vt/images/openEuler-20.03-aarch64.qcow2'/>
+      <backingStore/>
+      <target dev='vda' bus='virtio'/>
+    </disk>
+    <controller type='usb' index='0' model='ehci'>
+    </controller>
+    <controller type='usb' index='1' model='nec-xhci'>
+    </controller>
+    <controller type='scsi' index='0' model='virtio-scsi'>
+    </controller>
+    <controller type='pci' index='0' model='pcie-root'>
+    </controller>
+    <controller type='pci' index='1' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='1' port='0x8'/>
+      <alias name='pci.1'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='2' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='2' port='0x9'/>
+      <alias name='pci.2'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='pci' index='3' model='pcie-to-pci-bridge'>
+      <model name='pcie-pci-bridge'/>
+      <alias name='pci.3'/>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+    </controller>
+    <controller type='pci' index='4' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='4' port='0xa'/>
+      <alias name='pci.4'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='pci' index='5' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='5' port='0xb'/>
+      <alias name='pci.5'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x3'/>
+    </controller>
+    <controller type='pci' index='6' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='6' port='0xc'/>
+      <alias name='pci.6'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x4'/>
+    </controller>
+    <controller type='pci' index='7' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='7' port='0xd'/>
+      <alias name='pci.7'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x5'/>
+    </controller>
+    <controller type='pci' index='8' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='8' port='0xe'/>
+      <alias name='pci.8'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x6'/>
+    </controller>
+    <controller type='pci' index='9' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='9' port='0xf'/>
+      <alias name='pci.9'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x7'/>
+    </controller>
+    <controller type='pci' index='10' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='10' port='0x10'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </controller>
+    <controller type='pci' index='11' model='pcie-root-port'/>
+    <controller type='pci' index='12' model='pcie-root-port'/>
+    <controller type='pci' index='13' model='pcie-root-port'/>
+    <controller type='pci' index='14' model='pcie-root-port'/>
+    <controller type='pci' index='15' model='pcie-root-port'/>
+    <controller type='pci' index='16' model='pcie-root-port'/>
+    <controller type='pci' index='17' model='pcie-root-port'/>
+    <controller type='pci' index='18' model='pcie-root-port'/>
+    <controller type='pci' index='19' model='pcie-root-port'/>
+    <controller type='pci' index='20' model='pcie-root-port'/>
+    <controller type='pci' index='21' model='pcie-root-port'/>
+    <controller type='pci' index='22' model='pcie-root-port'/>
+    <controller type='pci' index='23' model='pcie-root-port'/>
+    <controller type='pci' index='24' model='pcie-root-port'/>
+    <controller type='pci' index='25' model='pcie-root-port'/>
+    <controller type='pci' index='26' model='pcie-root-port'/>
+    <controller type='pci' index='27' model='pcie-root-port'/>
+    <controller type='pci' index='28' model='pcie-root-port'/>
+    <controller type='pci' index='29' model='pcie-root-port'/>
+    <controller type='pci' index='30' model='pcie-root-port'/>
+    <controller type='sata' index='0'>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+    </controller>
+    <interface type='bridge'>
+      <source bridge='virbr0'/>
+      <target dev='vnet0'/>
+      <model type='virtio'/>
+    </interface>
+    <serial type='pty'>
+    </serial>
+    <channel type='unix'>
+      <source mode='bind' path='/var/run/libvirt/qemu/avocado-vt-vm1.agent'/>
+      <target type='virtio' name='org.qemu.guest_agent.0' state='connected'/>
+    </channel>
+    <input type='tablet' bus='usb'>
+    </input>
+    <input type='keyboard' bus='usb'>
+    </input>
+    <graphics type='vnc' autoport='yes' listen='0.0.0.0'>
+    </graphics>
+    <video>
+      <model type='virtio' heads='1' primary='yes'/>
+    </video>
+    <memballoon model='virtio'>
+    </memballoon>
+  </devices>
+  <seclabel type='dynamic' model='dac' relabel='yes'>
+    <label>+0:+0</label>
+    <imagelabel>+0:+0</imagelabel>
+  </seclabel>
+</domain>
+
diff --git a/config/vmxml/avocado-vt-vm1-x86_64.xml b/config/vmxml/avocado-vt-vm1-x86_64.xml
new file mode 100644
index 0000000..62bd0c6
--- /dev/null
+++ b/config/vmxml/avocado-vt-vm1-x86_64.xml
@@ -0,0 +1,235 @@
+<domain type='kvm'>
+  <name>avocado-vt-vm1</name>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>8</vcpu>
+  <resource>
+    <partition>/machine</partition>
+  </resource>
+  <os>
+    <type arch='x86_64' machine='pc-q35-4.1'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic eoi='on'/>
+    <pae/>
+  </features>
+  <cpu mode='host-passthrough' check='none'>
+    <topology sockets="2" cores="4" threads="1" />
+  </cpu>
+  <clock offset='utc'>
+    <timer name='rtc' tickpolicy='catchup' track='guest'/>
+    <timer name='hpet' present='no'/>
+    <timer name='pit' tickpolicy='delay'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-kvm</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2' cache='none'/>
+      <source file='/var/lib/avocado/data/avocado-vt/images/openEuler-20.03-x86_64.qcow2'/>
+      <target dev='vda' bus='virtio'/>
+    </disk>
+    <controller type='usb' index='0' model='ehci'>
+      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x2'/>
+    </controller>
+    <controller type='usb' index='1' model='nec-xhci'>
+      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
+    </controller>
+    <controller type='scsi' model='virtio-scsi' index='0'/>
+    <controller type='sata' index='0'>
+    </controller>
+    <controller type='pci' index='0' model='pcie-root'/>
+    <controller type='pci' index='1' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='1' port='0x8'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='2' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='2' port='0x9'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='pci' index='3' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='3' port='0xa'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='pci' index='4' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='4' port='0xb'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x3'/>
+    </controller>
+    <controller type='pci' index='5' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='5' port='0x30'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='6' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='6' port='0x31'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/>
+    </controller>
+    <controller type='pci' index='7' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='7' port='0x32'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/>
+    </controller>
+    <controller type='pci' index='8' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='8' port='0x33'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x3'/>
+    </controller>
+    <controller type='pci' index='9' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='9' port='0x34'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x4'/>
+    </controller>
+    <controller type='pci' index='10' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='10' port='0x35'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x5'/>
+    </controller>
+    <controller type='pci' index='11' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='11' port='0xc'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x4'/>
+    </controller>
+    <controller type='pci' index='12' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='12' port='0xd'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x5'/>
+    </controller>
+    <controller type='pci' index='13' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='13' port='0xe'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x6'/>
+    </controller>
+    <controller type='pci' index='14' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='14' port='0xf'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x7'/>
+    </controller>
+    <controller type='pci' index='15' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='15' port='0x20'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='16' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='16' port='0x21'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x1'/>
+    </controller>
+    <controller type='pci' index='17' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='17' port='0x22'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x2'/>
+    </controller>
+    <controller type='pci' index='18' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='18' port='0x23'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x3'/>
+    </controller>
+    <controller type='pci' index='19' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='19' port='0x24'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x4'/>
+    </controller>
+    <controller type='pci' index='20' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='20' port='0x25'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x5'/>
+    </controller>
+    <controller type='pci' index='21' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='21' port='0x26'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x6'/>
+    </controller>
+    <controller type='pci' index='22' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='22' port='0x27'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x7'/>
+    </controller>
+    <controller type='pci' index='23' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='23' port='0x28'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='24' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='24' port='0x29'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x1'/>
+    </controller>
+    <controller type='pci' index='25' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='25' port='0x2a'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x2'/>
+    </controller>
+    <controller type='pci' index='26' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='26' port='0x2b'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x3'/>
+    </controller>
+    <controller type='pci' index='27' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='27' port='0x2c'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x4'/>
+    </controller>
+    <controller type='pci' index='28' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='28' port='0x2d'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x5'/>
+    </controller>
+    <controller type='pci' index='29' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='29' port='0x2e'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x6'/>
+    </controller>
+    <controller type='pci' index='30' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='30' port='0x2f'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x7'/>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
+    </controller>
+    <interface type='bridge'>
+      <source bridge='virbr0'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+    </interface>
+    <serial type='pty'>
+      <target type='isa-serial' port='0'>
+        <model name='isa-serial'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <channel type='unix'>
+      <source mode='bind' path='/var/run/libvirt/qemu/avocado-vt-vm1.agent'/>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='2'/>
+    </channel>
+    <input type='tablet' bus='usb'>
+    </input>
+    <input type='keyboard' bus='usb'>
+    </input>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'>
+    </graphics>
+    <video>
+       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
+       <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x1'/>
+    </video>
+    <memballoon model='virtio'>
+    </memballoon>
+  </devices>
+  <seclabel type='none' model='none'/>
+  <seclabel type='dynamic' model='dac' relabel='yes'/>
+</domain>
+
-- 
Gitee


From ff137b07c22350164c0ea80d12e96253f56bc0ad Mon Sep 17 00:00:00 2001
From: Ke Zhiming <kezhiming@huawei.com>
Date: Mon, 7 Dec 2020 16:23:21 +0800
Subject: [PATCH 06/10] depends/makepkg: add jobs yaml

Add depends/makepkg jobs.yaml for virttest

Signed-off-by: Ke Zhiming <kezhiming@huawei.com>
---
 jobs/virttest-depends.yaml | 5 +++++
 jobs/virttest-makepkg.yaml | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 jobs/virttest-depends.yaml
 create mode 100644 jobs/virttest-makepkg.yaml

diff --git a/jobs/virttest-depends.yaml b/jobs/virttest-depends.yaml
new file mode 100644
index 0000000..cd54bff
--- /dev/null
+++ b/jobs/virttest-depends.yaml
@@ -0,0 +1,5 @@
+suite: cci-depends
+category: functional
+
+cci-depends:
+        benchmark: virttest
diff --git a/jobs/virttest-makepkg.yaml b/jobs/virttest-makepkg.yaml
new file mode 100644
index 0000000..7183c06
--- /dev/null
+++ b/jobs/virttest-makepkg.yaml
@@ -0,0 +1,5 @@
+suite: cci-makepkg
+category: functional
+
+cci-makepkg:
+        benchmark: virttest
-- 
Gitee


From bd3a7a8c23e96d1a4922a77801aa23bd395358e6 Mon Sep 17 00:00:00 2001
From: Ke Zhiming <kezhiming@huawei.com>
Date: Mon, 7 Dec 2020 16:25:02 +0800
Subject: [PATCH 07/10] jobs: add at/st jobs yaml

Add at/st jobs.yaml for virttest

Signed-off-by: Ke Zhiming <kezhiming@huawei.com>
---
 jobs/virttest-st.yaml        |   18 -
 jobs/virttest_at.yaml        |  595 ++++++++++++++++++++
 jobs/virttest_at_2hosts.yaml |   19 +
 jobs/virttest_st.yaml        | 1015 ++++++++++++++++++++++++++++++++++
 jobs/virttest_st_2hosts.yaml |   52 ++
 5 files changed, 1681 insertions(+), 18 deletions(-)
 delete mode 100644 jobs/virttest-st.yaml
 create mode 100644 jobs/virttest_at.yaml
 create mode 100644 jobs/virttest_at_2hosts.yaml
 create mode 100644 jobs/virttest_st.yaml
 create mode 100644 jobs/virttest_st_2hosts.yaml

diff --git a/jobs/virttest-st.yaml b/jobs/virttest-st.yaml
deleted file mode 100644
index 39f3a59..0000000
--- a/jobs/virttest-st.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-suite: virttest
-testcase: virttest
-category: functional
-
-vt_type: qemu
-
-virttest:
-  vt_reference:
-  - qemu_img
-
----
-vt_type: qemu
-vt_no_filter: commit
-vt_only_filter: info.change.block_interface.default
-
-virttest:
-  vt_reference:
-  - qemu_disk_img
diff --git a/jobs/virttest_at.yaml b/jobs/virttest_at.yaml
new file mode 100644
index 0000000..f24ead6
--- /dev/null
+++ b/jobs/virttest_at.yaml
@@ -0,0 +1,595 @@
+suite: virttest
+testcase: virttest
+category: functional
+
+image_server: http://172.168.131.2:11300
+
+virttest-0:
+  vt_reference:
+  - qemu_img
+  vt_type: qemu
+  vt_no_filter: non-preallocated
+  vt_only_filter: cluster_size_default
+
+virttest-1:
+  vt_reference:
+  - qemu_guest_agent
+  vt_type: qemu
+  vt_only_filter: check_get_vcpus
+
+virttest-2:
+  vt_reference:
+  - virtio_mode
+  vt_type: qemu
+  vt_no_filter: with_netkvm,with_viorng
+  vt_only_filter: with_modern
+
+virttest-3:
+  vt_reference:
+  - ioeventfd
+  vt_type: qemu
+
+virttest-4:
+  vt_reference:
+  - qmp_basic
+  vt_type: qemu
+
+virttest-5:
+  vt_reference:
+  - virsh.reset
+  vt_name: virsh_reset
+  vt_type: libvirt
+  vt_no_filter: acl_test
+  vt_only_filter: uuid_options
+
+virttest-6:
+  vt_reference:
+  - libvirt_usb_hotplug_controller
+  vt_name: usb_contriller_hotplug
+  vt_type: libvirt
+  vt_only_filter: index_normal.guest_on
+
+virttest-7:
+  vt_reference:
+  - libvirt_usb_hotplug_device
+  vt_type: libvirt
+  vt_only_filter: attach_device.one_count.storage
+
+virttest-8:
+  vt_reference:
+  - numa_memory
+  vt_type: libvirt
+  vt_only_filter: vcpu_auto.mem_auto
+
+virttest-9:
+  vt_reference:
+  - numa_preferred_undefine
+  vt_type: libvirt
+
+virttest-10:
+  vt_reference:
+  - virtual_disks.iscsi
+  vt_name: virtual_disks_iscsi
+  vt_type: libvirt
+  vt_no_filter: test_save_snapshot,ipv6_test,auth_place_in_both_error_test
+  vt_only_filter: normal_test.device_disk.auth_uuid
+
+virttest-11:
+  vt_reference:
+  - virtual_disks.usb
+  vt_name: virtual_disks_usb
+  vt_type: libvirt
+  vt_no_filter: companion_model,qemu-xhci_model
+  vt_only_filter: virtual_disks.usb.hotplug.usb2_0,virtual_disks.usb.hotplug.usb3_0
+
+virttest-12:
+  vt_reference:
+  - virtual_devices.input_devices
+  vt_name: virtual_devices_input_devices
+  vt_type: libvirt
+  vt_no_filter: bus_type_ps2.input_type_mouse,bus_type_ps2.input_type_keyboard
+  vt_only_filter: bus_type_virtio.input_type_tablet
+
+virttest-13:
+  vt_reference:
+  - virsh.save
+  vt_name: virsh_save
+  vt_type: libvirt
+  vt_only_filter: normal_test.normal_option.running_option.no_progress
+
+virttest-14:
+  vt_reference:
+  - virsh.schedinfo_qemu_posix
+  vt_name: virsh_schedinfo_qemu_posix
+  vt_type: libvirt
+  vt_only_filter: set_cpu_param.set_cpu_shares.value_normal.set_by_cmd.current.valid_domname,set_emulator_param.set_emulator_period.value_min.valid_domid
+
+virttest-15:
+  vt_reference:
+  - virsh.start
+  vt_name: virsh_start
+  vt_type: libvirt
+  vt_only_filter: normal_start
+
+virttest-16:
+  vt_reference:
+  - virsh.suspend
+  vt_name: virsh_suspend
+  vt_type: libvirt
+  vt_only_filter: normal_test.non_acl.name_option
+
+virttest-17:
+  vt_reference:
+  - virsh.undefine
+  vt_name: virsh_undefine
+  vt_type: libvirt
+  vt_no_filter: remove_storage
+  vt_only_filter: normal_test.vm_running.no_option
+
+virttest-18:
+  vt_reference:
+  - virsh.domstats
+  vt_name: virsh_domstats
+  vt_type: libvirt
+  vt_no_filter: not_enforce,raw_print
+  vt_only_filter: normal_test.domain_state.persistent
+
+virttest-19:
+  vt_reference:
+  - virsh.dommemstat
+  vt_name: virsh_dommemstat
+  vt_type: libvirt
+  vt_only_filter: normal_test.name_option
+
+virttest-20:
+  vt_reference:
+  - virsh.dominfo
+  vt_name: virsh_dominfo
+  vt_type: libvirt
+  vt_only_filter: normal_test.uuid_option
+
+virttest-21:
+  vt_reference:
+  - virsh.domifstat
+  vt_name: virsh_domifstat
+  vt_type: libvirt
+  vt_only_filter: normal_test.name_option
+
+virttest-22:
+  vt_reference:
+  - virsh.domblkstat
+  vt_name: virsh_domblkstat
+  vt_type: libvirt
+  vt_only_filter: normal_test.name_option
+
+virttest-23:
+  vt_reference:
+  - virsh.uri
+  vt_name: virsh_uri
+  vt_type: libvirt
+  vt_only_filter: no_option
+
+virttest-24:
+  vt_reference:
+  - virsh.sysinfo
+  vt_name: virsh_sysinfo
+  vt_type: libvirt
+  vt_only_filter: normal_test.no_option
+
+virttest-25:
+  vt_reference:
+  - virsh.nodememstats
+  vt_name: virsh_nodememstats
+  vt_type: libvirt
+
+virttest-26:
+  vt_reference:
+  - virsh.nodeinfo
+  vt_name: virsh_nodeinfo
+  vt_type: libvirt
+  vt_only_filter: no_option
+
+virttest-27:
+  vt_reference:
+  - virsh.nodecpustats
+  vt_name: virsh_nodecpustats
+  vt_type: libvirt
+  vt_only_filter: with_libvirtd_stop
+
+virttest-28:
+  vt_reference:
+  - virsh.domcapabilities
+  vt_name: virsh_domcapabilities
+  vt_type: libvirt
+  vt_only_filter: local_host.default_option_values
+
+virttest-29:
+  vt_reference:
+  - virsh.cpu_models
+  vt_name: virsh_cpu_models
+  vt_type: libvirt
+  vt_only_filter: positive_test.local_host
+
+virttest-30:
+  vt_reference:
+  - virsh.capabilities
+  vt_name: virsh_capabilities
+  vt_type: libvirt
+  vt_only_filter: no_option
+
+virttest-31:
+  vt_reference:
+  - virsh.vncdisplay
+  vt_name: virsh_vncdisplay
+  vt_type: libvirt
+  vt_only_filter: normal_test.name_option
+
+virttest-32:
+  vt_reference:
+  - virsh.vcpupin
+  vt_name: virsh_vcpupin
+  vt_type: libvirt
+  vt_no_filter: multi_dom
+  vt_only_filter: online.positive_test.cpu_list.cpu_list_x-y
+
+virttest-33:
+  vt_reference:
+  - virsh.vcpuinfo
+  vt_name: virsh_vcpuinfo
+  vt_type: libvirt
+  vt_only_filter: normal_test.id_option
+
+virttest-34:
+  vt_reference:
+  - channel.functional
+  vt_name: channel_functional
+  vt_type: libvirt
+  vt_no_filter: target_name_not_set.unix_type,auto_gen_port.pty_type,target_guestfwd.pty_type,target_name_not_set
+  vt_only_filter: positive_tests.target_virtio.autopath_on
+
+virttest-35:
+  vt_reference:
+  - guestpin
+  vt_type: libvirt
+  vt_no_filter: with_cpu_hotplug
+  vt_only_filter: randompin.positive.iteration
+
+virttest-36:
+  vt_reference:
+  - max_vcpus
+  vt_type: libvirt
+  vt_no_filter: virsh_maxvcpus
+
+virttest-37:
+  vt_reference:
+  - vcpu_affinity
+  vt_type: libvirt
+  vt_no_filter: vcpu_affinity_xml,vcpu_affinity_active,vcpu_affinity_config,invalid_cpuset,outrange_cpuset,offline_hostcpu,none_exist_vcpu
+  vt_only_filter: positive_test.cputune
+
+virttest-38:
+  vt_reference:
+  - daemon.functional
+  vt_type: libvirt
+  vt_only_filter: daemon.functional.opt_pid
+
+virttest-39:
+  vt_reference:
+  - graphics.functional
+  vt_type: libvirt
+  vt_no_filter: vnc_listen_ipv6,set_passwd
+  vt_only_filter: positive_tests.vnc_only.no_autoport
+
+virttest-40:
+  vt_reference:
+  - libvirt_hugepage
+  vt_type: libvirt
+  vt_only_filter: normal.with_mb.trans_enable
+
+virttest-41:
+  vt_reference:
+  - guest_numa
+  vt_type: libvirt
+  vt_no_filter: 1G,16M
+  vt_only_filter: topology.numatune_memnode.m_preferred.numatune_mem
+
+virttest-42:
+  vt_reference:
+  - numa_capabilities
+  vt_type: libvirt
+
+virttest-43:
+  vt_reference:
+  - numa_memory
+  vt_type: libvirt
+  vt_only_filter: possitive_test.vcpu.vcpu_static.mem_auto
+
+virttest-44:
+  vt_reference:
+  - numa_preferred_undefine
+  vt_type: libvirt
+
+virttest-45:
+  vt_reference:
+  - timer_management
+  vt_type: libvirt
+  vt_no_filter: kvmclock,hpet,hpet_tsc,multi_timer,pit,platform
+  vt_only_filter: present_yes.offset_variable.no_stress.test_specific_timer
+
+virttest-46:
+  vt_reference:
+  - virsh.attach_detach_disk
+  vt_type: libvirt
+  vt_no_filter: block_disk_type_lun,audit_check,block_disk_type_logical
+  vt_only_filter: attach_disk.normal_test.attach_disk_type
+
+virttest-47:
+  vt_reference:
+  - virsh.attach_detach_disk_matrix
+  vt_type: libvirt
+  vt_no_filter: at_okay_dt_error
+  vt_only_filter: pre_vm_state_running.at_option_live
+
+virttest-48:
+  vt_reference:
+  - virsh.attach_detach_interface
+  vt_type: libvirt
+  vt_only_filter: normal_test.vm_running.exist_bridge
+
+virttest-49:
+  vt_reference:
+  - virsh.attach_detach_interface_matrix
+  vt_type: libvirt
+  vt_no_filter: at_okay_dt_error
+  vt_only_filter: pre_vm_state_running.at_option_live.dt_option_live
+
+virttest-50:
+  vt_reference:
+  - virsh.attach_device.block
+  vt_name: virsh.attach_device
+  vt_type: libvirt
+  vt_only_filter: single_virtio_file.with_alias.normal_test.hot_attach_hot_vm.persistent.id_ref,single_scsi_file.with_alias.normal_test.hot_attach_hot_vm.persistent.id_ref
+  no_filter: hot_attach_hot_vm.*block.*virtio_file
+
+virttest-51:
+  vt_reference:
+  - virsh.attach_device_matrix
+  vt_type: libvirt
+  vt_no_filter: at_okay_dt_error
+  vt_only_filter: virsh.attach_device_matrix.pre_vm_state_running.at_option_default
+  no_filter: pre_vm_state_paused.*at_okay_dt_okay
+  only_filter: virsh.attach_device_matrix.pre_vm_state_running.at_option_default
+
+virttest-52:
+  vt_reference:
+  - virsh.autostart
+  vt_type: libvirt
+  vt_only_filter: positive_test.set_autostart
+
+virttest-53:
+  vt_reference:
+  - virsh.blkdeviotune
+  vt_type: libvirt
+  vt_only_filter: virsh.blkdeviotune.positive_testing.set_blkdevio_parameter.running_guest.change_total_bytes_sec.options.current
+
+virttest-54:
+  vt_reference:
+  - virsh.blkiotune
+  vt_type: libvirt
+  vt_no_filter: positive.set_blkio_parameter.running_guest.change_device_weights.options,cgroup.stop
+  vt_only_filter: positive.set_blkio_parameter.running_guest.change_weight.options.current
+
+virttest-55:
+  vt_reference:
+  - virsh.console
+  vt_type: libvirt
+  vt_only_filter: normal_test.acl_test.valid_domuuid
+
+virttest-56:
+  vt_reference:
+  - virsh.cpu_stats
+  vt_type: libvirt
+  vt_only_filter: positive_test.option1
+
+virttest-57:
+  vt_reference:
+  - virsh.create
+  vt_type: libvirt
+  vt_only_filter: console
+
+virttest-58:
+  vt_reference:
+  - virsh.desc
+  vt_type: libvirt
+  vt_only_filter: virsh.desc.positive_test.no_option
+
+virttest-59:
+  vt_reference:
+  - virsh.destroy
+  vt_type: libvirt
+  vt_only_filter: normal_test.acl_test.id_option
+
+virttest-60:
+  vt_reference:
+  - virsh.detach_device
+  vt_type: libvirt
+  vt_no_filter: cdrom_test
+  vt_only_filter: normal_test.vm_running_current.disk_test
+
+virttest-61:
+  vt_reference:
+  - virsh.event
+  vt_type: libvirt
+  vt_no_filter: crash_panic
+  vt_only_filter: positive_test.qemu_monitor_event.pretty_option.reboot_event.timeout.loop
+
+virttest-62:
+  vt_reference:
+  - virsh.iothreadadd
+  vt_type: libvirt
+  vt_only_filter: normal_test.guest_on.uuid_option
+
+virttest-63:
+  vt_reference:
+  - virsh.iothreaddel
+  vt_type: libvirt
+  vt_only_filter: normal_test.guest_on.id_option.option_live
+
+virttest-64:
+  vt_reference:
+  - virsh.iothreadpin
+  vt_type: libvirt
+  vt_only_filter: normal_test.guest_on.name_option
+
+virttest-65:
+  vt_reference:
+  - virsh.memtune
+  vt_type: libvirt
+  vt_only_filter: memtune.positive_test.normal_1
+
+virttest-66:
+  vt_reference:
+  - virsh.metadata
+  vt_type: libvirt
+  vt_only_filter: positive_test.live_option
+
+virttest-68:
+  vt_reference:
+  - virsh.numatune
+  vt_type: libvirt
+  vt_only_filter: positive_testing.set_numa_parameter.running_guest.change_nodeset.options.current
+
+virttest-69:
+  vt_reference:
+  - virtual_devices.video_devices
+  vt_name: virtual_devices_video_devices
+  vt_type: libvirt
+  vt_no_filter: qxl,vga,cirrus
+  vt_only_filter: positive_test.primary_video.virtio.secondary_video.virtio.model_test
+
+virttest-70:
+  vt_reference:
+  - virsh.snapshot_disk
+  vt_type: libvirt
+  vt_only_filter: no_delete.negative_test.pool_vol.disk_pool.attach_img_raw.snapshot_default.current
+
+virttest-71:
+  vt_reference:
+  - virsh.snapshot_par_cur
+  vt_type: libvirt
+  vt_only_filter: snapshot_par_cur.negative_tests_current.without_snapshot
+
+virttest-72:
+  vt_reference:
+  - virsh.restore
+  vt_type: libvirt
+  vt_only_filter: no_option
+
+virttest-73:
+  vt_reference:
+  - virsh.resume
+  vt_type: libvirt
+  vt_only_filter: normal_test.vm_paused.valid_domname
+
+virttest-74:
+  vt_reference:
+  - virsh.save_image_define
+  vt_type: libvirt
+
+virttest-75:
+  vt_reference:
+  - virsh.blockresize
+  vt_type: libvirt
+  vt_only_filter: normal_test.byte.raw_type
+
+virttest-76:
+  vt_reference:
+  - virtual_disks.at_dt_iscsi_disk
+  vt_type: libvirt
+  vt_only_filter: hot_plug.volume_disk.iscsi_pool.ipv4_host_source_mode,cold_plug.volume_disk.iscsi_pool.save_domain
+
+virttest-77:
+  vt_reference:
+  - virtual_disks.multipath
+  vt_type: libvirt
+  vt_only_filter: rawio_yes.sgio_filtered.hotplug
+
+virttest-78:
+  vt_reference:
+  - virtual_disks.multidisks
+  vt_type: libvirt
+  vt_only_filter: coldplug.single_disk_test.disk_bus_device_option.disk_bus_virtio.device_lun.default
+
+virttest-79:
+  vt_reference:
+  - virsh.nodedev_detach_reattach
+  vt_type: libvirt
+  vt_only_filter: positive.normal_test
+
+virttest-80:
+  vt_reference:
+  - watchdog
+  vt_name: watchdog_i6300
+  vt_type: qemu
+  vt_no_filter: rdma,x_rdma,hotplug_unplug_watchdog_device,ib700,noaction,debug,pause_guest
+  vt_only_filter: watchdog_action
+
+virttest-81:
+  vt_reference:
+  - iface_network.net_pxe.default
+  vt_name: iface_network.net_pxe
+  vt_type: libvirt
+
+virttest-82:
+  vt_reference:
+  - virsh.boot
+  vt_name: virsh.boot.cdrom
+  vt_type: libvirt
+  vt_machine_type: arm64-pci
+  vt_only_filter: virsh.boot.by_edk.positive_test.options.boot.cdrom.boot_dev.os_nvram.no_template.os_loader.valid_loader_type.valid_readonly
+
+virttest-83:
+  vt_reference:
+  - virsh.boot
+  vt_name: virsh.boot.cdrom
+  vt_type: libvirt
+  vt_machine_type: q35
+  vt_only_filter: virsh.boot.by_seabios.positive_test.options.boot.cdrom.boot_dev.os_loader.valid_loader_type.valid_readonly
+
+virttest-84:
+  vt_reference:
+  - migrate.default.tcp.default
+  vt_name: migrate.default.open2now
+  suffix: .open2now
+  vt_type: qemu
+  vt_machine_type: arm64-pci
+  vt_qemu_bin: /Images/virt-test/virt-test/qemu-kvm-aarch64
+  vt_extra_params: machine_type=arm64-pci:virt-4.0
+
+virttest-85:
+  vt_reference:
+  - migrate.default.tcp.default
+  vt_name: migrate.default.now2open
+  suffix: .now2open
+  vt_type: qemu
+  vt_machine_type: arm64-pci
+  vt_qemu_dst_bin: /Images/virt-test/virt-test/qemu-kvm-aarch64
+  vt_extra_params: machine_type=arm64-pci:virt-4.0
+
+virttest-86:
+  vt_reference:
+  - migrate.default.tcp.default
+  vt_name: migrate.default.open2now
+  suffix: .open2now
+  vt_type: qemu
+  vt_machine_type: q35
+  vt_qemu_bin: /Images/virt-test/virt-test/qemu-kvm-x86_64
+
+virttest-87:
+  vt_reference:
+  - migrate.default.tcp.default
+  vt_name: migrate.default.now2open
+  suffix: .now2open
+  vt_type: qemu
+  vt_machine_type: q35
+  vt_qemu_dst_bin: /Images/virt-test/virt-test/qemu-kvm-x86_64
diff --git a/jobs/virttest_at_2hosts.yaml b/jobs/virttest_at_2hosts.yaml
new file mode 100644
index 0000000..bc932d2
--- /dev/null
+++ b/jobs/virttest_at_2hosts.yaml
@@ -0,0 +1,19 @@
+suite: virttest
+testcase: virttest
+category: functional
+
+image_server: http://172.168.131.2:11300
+env_type: 2hosts
+
+if role server:
+  virttest-67:
+    vt_reference:
+    - virsh.migrate
+    vt_type: libvirt
+    vt_no_filter: with_cpu_hotplug,with_mem_hotplug,preferred_memory_mode,with_postcopy
+    vt_only_filter: normal_test
+    vt_env_type: 2hosts
+if role client:
+  virttest-00:
+    vt_reference:
+    - remote_deploy
diff --git a/jobs/virttest_st.yaml b/jobs/virttest_st.yaml
new file mode 100644
index 0000000..a71b4ac
--- /dev/null
+++ b/jobs/virttest_st.yaml
@@ -0,0 +1,1015 @@
+suite: virttest
+testcase: virttest
+category: functional
+
+virttest-0:
+  vt_reference:
+  - qemu_img
+  vt_type: qemu
+
+virttest-1:
+  vt_reference:
+  - qemu_disk_img
+  vt_type: qemu
+  vt_no_filter: commit
+  no_filter: info.change_block_interface.default
+
+virttest-2:
+  vt_reference:
+  - qemu_guest_agent
+  vt_type: qemu
+  vt_no_filter: check_reboot,check_halt,check_suspend,check_hotplug_frozen,check_fsinfo,check_guest_file.read,check_guest_exec,check_snapshot,with_selinux,check_path_fsfreeze_hook,check_fstrim,gagent_check_blacklist
+
+virttest-3:
+  vt_reference:
+  - qemu_img_convert
+  vt_type: qemu
+
+virttest-4:
+  vt_reference:
+  - device_option_check
+  vt_type: qemu
+
+virttest-5:
+  vt_reference:
+  - virtio_mode
+  vt_type: qemu
+  vt_no_filter: with_legacy
+
+virttest-6:
+  vt_reference:
+  - ioeventfd
+  vt_type: qemu
+
+virttest-7:
+  vt_reference:
+  - qmp_basic
+  vt_type: qemu
+
+virttest-8:
+  vt_reference:
+  - qmp_command
+  vt_type: qemu
+  vt_no_filter: qmp_memsave
+
+virttest-9:
+  vt_reference:
+  - virsh.reset
+  vt_name: virsh_reset
+  vt_type: libvirt
+  vt_no_filter: acl_test
+
+virttest-10:
+  vt_reference:
+  - libvirt_usb_hotplug_controller
+  vt_name: usb_contriller_hotplug
+  vt_type: libvirt
+
+virttest-11:
+  vt_reference:
+  - libvirt_usb_hotplug_device
+  vt_type: libvirt
+
+virttest-12:
+  vt_reference:
+  - numa_memory
+  vt_type: libvirt
+
+virttest-13:
+  vt_reference:
+  - numa_preferred_undefine
+  vt_type: libvirt
+
+virttest-14:
+  vt_reference:
+  - virtual_disks.iscsi
+  vt_name: virtual_disks_iscsi
+  vt_type: libvirt
+  vt_no_filter: test_save_snapshot,ipv6_test
+
+virttest-15:
+  vt_reference:
+  - virtual_disks.usb
+  vt_name: virtual_disks_usb
+  vt_type: libvirt
+
+virttest-16:
+  vt_reference:
+  - virtual_devices.input_devices
+  vt_name: virtual_devices_input_devices
+  vt_type: libvirt
+  vt_no_filter: bus_type_ps2.input_type_mouse,bus_type_ps2.input_type_keyboard
+
+virttest-17:
+  vt_reference:
+  - virtual_devices.sound_device
+  vt_name: virtual_devices_sound_device
+  vt_type: libvirt
+
+virttest-18:
+  vt_reference:
+  - virtual_devices.tpm_device
+  vt_name: virtual_devices_tpm_device
+  vt_type: libvirt
+  vt_guest_os: Guest.Linux.openEuler.20.09
+  vt_no_filter: version_default,version_1.2,passthrough,test_suite
+
+virttest-19:
+  vt_reference:
+  - virsh.save
+  vt_name: virsh_save
+  vt_type: libvirt
+
+virttest-20:
+  vt_reference:
+  - virsh.schedinfo_qemu_posix
+  vt_name: virsh_schedinfo_qemu_posix
+  vt_type: libvirt
+
+virttest-21:
+  vt_reference:
+  - virsh.start
+  vt_name: virsh_start
+  vt_type: libvirt
+  vt_no_filter: remote_start
+
+virttest-23:
+  vt_reference:
+  - virsh.suspend
+  vt_name: virsh_suspend
+  vt_type: libvirt
+
+virttest-24:
+  vt_reference:
+  - virsh.undefine
+  vt_name: virsh_undefine
+  vt_type: libvirt
+  vt_no_filter: remove_storage
+
+virttest-25:
+  vt_reference:
+  - virsh.list
+  vt_name: virsh_list
+  vt_type: libvirt
+  vt_no_filter: remote
+
+virttest-26:
+  vt_reference:
+  - virsh.domstats
+  vt_name: virsh_domstats
+  vt_type: libvirt
+
+virttest-27:
+  vt_reference:
+  - virsh.domstate
+  vt_name: virsh_domstate
+  vt_type: libvirt
+  vt_no_filter: crash_vm
+
+virttest-28:
+  vt_reference:
+  - virsh.dommemstat
+  vt_name: virsh_dommemstat
+  vt_type: libvirt
+
+virttest-29:
+  vt_reference:
+  - virsh.dominfo
+  vt_name: virsh_dominfo
+  vt_type: libvirt
+
+virttest-30:
+  vt_reference:
+  - virsh.domifstat
+  vt_name: virsh_domifstat
+  vt_type: libvirt
+
+virttest-31:
+  vt_reference:
+  - virsh.domblkstat
+  vt_name: virsh_domblkstat
+  vt_type: libvirt
+
+virttest-32:
+  vt_reference:
+  - virsh.version
+  vt_name: virsh_version
+  vt_type: libvirt
+
+virttest-33:
+  vt_reference:
+  - virsh.uri
+  vt_name: virsh_uri
+  vt_type: libvirt
+
+virttest-34:
+  vt_reference:
+  - virsh.sysinfo
+  vt_name: virsh_sysinfo
+  vt_type: libvirt
+
+virttest-35:
+  vt_reference:
+  - virsh.nodememstats
+  vt_name: virsh_nodememstats
+  vt_type: libvirt
+
+virttest-36:
+  vt_reference:
+  - virsh.nodeinfo
+  vt_name: virsh_nodeinfo
+  vt_type: libvirt
+
+virttest-37:
+  vt_reference:
+  - virsh.nodecpustats
+  vt_name: virsh_nodecpustats
+  vt_type: libvirt
+
+virttest-38:
+  vt_reference:
+  - virsh.domcapabilities
+  vt_name: virsh_domcapabilities
+  vt_type: libvirt
+
+virttest-39:
+  vt_reference:
+  - virsh.cpu_models
+  vt_name: virsh_cpu_models
+  vt_type: libvirt
+
+virttest-40:
+  vt_reference:
+  - virsh.capabilities
+  vt_name: virsh_capabilities
+  vt_type: libvirt
+
+virttest-41:
+  vt_reference:
+  - virsh.vncdisplay
+  vt_name: virsh_vncdisplay
+  vt_type: libvirt
+
+virttest-42:
+  vt_reference:
+  - virsh.vcpupin
+  vt_name: virsh_vcpupin
+  vt_type: libvirt
+  vt_no_filter: multi_dom
+
+virttest-43:
+  vt_reference:
+  - virsh.vcpuinfo
+  vt_name: virsh_vcpuinfo
+  vt_type: libvirt
+
+virttest-44:
+  vt_reference:
+  - virsh.vcpucount
+  vt_name: virsh_vcpucount
+  vt_type: libvirt
+  vt_no_filter: running_test
+
+virttest-45:
+  vt_reference:
+  - channel.functional
+  vt_name: channel_functional
+  vt_type: libvirt
+  vt_no_filter: target_name_not_set.unix_type,auto_gen_port.pty_type,target_guestfwd.pty_type
+
+virttest-46:
+  vt_reference:
+  - conf_file.libvirtd_conf.host_uuid
+  vt_type: libvirt
+
+virttest-47:
+  vt_reference:
+  - conf_file.libvirtd_conf.unix_sock
+  vt_type: libvirt
+
+virttest-48:
+  vt_reference:
+  - conf_file.libvirtd_conf.unix_sock
+  vt_type: libvirt
+
+virttest-49:
+  vt_reference:
+  - conf_file.qemu_conf.clear_emulator_capabilities
+  vt_type: libvirt
+
+virttest-50:
+  vt_reference:
+  - conf_file.qemu_conf.seccomp_sandbox
+  vt_type: libvirt
+
+virttest-51:
+  vt_reference:
+  - conf_file.qemu_conf.set_process_name
+  vt_type: libvirt
+
+virttest-52:
+  vt_reference:
+  - conf_file.qemu_conf.set_virtlogd
+  vt_type: libvirt
+  vt_no_filter: vm_with_spice
+
+virttest-53:
+  vt_reference:
+  - conf_file.sysconfig_libvirtd.libvirtd_config
+  vt_type: libvirt
+
+virttest-54:
+  vt_reference:
+  - pcibridge
+  vt_type: libvirt
+
+virttest-55:
+  vt_reference:
+  - guestpin
+  vt_type: libvirt
+  vt_guest_os: Guest.Linux.openEuler.20.09
+
+virttest-56:
+  vt_reference:
+  - max_vcpus
+  vt_type: libvirt
+
+virttest-57:
+  vt_reference:
+  - vcpu_affinity
+  vt_type: libvirt
+  vt_no_filter: vcpu_affinity_xml,vcpu_affinity_active,vcpu_affinity_config
+
+virttest-58:
+  vt_reference:
+  - vcpu_misc
+  vt_type: libvirt
+  vt_only_filter: vcpu_smt_topology
+
+virttest-59:
+  vt_reference:
+  - daemon.functional
+  vt_type: libvirt
+
+virttest-60:
+  vt_reference:
+  - graphics.functional
+  vt_type: libvirt
+  vt_no_filter: vnc_listen_ipv6,set_passwd
+  vt_only_filter: vnc_only
+
+virttest-61:
+  vt_reference:
+  - libvirt_hugepage
+  vt_type: libvirt
+  vt_no_filter: unixbench
+
+virttest-62:
+  vt_reference:
+  - guest_numa
+  vt_type: libvirt
+  vt_no_filter: 1G,16M
+
+virttest-63:
+  vt_reference:
+  - numa_capabilities
+  vt_type: libvirt
+
+virttest-64:
+  vt_reference:
+  - numa_memory
+  vt_type: libvirt
+
+virttest-65:
+  vt_reference:
+  - numa_preferred_undefine
+  vt_type: libvirt
+
+virttest-66:
+  vt_reference:
+  - timer_management
+  vt_type: libvirt
+  vt_no_filter: kvmclock,hpet,hpet_tsc,platform
+
+virttest-67:
+  vt_reference:
+  - virsh.attach_detach_disk
+  vt_type: libvirt
+  vt_no_filter: block_disk_type_lun,audit_check
+
+virttest-68:
+  vt_reference:
+  - virsh.attach_detach_disk_matrix
+  vt_type: libvirt
+
+virttest-69:
+  vt_reference:
+  - virsh.attach_detach_interface
+  vt_type: libvirt
+
+virttest-70:
+  vt_reference:
+  - virsh.attach_detach_interface_matrix
+  vt_type: libvirt
+  vt_no_filter: kvmclock,hpet
+
+virttest-71:
+  vt_reference:
+  - virsh.attach_device
+  vt_type: libvirt
+  no_filter: hot_attach_hot_vm.*block.*virtio_file
+
+virttest-72:
+  vt_reference:
+  - virsh.attach_device_matrix
+  vt_type: libvirt
+  no_filter: pre_vm_state_paused.*at_okay_dt_okay
+
+virttest-73:
+  vt_reference:
+  - virsh.autostart
+  vt_type: libvirt
+
+virttest-74:
+  vt_reference:
+  - virsh.blkdeviotune
+  vt_type: libvirt
+
+virttest-75:
+  vt_reference:
+  - virsh.blkiotune
+  vt_type: libvirt
+  vt_no_filter: positive.set_blkio_parameter.running_guest.change_device_weights.options,cgroup.stop
+
+virttest-76:
+  vt_reference:
+  - virsh.console
+  vt_type: libvirt
+
+virttest-77:
+  vt_reference:
+  - virsh.cpu_stats
+  vt_type: libvirt
+
+virttest-78:
+  vt_reference:
+  - virsh.create
+  vt_type: libvirt
+
+virttest-79:
+  vt_reference:
+  - virsh.define
+  vt_type: libvirt
+
+virttest-80:
+  vt_reference:
+  - virsh.desc
+  vt_type: libvirt
+
+virttest-81:
+  vt_reference:
+  - virsh.destroy
+  vt_type: libvirt
+
+virttest-82:
+  vt_reference:
+  - virsh.detach_device
+  vt_type: libvirt
+  vt_no_filter: cdrom_test
+
+virttest-83:
+  vt_reference:
+  - virsh.domid
+  vt_type: libvirt
+
+virttest-84:
+  vt_reference:
+  - virsh.domname
+  vt_type: libvirt
+
+virttest-85:
+  vt_reference:
+  - virsh.dumpxml
+  vt_type: libvirt
+  vt_no_filter: with_cpu
+
+virttest-86:
+  vt_reference:
+  - virsh.edit
+  vt_type: libvirt
+
+virttest-87:
+  vt_reference:
+  - virsh.emulatorpin
+  vt_type: libvirt
+
+virttest-88:
+  vt_reference:
+  - virsh.event
+  vt_type: libvirt
+  vt_no_filter: crash_panic
+
+virttest-89:
+  vt_reference:
+  - virsh.iothreadadd
+  vt_type: libvirt
+
+virttest-90:
+  vt_reference:
+  - virsh.iothreaddel
+  vt_type: libvirt
+
+virttest-91:
+  vt_reference:
+  - virsh.iothreadinfo
+  vt_type: libvirt
+
+virttest-92:
+  vt_reference:
+  - virsh.iothreadpin
+  vt_type: libvirt
+
+virttest-93:
+  vt_reference:
+  - virsh.memtune
+  vt_type: libvirt
+
+virttest-94:
+  vt_reference:
+  - virsh.metadata
+  vt_type: libvirt
+
+virttest-98:
+  vt_reference:
+  - virsh.cpu_compare
+  vt_type: libvirt
+  vt_no_filter: cpu64-rhel5,cpu64-rhel6
+
+virttest-99:
+  vt_reference:
+  - virsh.cpu_baseline
+  vt_type: libvirt
+
+virttest-100:
+  vt_reference:
+  - virsh.numatune
+  vt_type: libvirt
+
+virttest-101:
+  vt_reference:
+  - virsh.domtime
+  vt_name: domtime
+  vt_type: libvirt
+  vt_no_filter: positive.pmsuspend_vm
+
+virttest-102:
+  vt_reference:
+  - virsh.domuuid
+  vt_name: domuuid
+  vt_type: libvirt
+
+virttest-103:
+  vt_reference:
+  - virsh.domxml_to_native
+  vt_name: domxml_to_native
+  vt_type: libvirt
+
+virttest-104:
+  vt_reference:
+  - virsh.dump
+  vt_name: virsh_dump
+  vt_type: libvirt
+
+virttest-105:
+  vt_reference:
+  - virsh.guestvcpus
+  vt_name: virsh_guestvcpus
+  vt_type: libvirt
+
+virttest-106:
+  vt_reference:
+  - virsh.domrename
+  vt_name: domrename
+  vt_type: libvirt
+
+virttest-107:
+  vt_reference:
+  - virsh.hostname
+  vt_name: hostname
+  vt_type: libvirt
+
+virttest-108:
+  vt_reference:
+  - virsh.maxvcpus
+  vt_name: maxvcpus
+  vt_type: libvirt
+
+virttest-109:
+  vt_reference:
+  - virsh.node_memtune
+  vt_name: virsh_node_memtune
+  vt_type: libvirt
+
+virttest-110:
+  vt_reference:
+  - virsh.nodecpumap
+  vt_name: nodecpumap
+  vt_type: libvirt
+
+virttest-111:
+  vt_reference:
+  - virsh.nodedev_dumpxml
+  vt_name: nodedev_dumpxml
+  vt_type: libvirt
+
+virttest-112:
+  vt_reference:
+  - virsh.nodedev_event
+  vt_name: nodedev_event
+  vt_type: libvirt
+
+virttest-113:
+  vt_reference:
+  - virsh.nodedev_list
+  vt_name: nodedev_list
+  vt_type: libvirt
+
+virttest-114:
+  vt_reference:
+  - virtual_devices.video_devices
+  vt_name: virtual_devices_video_devices
+  vt_type: libvirt
+  vt_no_filter: qxl,vga,cirrus
+  vt_only_filter: virtio.secondary_video
+
+virttest-115:
+  vt_reference:
+  - numa
+  vt_type: qemu
+  vt_only_filter: numa_basic
+
+virttest-116:
+  vt_reference:
+  - numa_opts
+  vt_type: qemu
+  vt_no_filter: nodes.32
+
+virttest-117:
+  vt_reference:
+  - numa_memdev_options.numa_policy
+  vt_name: numa_mem_policy
+  vt_type: qemu
+
+virttest-118:
+  vt_reference:
+  - numa_memdev_options.numa_mlock
+  vt_name: numa_mem_mlock
+  vt_type: qemu
+
+virttest-119:
+  vt_reference:
+  - numa_memdev_options.numa_hugepage
+  vt_name: numa_hugepage
+  vt_type: qemu
+
+virttest-120:
+  vt_reference:
+  - numa_memdev_options.numa_ram_hugepage
+  vt_name: numa_ram_hugepage
+  vt_type: qemu
+
+virttest-121:
+  vt_reference:
+  - watchdog
+  vt_name: watchdog_i6300
+  vt_type: qemu
+  vt_no_filter: rdma,x_rdma,hotplug_unplug_watchdog_device,ib700
+
+virttest-122:
+  vt_reference:
+  - virsh.save_image_define
+  vt_type: libvirt
+
+virttest-123:
+  vt_reference:
+  - virsh.save_image_edit
+  vt_type: libvirt
+
+virttest-124:
+  vt_reference:
+  - virsh.resume
+  vt_type: libvirt
+
+virttest-125:
+  vt_reference:
+  - virsh.restore
+  vt_type: libvirt
+  vt_no_filter: acl_test
+
+virttest-126:
+  vt_reference:
+  - virsh.blockjob
+  vt_type: libvirt
+
+virttest-127:
+  vt_reference:
+  - virsh.blockcopy
+  vt_type: libvirt
+  vt_no_filter: acl_test,negative_test.block_lun.block_type,negative_test.block_lun.network_type,positive_test.non_acl.local_disk.blockdev.no_shallow
+
+virttest-128:
+  vt_reference:
+  - virsh.change_media_matrix
+  vt_type: libvirt
+  vt_no_filter: force.action_twice.live.insert_update,config.action_twice.live_config.eject_insert
+
+virttest-129:
+  vt_reference:
+  - virsh.blockcommit
+  vt_type: libvirt
+  vt_no_filter: gluster,ceph
+
+virttest-130:
+  vt_reference:
+  - virsh.blockpull
+  vt_type: libvirt
+  vt_no_filter: gluster,ceph
+
+virttest-131:
+  vt_reference:
+  - virsh.change_media
+  vt_type: libvirt
+  vt_no_filter: floppy_test
+
+virttest-132:
+  vt_reference:
+  - virsh.blockresize
+  vt_type: libvirt
+  vt_no_filter: qed_type
+
+virttest-133:
+  vt_reference:
+  - virsh.connect
+  vt_type: libvirt
+  vt_no_filter: xen_uri,lxc_uri
+
+virttest-134:
+  vt_reference:
+  - virsh.nodedev_reset
+  vt_type: libvirt
+  vt_no_filter: positive_test,unresettable_device
+
+virttest-135:
+  vt_reference:
+  - virtual_disks.at_dt_iscsi_disk
+  vt_type: libvirt
+  vt_no_filter: ipv6_virtio_bus,snapshot_domain,iscsi_direct_pool.ipv6_host_source_mode
+
+virttest-136:
+  vt_reference:
+  - virtual_disks.multipath
+  vt_type: libvirt
+  vt_no_filter: sgio_unfiltered
+
+virttest-137:
+  vt_reference:
+  - virtual_disks.multidisks
+  vt_type: libvirt
+  vt_no_filter: disk_bus_ide,disk_readonly_nfs_raw,disks_bootorder,disk_virtio_multi_ide_controller,disk_source_file_name,disk_cdrom_update_boot_order,disk_virtio_scsi_cdrom_multi_queue,disk_ide_place_correct_boot_order,disk_readonly_nfs_cdrom,virtio_disks_duplicate_wwn_cdrom,disk_nfs_pool,disk_option_bootdisk.disk_virtio_bootorder_snapshot
+
+virttest-138:
+  vt_reference:
+  - virsh.nodedev_detach_reattach
+  vt_type: libvirt
+
+virttest-139:
+  vt_reference:
+  - virsh.qemu_agent_command_fs
+  vt_type: libvirt
+
+virttest-140:
+  vt_reference:
+  - usb_passthrough
+  vt_type: libvirt
+
+virttest-141:
+  vt_reference:
+  - kernel_panic
+  vt_type: libvirt
+
+virttest-142:
+  vt_reference:
+  - hotplug_serial
+  vt_type: libvirt
+
+virttest-143:
+  vt_reference:
+  - virsh.qemu_agent_command
+  vt_type: libvirt
+  vt_no_filter: async_option,normal_test.guest_sync.sync_extra,normal_test.guest_cmd_valid.no_arguments.guest_shutdown,normal_test.guest_cmd_valid.null_arguments.guest_shutdown,normal_test.guest_cmd_valid.invalid_arguments,coldplug.multi_disks_test.disks_bootorder,coldplug_only_iso,single_disk_test.disk_cdrom_update_boot_order,
+
+virttest-144:
+  vt_reference:
+  - drive_mirror
+  vt_type: qemu
+  vt_no_filter: granularity,with_installation
+
+virttest-145:
+  vt_reference:
+  - drive_mirror_negative_tests
+  vt_type: qemu
+  vt_no_filter: readonly_target
+
+virttest-146:
+  vt_reference:
+  - data_plane_boot
+  vt_type: qemu
+  vt_no_filter: machine_type
+
+virttest-147:
+  vt_reference:
+  - virsh.snapshot_par_cur
+  vt_type: libvirt
+  vt_only_filter: without_snapshot
+
+virttest-148:
+  vt_reference:
+  - virsh.snapshot_disk
+  vt_type: libvirt
+  vt_no_filter: memory_internal,logical_pool,gluster,network_disk
+  vt_only_filter: disk_external,attach_img_raw
+
+virttest-149:
+  vt_reference:
+  - virsh.domjobabort
+  vt_type: libvirt
+  vt_no_filter: dump_action,migrate_option
+
+virttest-151:
+  vt_reference:
+  - virsh.domjobinfo
+  vt_type: libvirt
+  vt_no_filter: dump_action
+
+virttest-152:
+  vt_reference:
+  - sriov
+  vt_type: libvirt
+  vt_machine_type: q35
+  vt_only_filter: ixgbe
+  vt_env_type: 82599
+
+virttest-153:
+  vt_reference:
+  - sriov
+  vt_type: libvirt
+  vt_machine_type: arm64-pci
+  vt_no_filter: hotplug
+  vt_only_filter: hinic
+  vt_env_type: hi1822
+
+virttest-154:
+  vt_reference:
+  - sriov_uacce
+  vt_type: libvirt
+  vt_guest_os: Guest.Linux.openEuler.20.09
+  vt_machine_type: arm64-pci
+  vt_env_type: KAE
+
+virttest-155:
+  vt_reference:
+  - hotplug_memory
+  vt_type: qemu
+  vt_guest_os: Guest.Linux.openEuler.20.09
+  vt_no_filter: unplug
+
+virttest-156:
+  vt_reference:
+  - libvirt_mem
+  vt_type: libvirt
+  vt_guest_os: Guest.Linux.openEuler.20.09
+  vt_only_filter: hot.plug,hot_plug
+
+virttest-157:
+  vt_reference:
+  - cpu_hotplug_test
+  vt_type: qemu
+  vt_guest_os: Guest.Linux.openEuler.20.09
+  vt_no_filter: unplug
+
+virttest-158:
+  vt_reference:
+  - cpu_device_hotplug_during_boot
+  vt_type: qemu
+  vt_guest_os: Guest.Linux.openEuler.20.09
+  vt_no_filter: with_unplug
+
+virttest-159:
+  vt_reference:
+  - cpu_device_hotpluggable
+  vt_type: qemu
+  vt_guest_os: Guest.Linux.openEuler.20.09
+  vt_no_filter: hotunplug, with_migrate
+
+virttest-160:
+  vt_reference:
+  - cpu_device_hotplug_maximum
+  vt_type: qemu
+  vt_guest_os: Guest.Linux.openEuler.20.09
+
+virttest-161:
+  vt_reference:
+  - virsh.setvcpus
+  vt_type: libvirt
+  vt_guest_os: Guest.Linux.openEuler.20.09
+  vt_no_filter: option_maxmum_config,update_max,option_maximum_config,remote,no_acpi
+
+virttest-162:
+  vt_reference:
+  - libvirt_bench.vcpu_hotplug
+  vt_type: libvirt
+  vt_guest_os: Guest.Linux.openEuler.20.09
+  vt_no_filter: monitor_add,monitor_del
+
+virttest-163:
+  vt_reference:
+  - vcpu_hotpluggable
+  vt_type: libvirt
+  vt_guest_os: Guest.Linux.openEuler.20.09
+  vt_no_filter: unplug.live
+
+virttest-164:
+  vt_reference:
+  - cpu.setvcpu
+  vt_type: libvirt
+  vt_guest_os: Guest.Linux.openEuler.20.09
+
+virttest-165:
+  vt_reference:
+  - iface_network.net_pxe
+  vt_type: libvirt
+
+virttest-166:
+  vt_reference:
+  - virsh.boot
+  vt_name: virsh.boot.cdrom
+  vt_type: libvirt
+  vt_no_filter: by_ovmf
+  vt_only_filter: cdrom
+
+virttest-167:
+  vt_reference:
+  - migrate.default
+  vt_name: migrate.default.open2now
+  suffix: .open2now
+  vt_type: qemu
+  vt_machine_type: arm64-pci
+  vt_no_filter: with_filter_off
+  no_filter: rdma
+  vt_qemu_bin: /Images/virt-test/virt-test/qemu-kvm-aarch64
+  vt_extra_params: machine_type=arm64-pci:virt-4.0
+
+virttest-168:
+  vt_reference:
+  - migrate.default
+  vt_name: migrate.default.now2open
+  suffix: .now2open
+  vt_type: qemu
+  vt_machine_type: arm64-pci
+  vt_no_filter: with_filter_off
+  no_filter: rdma
+  vt_qemu_dst_bin: /Images/virt-test/virt-test/qemu-kvm-aarch64
+  vt_extra_params: machine_type=arm64-pci:virt-4.0
+
+virttest-169:
+  vt_reference:
+  - migrate.default
+  vt_name: migrate.default.open2now
+  suffix: .open2now
+  vt_type: qemu
+  vt_machine_type: q35
+  vt_no_filter: with_filter_off
+  no_filter: rdma
+  vt_qemu_bin: /Images/virt-test/virt-test/qemu-kvm-x86_64
+
+virttest-170:
+  vt_reference:
+  - migrate.default
+  vt_name: migrate.default.now2open
+  suffix: .now2open
+  vt_type: qemu
+  vt_machine_type: q35
+  vt_no_filter: with_filter_off
+  no_filter: rdma
+  vt_qemu_dst_bin: /Images/virt-test/virt-test/qemu-kvm-x86_64
+
+virttest-171:
+  vt_reference:
+  - pmu_nmi_watchdog
+  vt_type: qemu
+  vt_guest_os: Guest.Linux.openEuler.20.09
+
+virttest-172:
+  vt_reference:
+  - cpu_custom
+  vt_type: qemu
diff --git a/jobs/virttest_st_2hosts.yaml b/jobs/virttest_st_2hosts.yaml
new file mode 100644
index 0000000..9f40146
--- /dev/null
+++ b/jobs/virttest_st_2hosts.yaml
@@ -0,0 +1,52 @@
+suite: virttest
+testcase: virttest
+category: functional
+
+image_server: http://172.168.131.2:11300
+env_type: 2hosts
+
+if role server:
+  virttest-22:
+    vt_reference:
+    - virsh.start
+    vt_name: virsh_remote_start
+    vt_type: libvirt
+    vt_only_filter: remote_start
+    vt_env_type: 2hosts
+  
+  virttest-95:
+    vt_reference:
+    - virsh.migrate
+    vt_type: libvirt
+    vt_no_filter: with_cpu_hotplug,with_mem_hotplug,preferred_memory_mode,from_kunpeng,with_HP,with_HP_pin,with_HP_only
+    vt_env_type: 2hosts
+  
+  virttest-96:
+    vt_reference:
+    - virsh.migrate
+    vt_name: virsh.migrate_from_kunpeng
+    vt_type: libvirt
+    vt_no_filter: with_cpu_hotplug,with_mem_hotplug,preferred_memory_mode
+    vt_only_filter: from_kunpeng,with_HP,with_HP_pin,with_HP_only
+    vt_env_type: 2kunpeng
+  
+  virttest-97:
+    vt_reference:
+    - virsh.migrate_options_shared
+    vt_type: libvirt
+    vt_no_filter: set_minus,with_postcopy,set_max,tunnelled_migration
+    vt_only_filter: multifd
+    vt_env_type: 2hosts
+  
+  virttest-150:
+    vt_reference:
+    - virsh.domjobabort
+    vt_name: virsh.domjobabort.migrate
+    vt_type: libvirt
+    vt_only_filter: migrate_option
+    vt_env_type: 2hosts
+
+if role client:
+  virttest-00:
+    vt_reference:
+    - remote_deploy
-- 
Gitee


From ba7ba0763fcedcbaede2806d2400993a99dff862 Mon Sep 17 00:00:00 2001
From: Ke Zhiming <kezhiming@huawei.com>
Date: Mon, 7 Dec 2020 16:27:17 +0800
Subject: [PATCH 08/10] jobs/tests: add for openeuler_qemu test

Add jobs.yaml and testcase for  qemu

Signed-off-by: Ke Zhiming <kezhiming@huawei.com>
---
 jobs/openeuler_qemu.yaml |   7 ++
 tests/openeuler_qemu     | 138 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+)
 create mode 100644 jobs/openeuler_qemu.yaml
 create mode 100755 tests/openeuler_qemu

diff --git a/jobs/openeuler_qemu.yaml b/jobs/openeuler_qemu.yaml
new file mode 100644
index 0000000..3f90702
--- /dev/null
+++ b/jobs/openeuler_qemu.yaml
@@ -0,0 +1,7 @@
+suite: openeuler_qemu
+category: functional
+
+openEuler_qemu:
+        repo_name: qemu
+        repo_url: https://gitee.com/openeuler/qemu.git
+        repo_branch: master
diff --git a/tests/openeuler_qemu b/tests/openeuler_qemu
new file mode 100755
index 0000000..b1f53fc
--- /dev/null
+++ b/tests/openeuler_qemu
@@ -0,0 +1,138 @@
+#!/bin/bash
+# - repo_name
+# - repo_url
+# - repo_branch
+
+. $LKP_SRC/lib/debug.sh
+. $LKP_SRC/lib/env.sh
+. $LKP_SRC/lib/upload.sh
+
+[ -n "$repo_name" ] || die "repo_name is empty"
+[ -n "$repo_url" ] || die "repo_url is empty"
+[ -n "$repo_branch" ] || die "repo_branch is empty"
+
+depends_install() {
+    mkdir ./qemu_depends/
+    sudo yum install -y \
+        gcc \
+        git \
+        make \
+        bison \
+        brlapi-devel \
+        bzip2-devel \
+        chrpath \
+        cyrus-sasl-devel \
+        device-mapper-multipath-devel \
+        flex \
+        gettext \
+        gnutls-devel \
+        gtk3-devel \
+        kernel \
+        libaio-devel \
+        libattr-devel \
+        libcap-devel \
+        libcap-ng-devel \
+        libcurl-devel \
+        libepoxy-devel \
+        libfdt-devel \
+        libiscsi-devel \
+        libjpeg-devel \
+        libpng-devel \
+        librbd-devel \
+        libseccomp-devel \
+        libtasn1-devel \
+        libudev-devel \
+        libusbx-devel \
+        libxml2-devel \
+        lzo-devel \
+        ncurses-devel \
+        numactl-devel \
+        pam-devel \
+        perl-Test-Harness \
+        perl-podlators \
+        pixman-devel \
+        python-sphinx \
+        python3-devel \
+        rdma-core-devel \
+        snappy-devel \
+        systemd-devel \
+        texinfo \
+        usbredir-devel \
+        virglrenderer-devel \
+        zlib-devel \
+        --downloadonly --downloaddir=./qemu_depends
+    sudo rpm -ivh --force --nodeps ./qemu_depends/*.rpm
+}
+
+build() {
+    git clone $repo_url
+    cd $repo_name
+    git checkout -f $branch
+    git submodule update --init ui/keycodemapdb
+
+    if [ "$arch" = "aarch64" ]; then 
+        mkdir aarch64-openEuler-linux-gnu
+        cd aarch64-openEuler-linux-gnu
+        target_list="--target-list=aarch64-softmmu"
+    else
+        mkdir x86_64-openEuler-linux-gnu
+        cd x86_64-openEuler-linux-gnu
+        target_list="--target-list=x86_64-softmmu" 
+    fi
+
+    if grep -qw -- "--disable-bluez" ../configure; then
+        disable_bluez="--disable-bluez"
+    else
+        disable_bluez=""
+    fi
+
+    ../configure \
+        --prefix=/usr \
+        ${target_list} \
+        '--extra-cflags=-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/openEuler/openEuler-hardened-cc1 -fasynchronous-unwind-tables -fstack-clash-protection -fPIE -DPIE -fPIC' \
+        '--extra-ldflags=-Wl,--build-id -pie -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack' \
+        --datadir=/usr/share \
+        --docdir=/usr/share/doc/qemu \
+        --libdir=/usr/lib64 \
+        --libexecdir=/usr/libexec \
+        --localstatedir=/var \
+        --sysconfdir=/etc \
+        --interp-prefix=/usr/qemu-%M \
+        --firmwarepath=/usr/share/qemu \
+        --with-pkgversion=qemu-4.1.0-17.oe1 \
+        --python=/usr/bin/python3 \
+        --disable-strip \
+        --disable-slirp \
+        --enable-gtk \
+        --enable-docs \
+        --enable-guest-agent \
+        --enable-pie \
+        --enable-numa \
+        --enable-mpath \
+        --disable-libnfs \
+        --disable-bzip2 \
+        --enable-kvm \
+        --enable-linux-aio \
+        --enable-cap-ng \
+        --enable-vhost-user \
+        --enable-fdt \
+        --enable-virglrenderer \
+        --enable-libusb \
+        ${disable_bluez} \
+        --disable-dmg \
+        --disable-qcow1 \
+        --disable-vdi \
+        --disable-vvfat \
+        --disable-qed \
+        --disable-parallels \
+        --disable-sheepdog \
+        --disable-capstone \
+        --disable-smartcard \
+        || (cat config.log; exit 1)
+
+    make -j $(getconf _NPROCESSORS_ONLN) VL_LDFLAGS=-Wl,--build-id V=1
+    make check V=1
+}
+
+depends_install
+build
-- 
Gitee


From c296676f89d3b8740ed507ca9491e49fb52139aa Mon Sep 17 00:00:00 2001
From: Ke Zhiming <kezhiming@huawei.com>
Date: Mon, 7 Dec 2020 16:28:55 +0800
Subject: [PATCH 09/10] jobs/tests: add for openeuler_libvirt test

Add jobs.yaml and testcase for libvirt

Signed-off-by: Ke Zhiming <kezhiming@huawei.com>
---
 jobs/openeuler_libvirt.yaml |   7 ++
 tests/openeuler_libvirt     | 197 ++++++++++++++++++++++++++++++++++++
 2 files changed, 204 insertions(+)
 create mode 100644 jobs/openeuler_libvirt.yaml
 create mode 100755 tests/openeuler_libvirt

diff --git a/jobs/openeuler_libvirt.yaml b/jobs/openeuler_libvirt.yaml
new file mode 100644
index 0000000..ac797fd
--- /dev/null
+++ b/jobs/openeuler_libvirt.yaml
@@ -0,0 +1,7 @@
+suite: openeuler_libvirt
+category: functional
+
+openEuler_libvirt:
+        repo_name: libvirt
+        repo_url: https://gitee.com/openeuler/libvirt.git
+        repo_branch: master
diff --git a/tests/openeuler_libvirt b/tests/openeuler_libvirt
new file mode 100755
index 0000000..73daac5
--- /dev/null
+++ b/tests/openeuler_libvirt
@@ -0,0 +1,197 @@
+#!/bin/bash
+# - repo_name
+# - repo_url
+# - repo_branch
+
+. $LKP_SRC/lib/debug.sh
+. $LKP_SRC/lib/env.sh
+. $LKP_SRC/lib/upload.sh
+
+[ -n "$repo_name" ] || die "repo_name is empty"
+[ -n "$repo_url" ] || die "repo_url is empty"
+[ -n "$repo_branch" ] || die "repo_branch is empty"
+
+depends_install() {
+    mkdir ./libvirt_depends/        
+    sudo yum install -y \
+        gdb \
+        make \
+        audit-libs-devel \
+        augeas \
+        autoconf \
+        automake \
+        bash-completion \
+        cyrus-sasl-devel \
+        dbus-devel \
+        device-mapper-devel \
+        dnsmasq \
+        ebtables \
+        firewalld-filesystem \
+        gawk \
+        gcc \
+        gettext \
+        gettext-devel \
+        git \
+        glib2-devel \
+        glusterfs-api-devel \
+        glusterfs-devel \
+        gnutls-devel \
+        iptables \
+        iscsi-initiator-utils \
+        libacl-devel \
+        libattr-devel \
+        libblkid-devel \
+        libcap-ng-devel \
+        libiscsi-devel \
+        libnl3-devel \
+        libpcap-devel \
+        libpciaccess-devel \
+        librados-devel \
+        librbd-devel \
+        libselinux-devel \
+        libssh-devel \
+        libssh2-devel \
+        libtasn1-devel \
+        libtirpc-devel \
+        libtool \
+        libxml2-devel \
+        libxslt \
+        lvm2 \
+        module-init-tools \
+        ncurses-devel \
+        netcf-devel \
+        nfs-utils \
+        numactl-devel \
+        numad \
+        parted-devel \
+        perl-interpreter \
+        polkit \
+        python3 \
+        python3-docutils \
+        qemu-img \
+        radvd \
+        readline-devel \
+        rpcgen \
+        sanlock-devel \
+        scrub \
+        systemd-devel \
+        systemd-units \
+        systemtap-sdt-devel \
+        util-linux \
+        wireshark-devel \
+        xfsprogs-devel \
+        yajl-devel \
+        --downloadonly --downloaddir=./libvirt_depends --allowerasing --skip-broken --nobest
+    sudo rpm -ivh --force --nodeps ./libvirt_depends/*.rpm
+}
+
+build() {
+    git clone $repo_url
+    cd $repo_name
+    git checkout -f $branch
+    git submodule update --init 
+    autoreconf --verbose --force --install
+
+    if [ "$arch" = "aarch64" ]; then 
+        mkdir aarch64-openEuler-linux-gnu
+        cd aarch64-openEuler-linux-gnu
+        build_conf="--build=aarch64-openEuler-linux-gnu"
+        host_conf="--host=aarch64-openEuler-linux-gnu"
+    else
+        mkdir x86_64-openEuler-linux-gnu
+        cd x86_64-openEuler-linux-gnu
+        build_conf="--build=x86_64-openEuler-linux-gnu"
+        host_conf="--host=x86_64-openEuler-linux-gnu"
+    fi
+
+    ../configure \
+        ${build_conf} \
+        ${host_conf} \
+        --program-prefix= \
+        --disable-dependency-tracking \
+        --prefix=/usr \
+        --exec-prefix=/usr \
+        --bindir=/usr/bin \
+        --sbindir=/usr/sbin \
+        --sysconfdir=/etc \
+        --datadir=/usr/share \
+        --includedir=/usr/include \
+        --libdir=/usr/lib64 \
+        --libexecdir=/usr/libexec \
+        --localstatedir=/var \
+        --sharedstatedir=/var/lib \
+        --mandir=/usr/share/man \
+        --infodir=/usr/share/info \
+        --enable-dependency-tracking \
+        --with-runstatedir=/run \
+        --with-qemu \
+        --without-openvz \
+        --without-lxc \
+        --without-vbox \
+        --without-libxl \
+        --with-sasl \
+        --with-polkit \
+        --with-libvirtd \
+        --without-esx \
+        --without-hyperv \
+        --without-vmware \
+        --without-vz \
+        --without-bhyve \
+        --with-remote-default-mode=legacy \
+        --with-interface \
+        --with-network \
+        --with-storage-fs \
+        --with-storage-lvm \
+        --with-storage-iscsi \
+        --with-storage-iscsi-direct \
+        --with-storage-scsi \
+        --with-storage-disk \
+        --with-storage-mpath \
+        --with-storage-rbd \
+        --without-storage-sheepdog \
+        --with-storage-gluster \
+        --without-storage-zfs \
+        --without-storage-vstorage \
+        --with-numactl \
+        --with-numad \
+        --with-capng \
+        --without-fuse \
+        --with-netcf \
+        --with-selinux \
+        --with-selinux-mount=/sys/fs/selinux \
+        --without-apparmor \
+        --without-hal \
+        --with-udev \
+        --with-yajl \
+        --with-sanlock \
+        --with-libpcap \
+        --with-macvtap \
+        --with-audit \
+        --with-dtrace \
+        --with-driver-modules \
+        --with-firewalld \
+        --with-firewalld-zone \
+        --with-wireshark-dissector \
+        --without-pm-utils \
+        --with-nss-plugin \
+        '--with-packager=http://openeuler.org, 2020-08-20-11:11:11, ' \
+        --with-packager-version=7.oe1 \
+        --with-qemu-user=qemu \
+        --with-qemu-group=qemu \
+        --with-tls-priority=@LIBVIRT,SYSTEM \
+        --with-loader-nvram=/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd:/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd:/user/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw:/usr/shar/edk2.git/arm/QEMU_EFI-pflash.raw:/usr/share/edk2.git/arm/vars-template-pflash.raw:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd:/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd:/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw:/usr/share/edk2/arm/QEMU_EFI-pflash.raw:/usr/share/edk2/arm/vars-template-pflash.raw \
+        --enable-werror \
+        --enable-expensive-tests \
+        --with-init-script=systemd \
+        --without-login-shell \
+        || (cat config.log; exit 1)
+
+    make -j$(getconf _NPROCESSORS_ONLN) V=1
+    sed -i 's/while (kill(pid, 0) != -1)/for (int i = 0; kill(pid, 0) != -1 \&\& i < 300; i++)/' ../tests/commandtest.c
+    sed -i 's/while (kill(pid, SIGINT) != -1)/for (int i = 0; kill(pid, SIGINT) != -1 \&\& i < 300; i++)/' ../tests/commandtest.c
+    (set +x; for((i=0;i<3;i++)); do sleep 30; ps -fC make &>/dev/null ||break; ps ww -e f; ps ww -ef |awk '$9~"tests/.libs/lt-commandtest"{print$2}' |xargs -n 1 pstack; done) &
+    timeout 120 make -j$(getconf _NPROCESSORS_ONLN) check VIR_TEST_DEBUG=1 || (cat tests/test-suite.log; exit 1)
+}
+
+depends_install
+build
-- 
Gitee


From 7776ba6704f6dad21e74dc8fc2f528884c25abad Mon Sep 17 00:00:00 2001
From: Ke Zhiming <kezhiming@huawei.com>
Date: Mon, 7 Dec 2020 16:52:57 +0800
Subject: [PATCH 10/10] virttest: bugfix and adapt to 2hosts

1. Script format correction
2. Download the image and save it to the disk fs
3. Livirt/qemu.conf configure user/group as root
4. Bugfix of avocado log_path
5. Remove exit to ensure multiple testcases execution
6. Vt_guest_os set for x86_64
7. Default value of vt_guest_os
8. Config bash prompt for 2hosts
9. Config dns and service unmask for minimal os
10. Config virttest for 2hosts

Signed-off-by: Ke Zhiming <kezhiming@huawei.com>
---
 tests/virttest | 349 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 239 insertions(+), 110 deletions(-)

diff --git a/tests/virttest b/tests/virttest
index e1a98c8..65556ed 100755
--- a/tests/virttest
+++ b/tests/virttest
@@ -19,128 +19,253 @@
 . $LKP_SRC/lib/env.sh
 . $LKP_SRC/lib/upload.sh
 
+images_aarch64=("openEuler-20.03-aarch64.qcow2" "openEuler-20.09-aarch64.qcow2")
+images_x86_64=("openEuler-20.03-x86_64.qcow2" "openEuler-20.09-x86_64.qcow2")
+file_server="${image_server}/initrd/qemu-image"
+images_path="/var/lib/avocado/data/avocado-vt/images/"
+
 set_up() {
-	iptables -F
-
-	if ! brctl show virbr0 > /dev/null; then
-		log_cmd systemctl restart libvirtd
-	fi
-	ps -fC qemu-img | grep qemu-img && log_cmd killall -9 qemu-img
-	log_cmd targetcli clearconfig confirm=True
-
-	# virttest qemu path
-	if ! ls /usr/bin/qemu-kvm > /dev/null; then
-		# upstream qemu path
-		if [ -e /usr/libexec/qemu-kvm ]; then
-			log_cmd ln -s /usr/libexec/qemu-kvm /usr/bin/qemu-kvm
-		fi
-	fi
-
-	if [ "$vt_type" = "libvirt" ]; then
-		local vt_xml=$LKP_SRC/virttest/avocado-vt-vm1-$os_arch.xml
-		if [ "$os_arch" = "aarch64" ]; then
-			case "$vt_guest_os" in
-				*openEuler.20.03) log_cmd sed -i "s/[^/]*\.qcow2/openEuler-20.03-aarch64.qcow2/" $vt_xml ;;
-				*               ) log_cmd sed -i "s/[^/]*\.qcow2/f28-aarch64.qcow2/"             $vt_xml ;;
-			esac
-
-			# upstream edk2 path
-			if [ ! -e /usr/share/edk2/aarch64/QEMU_EFI-pflash.raw ]; then
-				# Fedora/CentOS/Redhat edk (aavmf) path
-				if [ -e /usr/share/AAVMF/AAVMF_CODE.fd ]; then
-					log_cmd sed -i "s|/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw|/usr/share/AAVMF/AAVMF_CODE.fd|" $vt_xml
-				fi
-			fi
-		fi
-		log_cmd virsh define $vt_xml
-	fi
+    iptables -F
+
+    if ! brctl show virbr0 > /dev/null; then
+        log_cmd systemctl restart libvirtd ||systemctl unmask libvirtd && systemctl restart libvirtd
+    fi
+    ps -fC qemu-img | grep qemu-img && log_cmd killall -9 qemu-img
+    log_cmd targetcli clearconfig confirm=True
+
+    # virttest qemu path
+    if ! ls /usr/bin/qemu-kvm > /dev/null; then
+        # upstream qemu path
+        if [ -e /usr/libexec/qemu-kvm ]; then
+            log_cmd ln -s /usr/libexec/qemu-kvm /usr/bin/qemu-kvm
+        fi
+    fi
+
+    if [ "$vt_type" = "libvirt" ]; then
+        local vt_xml=$LKP_SRC/virttest/avocado-vt-vm1-$arch.xml
+        if [ "$arch" = "aarch64" ]; then
+            case "$vt_guest_os" in
+                *openEuler.20.03) log_cmd sed -i "s/[^/]*\.qcow2/openEuler-20.03-aarch64.qcow2/" $vt_xml ;;
+                *openEuler.20.09) log_cmd sed -i "s/[^/]*\.qcow2/openEuler-20.09-aarch64.qcow2/" $vt_xml ;;
+                *               ) log_cmd sed -i "s/[^/]*\.qcow2/openEuler-20.03-aarch64.qcow2/" $vt_xml ;;
+            esac
+
+            # upstream edk2 path
+            if [ ! -e /usr/share/edk2/aarch64/QEMU_EFI-pflash.raw ]; then
+                # Fedora/CentOS/Redhat edk (aavmf) path
+                if [ -e /usr/share/AAVMF/AAVMF_CODE.fd ]; then
+                    log_cmd sed -i "s|/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw|/usr/share/AAVMF/AAVMF_CODE.fd|" $vt_xml
+                fi
+            fi
+        fi
+        if [ "$arch" = "x86_64" ]; then
+            case "$vt_guest_os" in
+                *openEuler.20.03) log_cmd sed -i "s/[^/]*\.qcow2/openEuler-20.03-x86_64.qcow2/" $vt_xml ;;
+                *openEuler.20.09) log_cmd sed -i "s/[^/]*\.qcow2/openEuler-20.09-x86_64.qcow2/" $vt_xml ;;
+                *               ) log_cmd sed -i "s/[^/]*\.qcow2/openEuler-20.03-x86_64.qcow2/" $vt_xml ;;
+            esac
+        fi
+        log_cmd virsh define $vt_xml
+    fi
 }
 
 tear_down() {
-	local errno=$1
-
-	# collect aexpect (eg: serial console) logs
-	ls -d /tmp/aexpect_* | while read aexpect; do
-		case "$(awk '$5=="command:"{print;exit}' $aexpect/server-log | sed "s/^.*command: *//")" in
-			ssh*          ) aexpect_errno=$errno; command=ssh i   ;;
-			scp*          ) aexpect_errno=$errno; command=scp     ;;
-			tshark*       ) aexpect_errno=0     ; command=tshark  ;;
-			tcpdump*      ) aexpect_errno=0     ; command=tcpdump ;;
-			virsh*console*) aexpect_errno=x     ; command=console ;;
-			*             ) aexpect_errno=0     ; command=others  ;;
-		esac
-		if [ "$errno" = "$aexpect_errno" ]; then
-			rm -rf "$aexpect"
-			continue
-		fi
-		date=$(ls -lrt --full-time "$aexpect" | awk 'NF>=9{print$6,$7,$8;exit}' | sed 's/^\(.\{19\}\).*$/\1/;s/[:-]//g;s/ /-/g')
-		ls "$aexpect" | while read file; do
-			if [ ! -s "$aexpect/$file" ]; then
-				rm -rf "$aexpect/$file"
-			fi
-		done
-		if ! mv "$aexpect" "$logs_dir/latest/sysinfo/post/aexpect-$command-$date-${aexpect##*_}"; then
-			rm -rf "$aexpect"
-		fi
-	done
-
-	if [ "$errno" != "0" ]; then
-		ps -fC qemu-img qemu-kvm aexpect-helper && killall qemu-img qemu-kvm aexpect-helper
-		local pids=$(ps -ef | awk '$8!="awk"&&/avocado.*run/{print$2}')
-		sleep 1
-		killall -9 qemu-img qemu-kvm aexpect-helper
-		[ -n "$pids" ] && kill -9 $pids
-
-		ps aux > "$logs_dir/latest/sysinfo/post/ps_aux"
-		ps -e f > "$logs_dir/latest/sysinfo/post/ps-e_f"
-		rpm -qa | sort > "$logs_dir/latest/sysinfo/post/rpm-qa"
-		tail -n 2048 /var/log/messages > "$logs_dir/latest/sysinfo/post/tail_n_2048_var_log_messages"
-		tar -zcvf "$logs_dir/latest/sysinfo/post/var_log_libvirt.tar.gz" /var/log/libvirt
-	fi
-
-	if [ "$vt_type" = "libvirt" ]; then
-		virsh list --all | awk '/shut off$/{print$2}' | while read vm; do
-			if ! log_cmd virsh undefine $vm --nvram; then
-				log_cmd virsh undefine $vm
-			fi
-		done
-	fi
-
-	return $errno
+    local errno=$1
+
+    # collect aexpect (eg: serial console) logs
+    ls -d /tmp/aexpect_* | while read aexpect; do
+        case "$(awk '$5=="command:"{print;exit}' $aexpect/server-log | sed "s/^.*command: *//")" in
+            ssh*          ) aexpect_errno=$errno; command=ssh     ;;
+            scp*          ) aexpect_errno=$errno; command=scp     ;;
+            tshark*       ) aexpect_errno=0     ; command=tshark  ;;
+            tcpdump*      ) aexpect_errno=0     ; command=tcpdump ;;
+            virsh*console*) aexpect_errno=x     ; command=console ;;
+            *             ) aexpect_errno=0     ; command=others  ;;
+        esac
+        if [ "$errno" = "$aexpect_errno" ]; then
+            rm -rf "$aexpect"
+            continue
+        fi
+        date=$(ls -lrt --full-time "$aexpect" | awk 'NF>=9{print$6,$7,$8;exit}' | sed 's/^\(.\{19\}\).*$/\1/;s/[:-]//g;s/ /-/g')
+        ls "$aexpect" | while read file; do
+            if [ ! -s "$aexpect/$file" ]; then
+                rm -rf "$aexpect/$file"
+            fi
+        done
+        if ! mv "$aexpect" "$logs_dir/latest/sysinfo/post/aexpect-$command-$date-${aexpect##*_}"; then
+            rm -rf "$aexpect"
+        fi
+    done
+
+    if [ "$errno" != "0" ]; then
+        ps -fC qemu-img qemu-kvm aexpect-helper && killall qemu-img qemu-kvm aexpect-helper
+        local pids=$(ps -ef | awk '$8!="awk"&&/avocado.*run/{print$2}')
+        sleep 1
+        killall -9 qemu-img qemu-kvm aexpect-helper
+        [ -n "$pids" ] && kill -9 $pids
+
+        ps aux > "$logs_dir/latest/sysinfo/post/ps_aux"
+        ps -e f > "$logs_dir/latest/sysinfo/post/ps-e_f"
+        rpm -qa | sort > "$logs_dir/latest/sysinfo/post/rpm-qa"
+        tail -n 2048 /var/log/messages > "$logs_dir/latest/sysinfo/post/tail_n_2048_var_log_messages"
+        tar -zcvf "$logs_dir/latest/sysinfo/post/var_log_libvirt.tar.gz" /var/log/libvirt
+    fi
+
+    if [ "$vt_type" = "libvirt" ]; then
+        virsh list --all | awk '/shut off$/{print$2}' | while read vm; do
+            if ! log_cmd virsh undefine $vm --nvram; then
+                log_cmd virsh undefine $vm
+            fi
+        done
+    fi
+
+    return $errno
+}
+
+images_download() {
+    if [ "$arch" = "aarch64" ];then
+            images=${images_aarch64[@]}
+    else
+            images=${images_x86_64[@]}
+    fi
+
+    for image in ${images[@]};do
+            if [ ! -f $images_path/$image.succ ]; then
+                wget $file_server/$image -O $images_path/$image
+                wget $file_server/$image.succ -O $images_path/$image.succ
+            else
+                wget $file_server/$image.succ -O $images_path/tmp.succ
+                diff $images_path/tmp.succ $images_path/$image.succ
+                if [ $? -ne 0 ]; then
+                    wget $file_server/$image -O $images_path/$image
+                    wget $file_server/$image.succ -O $images_path/$image.succ
+                fi
+            fi
+    done
 }
 
 run_test() {
-	(
-	set_up
-	# used to collect aexpect (eg: serial console) logs
-	export AEXPECT_DEBUG=on
-	log_cmd "$@"
-	tear_down $?
-	return $?
-	)
+    (
+    set_up
+    # used to collect aexpect (eg: serial console) logs
+    export AEXPECT_DEBUG=on
+    log_cmd "$@"
+    tear_down $?
+    return $?
+    )
+}
+
+libvirt_base_cfg=/var/lib/avocado/data/avocado-vt/backends/libvirt/cfg/base.cfg
+config_virttest() {
+    local_ip=$1
+    remote_ip=$2
+    local_pwd=$3
+    local_dir=$images_path
+    remote_dir=/Images/virt-test/remote_dir
+    export_options="rw,sync,no_root_squash"
+    mkdir -p $remote_dir
+
+    cp -a $libvirt_base_cfg $libvirt_base_cfg.bak_by_CI
+
+    [ -f /root/.ssh/id_rsa ] && log_cmd rm -rf /root/.ssh/id_rsa*
+    
+    sed -i "/^# storage_type=/i firewall_to_permit_nfs = no" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i storage_type = nfs" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i setup_remote_nfs = yes" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i setup_local_nfs = yes" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i nfs_server_ip = \"$local_ip\"" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i server_ip = \"$local_ip\"" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i client_ip = \"$remote_ip\"" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i nfs_client_ip = \"$remote_ip\"" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i nfs_server_pwd = \"$local_pwd\"" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i nfs_client_pwd = \"$local_pwd\"" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i nfs_mount_dir = \"$remote_dir\"" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i nfs_mount_src = \"$local_dir\"" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i export_options = \"$export_options\"" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i export_dir = \"$local_dir\"" $libvirt_base_cfg
+    sed -i "/^# storage_type =/i remote_nfs_mount = yes" $libvirt_base_cfg
+
+    sed -i "/^local_ip =/c local_ip = \"$local_ip\"" $libvirt_base_cfg
+    sed -i "/^local_pwd =/c local_pwd = \"$local_pwd\"" $libvirt_base_cfg
+    sed -i "/^remote_ip =/c remote_ip = \"$remote_ip\"" $libvirt_base_cfg
+    sed -i "/^migrateion_setup =/c migration_setup = \"yes\"" $libvirt_base_cfg
+
+    sed -i 's/^migrate_source_host = ENTER.YOUR.SOURCE.EXAMPLE.COM/# &/' $libvirt_base_cfg
+    sed -i 's/^migrate_source_pwd = PASSWORD.SOURCE.EXAMPLE/# &/' $libvirt_base_cfg
+    sed -i 's/^# \(migrate_source_host = "${local_ip}"\)/\1/' $libvirt_base_cfg
+    sed -i 's/^# \(migrate_source_pwd = "${local_pwd}"\)/\1/' $libvirt_base_cfg
+
+    sed -i 's/^migrate_dest_host = ENTER.YOUR.DEST.EXAMPLE.COM/# &/' $libvirt_base_cfg
+    sed -i 's/^migrate_dest_pwd = PASSWORD.DEST.EXAMPLE/# &/' $libvirt_base_cfg
+    sed -i 's/^# \(migrate_dest_host = "${remote_ip}"\)/\1/' $libvirt_base_cfg
+    sed -i 's/^# \(migrate_dest_pwd = "${remote_pwd}"\)/\1/' $libvirt_base_cfg
 }
 
+# config bash prompt. The shell prompt that indicates a successfull login 
+bash_prompt="/root/.shell/bash_prompt"
+if [ -f $bash_prompt -a ! -e $bash_prompt.bak_by_CI ]; then
+    cp -a $bash_prompt $bash_prompt.bak_by_CI
+    sed -i '/^PS1=/c PS1=\"[\\u@\\h \\W]# \"' $bash_prompt
+    source  $bash_prompt
+fi
+
+# config umask
+if [ ! -e /etc/bashrc.bak_by_CI ]; then
+    cp -a /etc/bashrc /etc/bashrc.bak_by_CI
+    sed -i '/^umask /c umask 0022' /etc/bashrc
+
+    # service unmask
+    log_cmd systemctl restart nfs ||systemctl unmask network.target
+    log_cmd systemctl restart libvirtd ||systemctl unmask libvirtd && systemctl restart libvirtd
+
+    # config dns
+    [ -z "$dns_address" ] || echo "nameserver $dns_address" >> /etc/resolv.conf
+
+fi
+
+# config qemu
+if [ ! -e /etc/libvirt/qemu.conf.bak_by_CI ];then
+    on
+    sed -i 's/^#user/user/;s/^#group/group/' /etc/libvirt/qemu.conf
+fi
+
+# avocado-vt requirements check
+pip3 list | grep simplejson || pip3 install simplejson
+pip3 list | grep psutil || pip3 install psutil
+pip3 list | grep netifaces || pip3 install netifaces
+
+if [ $vt_reference == "remote_deploy" ]; then
+        exit
+fi
+
+# config virttest for 2hosts
+pwd=${node_pwd:-Helloman@12#$}
+[ -z  "$env_type" ] || env_type = ""
+if [ x$env_type == x"2hosts" -a ! -e $libvirt_base_cfg.bak_by_CI ];then
+    config_virttest $server $client $pwd
+fi
+
 conf_file=$(find /usr/local/lib/ -name "avocado.conf")
 [ -e "$conf_file" ] || die "Missing config file avocado.conf"
 
-logs_dir=$(awk -F= '/logs_dir/{print$2}' "$conf_file" | xargs | sed "s/^~/|$(cd ~; pwd)/|")
+logs_dir=$(awk -F= '/logs_dir/{print$2}' "$conf_file" | xargs | sed "s#^~#$(cd ~; pwd)#")
 [ -z "$logs_dir" ] && die "Not found logs_dir in avocado.conf"
 
-if [ "$os_arch" = "aarch64" ]; then
-	[ "$vt_machine_type" = "q35" ] && die "$os_arch vt_machine_type=$vt_machine_type"
+if [ "$arch" = "aarch64" ]; then
+    [ "$vt_machine_type" = "q35" ] && die "$arch vt_machine_type=$vt_machine_type"
 else
-	[ "$vt_machine_type" = "arm64-pci" ] && die "$os_arch vt_machine_type=$vt_machine_type"
+    [ "$vt_machine_type" = "arm64-pci" ] && die "$arch vt_machine_type=$vt_machine_type"
 fi
 
 [ -z "$vt_name" ] && vt_name=$vt_reference
 [ -z "$vt_type" ] && vt_type="libvirt"
-[ -z "$vt_guest_os" ] && vt_guest_os="Guest.Linux.Fedora.28"
+[ -z "$vt_guest_os" ] && vt_guest_os="Guest.Linux.openEuler.20.03"
 [ -z "$vt_machine_type" ] &&
-	if [ "$os_arch" = "aarch64" ]; then
-		vt_machine_type="arm64-pci"
-	else
-		vt_machine_type="q35"
-	fi
+    if [ "$arch" = "aarch64" ]; then
+        vt_machine_type="arm64-pci"
+    else
+        vt_machine_type="q35"
+    fi
 [ -z "$job_timeout" ] && job_timeout=600
 
 base_params=(--vt-type "$vt_type")
@@ -156,19 +281,26 @@ vt_tests=$(avocado list "${vt_reference:?}" "${base_params[@]}" "${extra_params[
 
 vt_tests=$(echo "$vt_tests" | awk '{print$2}')
 for _no_filter in $no_filter; do
-	vt_tests=$(echo "$vt_tests" | grep -Ev "$_no_filter") || break
+    vt_tests=$(echo "$vt_tests" | grep -Ev "$_no_filter") || break
 done
 for _only_filter in $only_filter; do
-	vt_tests=$(echo "$vt_tests" | grep -E "$_only_filter") || break
+    vt_tests=$(echo "$vt_tests" | grep -E "$_only_filter") || break
 done
 [ -z "$vt_tests" ] && die "Not found tests: avocado list ${vt_reference:?} ${base_params[@]} ${extra_params[@]}"
 
 ok=0
 all=0
+
+# image file system config
+mount /dev/sdb ${images_path} || echo y | mkfs.ext4 /dev/sdb && mount /dev/sdb ${images_path}
+
+# download images
+images_download
+
 for vt_test in $vt_tests; do
-	run_test avocado run "${vt_test:?}" "${base_params[@]}" --job-timeout "$job_timeout" 2>&1
-	[ $? -eq 0 ] && ((ok++))
-	((all++))
+    run_test avocado run "${vt_test:?}" "${base_params[@]}" --job-timeout "$job_timeout" 2>&1
+    [ $? -eq 0 ] && ((ok++))
+    ((all++))
 done
 
 echo "$vt_name.result.ok: $ok"
@@ -177,6 +309,3 @@ echo "$vt_name.result.rate: $(($ok*100/$all))"
 
 upload_files -t results "${logs_dir:?}/"*
 rm -rf "${logs_dir:?}/"*
-
-[ $ok -eq $all ]
-exit $?
-- 
Gitee