* [PATCH] automation: add a Dom0 PVH test based on Qubes' runner
@ 2023-05-13 1:28 Stefano Stabellini
2023-05-13 1:43 ` Marek Marczykowski-Górecki
0 siblings, 1 reply; 2+ messages in thread
From: Stefano Stabellini @ 2023-05-13 1:28 UTC (permalink / raw)
To: xen-devel; +Cc: marmarek, cardoe, sstabellini, Stefano Stabellini
From: Stefano Stabellini <stefano.stabellini@amd.com>
Straightforward Dom0 PVH test based on the existing basic Smoke test for
the Qubes runner.
Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
---
automation/gitlab-ci/test.yaml | 8 ++++++++
automation/scripts/qubes-x86-64.sh | 14 +++++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 55ca0c27dc..9c0e08d456 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -149,6 +149,14 @@ adl-smoke-x86-64-gcc-debug:
- *x86-64-test-needs
- alpine-3.12-gcc-debug
+adl-smoke-x86-64-dom0pvh-gcc-debug:
+ extends: .adl-x86-64
+ script:
+ - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE}
+ needs:
+ - *x86-64-test-needs
+ - alpine-3.12-gcc-debug
+
adl-suspend-x86-64-gcc-debug:
extends: .adl-x86-64
script:
diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh
index 056faf9e6d..35b9386e5d 100755
--- a/automation/scripts/qubes-x86-64.sh
+++ b/automation/scripts/qubes-x86-64.sh
@@ -5,6 +5,7 @@ set -ex
test_variant=$1
### defaults
+dom0pvh=
wait_and_wakeup=
timeout=120
domU_config='
@@ -18,8 +19,8 @@ vif = [ "bridge=xenbr0", ]
disk = [ ]
'
-### test: smoke test
-if [ -z "${test_variant}" ]; then
+### test: smoke test & smoke test PVH
+if [ -z "${test_variant}" ] || [ "${test_variant}" = "dom0pvh" ]; then
passed="ping test passed"
domU_check="
ifconfig eth0 192.168.0.2
@@ -36,6 +37,9 @@ done
tail -n 100 /var/log/xen/console/guest-domU.log
echo \"${passed}\"
"
+if [ "${test_variant}" = "dom0pvh" ]; then
+ dom0pvh="dom0=pvh"
+fi
### test: S3
elif [ "${test_variant}" = "s3" ]; then
@@ -184,11 +188,11 @@ cd ..
TFTP=/scratch/gitlab-runner/tftp
CONTROLLER=control@thor.testnet
-echo '
-multiboot2 (http)/gitlab-ci/xen console=com1 com1=115200,8n1 loglvl=all guest_loglvl=all dom0_mem=4G
+echo "
+multiboot2 (http)/gitlab-ci/xen console=com1 com1=115200,8n1 loglvl=all guest_loglvl=all dom0_mem=4G $dom0pvh
module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0
module2 (http)/gitlab-ci/initrd-dom0
-' > $TFTP/grub.cfg
+" > $TFTP/grub.cfg
cp -f binaries/xen $TFTP/xen
cp -f binaries/bzImage $TFTP/vmlinuz
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] automation: add a Dom0 PVH test based on Qubes' runner
2023-05-13 1:28 [PATCH] automation: add a Dom0 PVH test based on Qubes' runner Stefano Stabellini
@ 2023-05-13 1:43 ` Marek Marczykowski-Górecki
0 siblings, 0 replies; 2+ messages in thread
From: Marek Marczykowski-Górecki @ 2023-05-13 1:43 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: xen-devel, cardoe, Stefano Stabellini
[-- Attachment #1: Type: text/plain, Size: 2825 bytes --]
On Fri, May 12, 2023 at 06:28:33PM -0700, Stefano Stabellini wrote:
> From: Stefano Stabellini <stefano.stabellini@amd.com>
>
> Straightforward Dom0 PVH test based on the existing basic Smoke test for
> the Qubes runner.
>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
> ---
> automation/gitlab-ci/test.yaml | 8 ++++++++
> automation/scripts/qubes-x86-64.sh | 14 +++++++++-----
> 2 files changed, 17 insertions(+), 5 deletions(-)
>
> diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
> index 55ca0c27dc..9c0e08d456 100644
> --- a/automation/gitlab-ci/test.yaml
> +++ b/automation/gitlab-ci/test.yaml
> @@ -149,6 +149,14 @@ adl-smoke-x86-64-gcc-debug:
> - *x86-64-test-needs
> - alpine-3.12-gcc-debug
>
> +adl-smoke-x86-64-dom0pvh-gcc-debug:
> + extends: .adl-x86-64
> + script:
> + - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE}
> + needs:
> + - *x86-64-test-needs
> + - alpine-3.12-gcc-debug
> +
> adl-suspend-x86-64-gcc-debug:
> extends: .adl-x86-64
> script:
> diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh
> index 056faf9e6d..35b9386e5d 100755
> --- a/automation/scripts/qubes-x86-64.sh
> +++ b/automation/scripts/qubes-x86-64.sh
> @@ -5,6 +5,7 @@ set -ex
> test_variant=$1
>
> ### defaults
> +dom0pvh=
Maybe better name it extra_xen_opts=? I can see it useful in other tests
in the future too.
> wait_and_wakeup=
> timeout=120
> domU_config='
> @@ -18,8 +19,8 @@ vif = [ "bridge=xenbr0", ]
> disk = [ ]
> '
>
> -### test: smoke test
> -if [ -z "${test_variant}" ]; then
> +### test: smoke test & smoke test PVH
> +if [ -z "${test_variant}" ] || [ "${test_variant}" = "dom0pvh" ]; then
> passed="ping test passed"
> domU_check="
> ifconfig eth0 192.168.0.2
> @@ -36,6 +37,9 @@ done
> tail -n 100 /var/log/xen/console/guest-domU.log
> echo \"${passed}\"
> "
> +if [ "${test_variant}" = "dom0pvh" ]; then
> + dom0pvh="dom0=pvh"
> +fi
>
> ### test: S3
> elif [ "${test_variant}" = "s3" ]; then
> @@ -184,11 +188,11 @@ cd ..
> TFTP=/scratch/gitlab-runner/tftp
> CONTROLLER=control@thor.testnet
>
> -echo '
> -multiboot2 (http)/gitlab-ci/xen console=com1 com1=115200,8n1 loglvl=all guest_loglvl=all dom0_mem=4G
> +echo "
> +multiboot2 (http)/gitlab-ci/xen console=com1 com1=115200,8n1 loglvl=all guest_loglvl=all dom0_mem=4G $dom0pvh
> module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0
> module2 (http)/gitlab-ci/initrd-dom0
> -' > $TFTP/grub.cfg
> +" > $TFTP/grub.cfg
>
> cp -f binaries/xen $TFTP/xen
> cp -f binaries/bzImage $TFTP/vmlinuz
> --
> 2.25.1
>
>
--
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-13 1:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-13 1:28 [PATCH] automation: add a Dom0 PVH test based on Qubes' runner Stefano Stabellini
2023-05-13 1:43 ` Marek Marczykowski-Górecki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.