Skip to contentSkip to conversation

automation: Add C xenstored and stubdom tests

PATCH In review Jason Andryuk 3 participants 3 messages Jun 5

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 automation: Add C xenstored and stubdom tests

Expand testing to include C xenstored and xenstore stubdom tests. OCaml oxenstored is run by default.

---
Pipeline
https://gitlab.com/xen-project/people/jandryuk-amd/xen/-/pipelines/2577925467
C Xenstored job
https://gitlab.com/xen-project/people/jandryuk-amd/xen/-/jobs/14704763517
Stubdom job
https://gitlab.com/xen-project/people/jandryuk-amd/xen/-/jobs/14704763518

 automation/gitlab-ci/test.yaml           | 16 ++++++++++++++++
 automation/scripts/qemu-alpine-x86_64.sh | 20 ++++++++++++++++++++
 2 files changed, 36 insertions(+)
automation/gitlab-ci/test.yaml +16 -0
index 1722800c15..dfe5555154 100644
@@ -656,6 +656,22 @@ qemu-alpine-x86_64-gcc:
     - *x86-64-test-needs
     - alpine-3.18-gcc
 
+qemu-alpine-x86_64-gcc-cxenstored:
+  extends: .qemu-x86-64
+  script:
+    - ./automation/scripts/qemu-alpine-x86_64.sh cxenstored 2>&1 | tee ${LOGFILE}
+  needs:
+    - *x86-64-test-needs
+    - alpine-3.18-gcc
+
+qemu-alpine-x86_64-gcc-xenstore-stubdom:
+  extends: .qemu-x86-64
+  script:
+    - ./automation/scripts/qemu-alpine-x86_64.sh xenstore-stubdom 2>&1 | tee ${LOGFILE}
+  needs:
+    - *x86-64-test-needs
+    - alpine-3.18-gcc
+
 qemu-smoke-x86-64-gcc:
   extends: .qemu-smoke-x86-64
   script:
automation/scripts/qemu-alpine-x86_64.sh +20 -0
index 242ffca693..0105a3b001 100755
@@ -2,6 +2,25 @@
 
 set -ex -o pipefail
 
+test_variant=$1
+
+xenstore_selection=""
+
+case "${test_variant}" in
+    xenstore-stubdom)
+        xenstore_selection='echo "XENSTORETYPE=domain" > /etc/default/xencommons'
+        ;;
+    cxenstored)
+        xenstore_selection='echo "XENSTORED=/usr/sbin/xenstored" > /etc/default/xencommons'
+        ;;
+    "")
+        ;;
+    *)
+        echo "Unrecognised test_variant '${test_variant}'" >&2
+        exit 1
+        ;;
+esac
+
 # DomU Busybox
 cd binaries
 mkdir -p initrd
@@ -49,6 +68,7 @@ echo "#!/bin/bash
 
 set -x
 
+$xenstore_selection
 bash /etc/init.d/xencommons start
 
 xl list
Signature · 1 line
2.54.0