[Xen-devel] [PATCH for-4.12] automation: introduce a QEMU smoke test for PVH Dom0

[Wei Liu <wei.liu2@xxxxxxxxxx>]

Make qemu-smoke-x86-64.sh take a variant argument. Make two new tests
in test.yaml.

Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
Since the new option is going to be release in 4.12, I think it would be
beneficial to have this patch in 4.12 as well. The risk is zero to end users.
---
 automation/gitlab-ci/test.yaml          | 48 +++++++++++++++++++++++++++++++--
 automation/scripts/qemu-smoke-x86-64.sh | 12 +++++++--
 2 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 8bfa0fba5f..b935c2f7b9 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -5,7 +5,7 @@ qemu-smoke-x86-64-gcc:
   variables:
     CONTAINER: debian:stretch
   script:
-    - ./automation/scripts/qemu-smoke-x86-64.sh 2>&1 | tee 
qemu-smoke-x86-64.log
+    - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee 
qemu-smoke-x86-64.log
   artifacts:
     paths:
       - smoke.serial
@@ -27,7 +27,7 @@ qemu-smoke-x86-64-clang:
   variables:
     CONTAINER: debian:stretch
   script:
-    - ./automation/scripts/qemu-smoke-x86-64.sh 2>&1 | tee 
qemu-smoke-x86-64.log
+    - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee 
qemu-smoke-x86-64.log
   artifacts:
     paths:
       - smoke.serial
@@ -41,4 +41,48 @@ qemu-smoke-x86-64-clang:
     - master
     - smoke
     - /^coverity-tested\/.*/
+
+qemu-smoke-x86-64-gcc-pvh:
+  stage: test
+  image: registry.gitlab.com/xen-project/xen/${CONTAINER}
+  variables:
+    CONTAINER: debian:stretch
+  script:
+    - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee 
qemu-smoke-x86-64.log
+  artifacts:
+    paths:
+      - smoke.serial
+      - '*.log'
+    when: always
+  dependencies:
+    - debian-stretch-gcc-debug
+  tags:
+    - x86_64
+  except:
+    - master
+    - smoke
+    - /^coverity-tested\/.*/
+    - /^stable-.*/
+
+qemu-smoke-x86-64-clang-pvh:
+  stage: test
+  image: registry.gitlab.com/xen-project/xen/${CONTAINER}
+  variables:
+    CONTAINER: debian:stretch
+  script:
+    - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee 
qemu-smoke-x86-64.log
+  artifacts:
+    paths:
+      - smoke.serial
+      - '*.log'
+    when: always
+  dependencies:
+    - debian-unstable-clang-debug
+  tags:
+    - x86_64
+  except:
+    - master
+    - smoke
+    - /^coverity-tested\/.*/
+    - /^stable-.*/
     - /^stable-.*/
diff --git a/automation/scripts/qemu-smoke-x86-64.sh 
b/automation/scripts/qemu-smoke-x86-64.sh
index 7dc2c8542b..5fa3a63dbd 100755
--- a/automation/scripts/qemu-smoke-x86-64.sh
+++ b/automation/scripts/qemu-smoke-x86-64.sh
@@ -2,6 +2,9 @@
 
 set -ex
 
+# variant should be either pv or pvh
+variant=$1
+
 # Install QEMU
 export DEBIAN_FRONTENT=noninteractive
 apt-get -qy update
@@ -11,12 +14,17 @@ apt-get -qy install qemu-system-x86
 git clone https://xenbits.xen.org/git-http/xtf.git
 cd xtf && make -j$(nproc) && cd -
 
+case $variant in
+    pvh) k=test-hvm32pae-example extra="dom0-iommu=none dom0=pvh" ;;
+    *)   k=test-pv32pae-example  extra= ;;
+esac
+
 rm -f smoke.serial
 set +e
 timeout -k 1 10 \
 qemu-system-x86_64 -nographic -kernel binaries/xen \
-        -initrd xtf/tests/example/test-pv32pae-example \
-        -append 'loglvl=all com1=115200,,8n1 console=com1 noreboot' \
+        -initrd xtf/tests/example/$k \
+        -append "loglvl=all com1=115200,,8n1 console=com1 noreboot $extra" \
         -m 512 -monitor none -serial file:smoke.serial
 set -e
 grep -q 'Test result: SUCCESS' smoke.serial || exit 1
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel