On Thu, 3 Apr 2025, Marek Marczykowski-Górecki wrote:
> This is AMD Ryzen 5 7640U in Framework Laptop AMD.
> It has several things different than the other runners.
> First of all, the console is using XHCI debug capability.
> And then, this system doesn't have normal wired ethernet. But is has one
> on USB, and this one is used for booting. For this, enable
> CONFIG_USB_RTL8152 in the Linux build.
>
> Include some basic tests, plus PCI passthrough.
>
> This machine doesn't support S3. S0ix pretends to be working with
> Qubes's dom0 (kernel + userspace), but it hangs on suspend with Alpine
> used in test. But even when it doesn't hang, it doesn't really reach
> deep sleep, so skip this test for now here.
>
> Signed-off-by: Marek Marczykowski-Górecki <marma...@invisiblethingslab.com>
> ---
> Requires containers rebuild, especially tests-artifacts/kernel/6.12.21.
>
> Do not apply yet, until issues found by those tests are fixed. That
> would be at least third issue found using this system, so lets have it
> in CI.
I'd prefer to wait 1 week before committing. In the meantime:
Reviewed-by: Stefano Stabellini <sstabell...@kernel.org>
> ---
> automation/gitlab-ci/test.yaml | 56 +++++++++++++-
> automation/tests-artifacts/kernel/6.12.21.dockerfile | 2 +-
> 2 files changed, 58 insertions(+)
>
> diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
> index a13dd040bd26..feb2dd10ab30 100644
> --- a/automation/gitlab-ci/test.yaml
> +++ b/automation/gitlab-ci/test.yaml
> @@ -188,6 +188,16 @@
> tags:
> - qubes-hw11
>
> +.zen4-x86-64:
> + extends: .adl-x86-64
> + variables:
> + PCIDEV: "c3:00.4"
> + PCIDEV_INTR: "MSI-X"
> + CONSOLE_OPTS: "console=xhci dbgp=xhci@pcic1:00.3,share=yes"
> + SUT_ADDR: test-12.testnet
> + tags:
> + - qubes-hw12
> +
> # Test jobs
> build-each-commit-gcc:
> extends: .test-jobs-common
> @@ -479,6 +489,52 @@ zen3p-tools-tests-pvh-x86-64-gcc-debug:
> - *x86-64-test-needs
> - alpine-3.18-gcc-debug
>
> +zen4-smoke-x86-64-gcc-debug:
> + extends: .zen4-x86-64
> + script:
> + - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE}
> + needs:
> + - *x86-64-test-needs
> + - alpine-3.18-gcc-debug
> +
> +zen4-smoke-x86-64-dom0pvh gcc-debug:
> + extends: .zen4-x86-64
> + script:
> + - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE}
> + needs:
> + - *x86-64-test-needs
> + - alpine-3.18-gcc-debug
> +
> +zen4-pci-hvm-x86-64-gcc-debug:
> + extends: .zen4-x86-64
> + script:
> + - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE}
> + needs:
> + - *x86-64-test-needs
> + - alpine-3.18-gcc-debug
> +
> +zen4-tools-tests-pv-x86-64-gcc-debug:
> + extends: .zen4-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
> +
> +zen4-tools-tests-pvh-x86-64-gcc-debug:
> + extends: .zen4-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:
> diff --git a/automation/tests-artifacts/kernel/6.12.21.dockerfile
> b/automation/tests-artifacts/kernel/6.12.21.dockerfile
> index d7d34031cab5..4e0a68ec61eb 100644
> --- a/automation/tests-artifacts/kernel/6.12.21.dockerfile
> +++ b/automation/tests-artifacts/kernel/6.12.21.dockerfile
> @@ -19,6 +19,7 @@ RUN apt-get update && \
> flex \
> bison \
> libelf-dev \
> + libssl-dev \
> && \
> apt-get autoremove -y && \
> apt-get clean && \
> @@ -33,6 +34,7 @@ RUN curl -fsSLO
> https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSI
> scripts/config --enable BRIDGE && \
> scripts/config --enable IGC && \
> scripts/config --enable TUN && \
> + scripts/config --enable USB_RTL8152 && \
> cp .config .config.orig && \
> cat .config.orig | grep XEN | grep =m |sed 's/=m/=y/g' >> .config && \
> make -j$(nproc) bzImage && \
> --
> git-series 0.9.1
>
