Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
---
new in v2
If those tests are sensitive to underlying hardware, I guess it makes
sense to run them on other runners too. Are they?
Similarly - does it matter if dom0 is PV or PVH for those tests? If not,
probably better to put just one of those jobs (PV?) to save CI
time.
---
 automation/gitlab-ci/test.yaml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 93632f1f9204..fc7663e3367a 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -162,6 +162,7 @@
     PCIDEV: "01:00.0"
     PCIDEV_INTR: "MSI-X"
     CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi"
+    SUT_ADDR: test-11.testnet
   tags:
     - qubes-hw11
 
@@ -340,6 +341,28 @@ zen3p-pvshim-x86-64-gcc-debug:
     - *x86-64-test-needs
     - alpine-3.18-gcc-debug
 
+zen3p-tools-tests-pv-x86-64-gcc-debug:
+  extends: .zen3p-x86-64
+  script:
+    - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE}
+  artifacts:
+    reports:
+      junit: tests-junit.xml
+  needs:
+    - *x86-64-test-needs
+    - alpine-3.18-gcc-debug
+
+zen3p-tools-tests-pvh-x86-64-gcc-debug:
+  extends: .zen3p-x86-64
+  script:
+    - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE}
+  artifacts:
+    reports:
+      junit: tests-junit.xml
+  needs:
+    - *x86-64-test-needs
+    - alpine-3.18-gcc-debug
+
 qemu-smoke-dom0-arm64-gcc:
   extends: .qemu-arm64
   script:
-- 
git-series 0.9.1

On Fri, 14 Feb 2025, Marek Marczykowski-Górecki wrote:
> Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
> ---
> new in v2
> If those tests are sensitive to underlying hardware, I guess it makes
> sense to run them on other runners too. Are they?
> Similarly - does it matter if dom0 is PV or PVH for those tests? If not,
> probably better to put just one of those jobs (PV?) to save CI
> time.

It should make a difference for the vpci test probably. I think we
should keep both a PV and a PVH test of it. I think it is less important
to run them on multiple runners, but it cannot hurt.

> ---
>  automation/gitlab-ci/test.yaml | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
> index 93632f1f9204..fc7663e3367a 100644
> --- a/automation/gitlab-ci/test.yaml
> +++ b/automation/gitlab-ci/test.yaml
> @@ -162,6 +162,7 @@
>      PCIDEV: "01:00.0"
>      PCIDEV_INTR: "MSI-X"
>      CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi"
> +    SUT_ADDR: test-11.testnet
>    tags:
>      - qubes-hw11

Is this a spurious change?



> @@ -340,6 +341,28 @@ zen3p-pvshim-x86-64-gcc-debug:
>      - *x86-64-test-needs
>      - alpine-3.18-gcc-debug
>  
> +zen3p-tools-tests-pv-x86-64-gcc-debug:
> +  extends: .zen3p-x86-64
> +  script:
> +    - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE}
> +  artifacts:
> +    reports:
> +      junit: tests-junit.xml
> +  needs:
> +    - *x86-64-test-needs
> +    - alpine-3.18-gcc-debug
> +
> +zen3p-tools-tests-pvh-x86-64-gcc-debug:
> +  extends: .zen3p-x86-64
> +  script:
> +    - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE}
> +  artifacts:
> +    reports:
> +      junit: tests-junit.xml
> +  needs:
> +    - *x86-64-test-needs
> +    - alpine-3.18-gcc-debug
> +
>  qemu-smoke-dom0-arm64-gcc:
>    extends: .qemu-arm64
>    script:
> -- 
> git-series 0.9.1
> 

On Fri, Feb 14, 2025 at 04:33:07PM -0800, Stefano Stabellini wrote:
> On Fri, 14 Feb 2025, Marek Marczykowski-Górecki wrote:
> > Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
> > ---
> > new in v2
> > If those tests are sensitive to underlying hardware, I guess it makes
> > sense to run them on other runners too. Are they?
> > Similarly - does it matter if dom0 is PV or PVH for those tests? If not,
> > probably better to put just one of those jobs (PV?) to save CI
> > time.
> 
> It should make a difference for the vpci test probably. I think we
> should keep both a PV and a PVH test of it. I think it is less important
> to run them on multiple runners, but it cannot hurt.
> 
> > ---
> >  automation/gitlab-ci/test.yaml | 23 +++++++++++++++++++++++
> >  1 file changed, 23 insertions(+)
> > 
> > diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
> > index 93632f1f9204..fc7663e3367a 100644
> > --- a/automation/gitlab-ci/test.yaml
> > +++ b/automation/gitlab-ci/test.yaml
> > @@ -162,6 +162,7 @@
> >      PCIDEV: "01:00.0"
> >      PCIDEV_INTR: "MSI-X"
> >      CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi"
> > +    SUT_ADDR: test-11.testnet
> >    tags:
> >      - qubes-hw11
> 
> Is this a spurious change?

No, the SUT_ADDR variable is used by the test script to extract the
junit xml file via network.

> > @@ -340,6 +341,28 @@ zen3p-pvshim-x86-64-gcc-debug:
> >      - *x86-64-test-needs
> >      - alpine-3.18-gcc-debug
> >  
> > +zen3p-tools-tests-pv-x86-64-gcc-debug:
> > +  extends: .zen3p-x86-64
> > +  script:
> > +    - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE}
> > +  artifacts:
> > +    reports:
> > +      junit: tests-junit.xml
> > +  needs:
> > +    - *x86-64-test-needs
> > +    - alpine-3.18-gcc-debug
> > +
> > +zen3p-tools-tests-pvh-x86-64-gcc-debug:
> > +  extends: .zen3p-x86-64
> > +  script:
> > +    - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE}
> > +  artifacts:
> > +    reports:
> > +      junit: tests-junit.xml
> > +  needs:
> > +    - *x86-64-test-needs
> > +    - alpine-3.18-gcc-debug
> > +
> >  qemu-smoke-dom0-arm64-gcc:
> >    extends: .qemu-arm64
> >    script:
> > -- 
> > git-series 0.9.1
> > 


-- 
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab

On Sat, 15 Feb 2025, Marek Marczykowski-Górecki wrote:
> On Fri, Feb 14, 2025 at 04:33:07PM -0800, Stefano Stabellini wrote:
> > On Fri, 14 Feb 2025, Marek Marczykowski-Górecki wrote:
> > > Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
> > > ---
> > > new in v2
> > > If those tests are sensitive to underlying hardware, I guess it makes
> > > sense to run them on other runners too. Are they?
> > > Similarly - does it matter if dom0 is PV or PVH for those tests? If not,
> > > probably better to put just one of those jobs (PV?) to save CI
> > > time.
> > 
> > It should make a difference for the vpci test probably. I think we
> > should keep both a PV and a PVH test of it. I think it is less important
> > to run them on multiple runners, but it cannot hurt.
> > 
> > > ---
> > >  automation/gitlab-ci/test.yaml | 23 +++++++++++++++++++++++
> > >  1 file changed, 23 insertions(+)
> > > 
> > > diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
> > > index 93632f1f9204..fc7663e3367a 100644
> > > --- a/automation/gitlab-ci/test.yaml
> > > +++ b/automation/gitlab-ci/test.yaml
> > > @@ -162,6 +162,7 @@
> > >      PCIDEV: "01:00.0"
> > >      PCIDEV_INTR: "MSI-X"
> > >      CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi"
> > > +    SUT_ADDR: test-11.testnet
> > >    tags:
> > >      - qubes-hw11
> > 
> > Is this a spurious change?
> 
> No, the SUT_ADDR variable is used by the test script to extract the
> junit xml file via network.

Ah yes, I only looked at the patch without the context.

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>