* [PATCH v3 0/2] automation: introduce a Xilinx hardware test
@ 2023-03-06 23:32 Stefano Stabellini
2023-03-06 23:33 ` [PATCH v3 1/2] automation: add Ubuntu container for Xilinx hardware tests Stefano Stabellini
2023-03-06 23:33 ` [PATCH v3 2/2] automation: introduce a dom0less test run on Xilinx hardware Stefano Stabellini
0 siblings, 2 replies; 5+ messages in thread
From: Stefano Stabellini @ 2023-03-06 23:32 UTC (permalink / raw
To: xen-devel; +Cc: sstabellini, cardoe, michal.orzel
Hi all,
This short patch series introduces the first Xen gitlab-ci test run on
real hardware: a physical Xilinx ZCU102 board.
The gitlab container is run on a workstation physically connected to a
ZCU102 board. The test script looks very similar to a regular QEMU test
script, except that at the end it reboots the physical board and
connects to the serial instead of launching QEMU.
The gitlab runner is currently restricted to
https://gitlab.com/xen-project/xen. A CI/CD variable called
"XILINX_JOBS" is set to true for https://gitlab.com/xen-project/xen, so
that we can signal the pipeline to create a xilinx job, otherwise the
job is skipped as the runner is not available.
Cheers,
Stefano
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3 1/2] automation: add Ubuntu container for Xilinx hardware tests
2023-03-06 23:32 [PATCH v3 0/2] automation: introduce a Xilinx hardware test Stefano Stabellini
@ 2023-03-06 23:33 ` Stefano Stabellini
2023-03-06 23:33 ` [PATCH v3 2/2] automation: introduce a dom0less test run on Xilinx hardware Stefano Stabellini
1 sibling, 0 replies; 5+ messages in thread
From: Stefano Stabellini @ 2023-03-06 23:33 UTC (permalink / raw
To: xen-devel; +Cc: sstabellini, cardoe, michal.orzel, Stefano Stabellini
From: Stefano Stabellini <stefano.stabellini@amd.com>
This container is only run on the controller PC (x86) to trigger the
test on a connected Xilinx ZCU102 physical board.
Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
Reviewed-by: Michal Orzel <michal.orzel@amd.com>
---
Changes in v3:
- improve in-code comment
- add reviewed-by
---
.../build/ubuntu/xenial-xilinx.dockerfile | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 automation/build/ubuntu/xenial-xilinx.dockerfile
diff --git a/automation/build/ubuntu/xenial-xilinx.dockerfile b/automation/build/ubuntu/xenial-xilinx.dockerfile
new file mode 100644
index 0000000000..5f70871352
--- /dev/null
+++ b/automation/build/ubuntu/xenial-xilinx.dockerfile
@@ -0,0 +1,25 @@
+FROM ubuntu:16.04
+LABEL maintainer.name="The Xen Project " \
+ maintainer.email="xen-devel@lists.xenproject.org"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+# board bringup depends
+RUN apt-get update && \
+ apt-get --quiet --yes install \
+ snmp \
+ snmp-mibs-downloader \
+ u-boot-tools \
+ device-tree-compiler \
+ cpio \
+ git \
+ gzip \
+ file \
+ && \
+ apt-get autoremove -y && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 2/2] automation: introduce a dom0less test run on Xilinx hardware
2023-03-06 23:32 [PATCH v3 0/2] automation: introduce a Xilinx hardware test Stefano Stabellini
2023-03-06 23:33 ` [PATCH v3 1/2] automation: add Ubuntu container for Xilinx hardware tests Stefano Stabellini
@ 2023-03-06 23:33 ` Stefano Stabellini
2023-03-07 7:44 ` Michal Orzel
1 sibling, 1 reply; 5+ messages in thread
From: Stefano Stabellini @ 2023-03-06 23:33 UTC (permalink / raw
To: xen-devel; +Cc: sstabellini, cardoe, michal.orzel, Stefano Stabellini
From: Stefano Stabellini <stefano.stabellini@amd.com>
The test prepares dom0 and domU binaries and boot artifacts, similarly
to the existing QEMU test. (TBD: share preparation steps with the
regular QEMU tests.)
However, instead of running the test inside QEMU as usual, it copies
the binaries to the tftp server root, triggers a Xilinx ZCU102 board
reboot, and connects to the real serial of the board.
For now and due to its novelty, allow_failure on the Xilinx hardware
test, and only run the job on protected branches with XILINX_JOBS set to
true (the "master" and "staging" on gitlab.com/xen-project/xen qualify).
Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
---
Changes in v3:
- use a template to make it easier to create other xilinx jobs
- export dtbs as artifacts
- use 0x7ff00000 as MEMORY_END
- rename mpsoc.dtb to mpsoc_smmu.dtb
- add dtuart=serial0 to XEN_CMD
- stop the board after usage to save power
Changes in v2:
- only execute the xilinx job on protected branches with XILINX_JOBS set
to true
---
automation/gitlab-ci/test.yaml | 26 ++++
.../scripts/xilinx-smoke-dom0less-arm64.sh | 122 ++++++++++++++++++
2 files changed, 148 insertions(+)
create mode 100755 automation/scripts/xilinx-smoke-dom0less-arm64.sh
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 1c5f400b68..61491cf2d6 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -67,6 +67,24 @@
tags:
- x86_64
+.xilinx-arm64:
+ extends: .test-jobs-common
+ variables:
+ CONTAINER: ubuntu:xenial-xilinx
+ LOGFILE: qemu-smoke-xilinx.log
+ artifacts:
+ paths:
+ - smoke.serial
+ - '*.log'
+ - '*.dtb'
+ when: always
+ allow_failure: true
+ only:
+ variables:
+ - $XILINX_JOBS == "true" && $CI_COMMIT_REF_PROTECTED == "true"
+ tags:
+ - xilinx
+
# Test jobs
build-each-commit-gcc:
extends: .test-jobs-common
@@ -85,6 +103,14 @@ build-each-commit-gcc:
tags:
- x86_64
+xilinx-smoke-dom0less-arm64-gcc:
+ extends: .xilinx-arm64
+ script:
+ - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE}
+ needs:
+ - *arm64-test-needs
+ - alpine-3.12-gcc-arm64
+
qemu-smoke-dom0-arm64-gcc:
extends: .qemu-arm64
script:
diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh
new file mode 100755
index 0000000000..82158ab7ea
--- /dev/null
+++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh
@@ -0,0 +1,122 @@
+#!/bin/bash
+
+set -ex
+
+test_variant=$1
+
+if [ -z "${test_variant}" ]; then
+ passed="ping test passed"
+ domU_check="
+until ifconfig eth0 192.168.0.2 &> /dev/null && ping -c 10 192.168.0.1; do
+ sleep 30
+done
+echo \"${passed}\"
+"
+fi
+
+# DomU
+mkdir -p rootfs
+cd rootfs
+tar xzf ../binaries/initrd.tar.gz
+mkdir proc
+mkdir run
+mkdir srv
+mkdir sys
+rm var/run
+echo "#!/bin/sh
+
+${domU_check}
+/bin/sh" > etc/local.d/xen.start
+chmod +x etc/local.d/xen.start
+echo "rc_verbose=yes" >> etc/rc.conf
+find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz
+cd ..
+rm -rf rootfs
+
+# DOM0 rootfs
+mkdir -p rootfs
+cd rootfs
+tar xzf ../binaries/initrd.tar.gz
+mkdir proc
+mkdir run
+mkdir srv
+mkdir sys
+rm var/run
+cp -ar ../binaries/dist/install/* .
+
+echo "#!/bin/bash
+
+export LD_LIBRARY_PATH=/usr/local/lib
+bash /etc/init.d/xencommons start
+
+/usr/local/lib/xen/bin/init-dom0less
+
+brctl addbr xenbr0
+brctl addif xenbr0 eth0
+ifconfig eth0 up
+ifconfig xenbr0 up
+ifconfig xenbr0 192.168.0.1
+
+xl network-attach 1 type=vif
+${dom0_check}
+" > etc/local.d/xen.start
+chmod +x etc/local.d/xen.start
+echo "rc_verbose=yes" >> etc/rc.conf
+find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz
+cd ..
+
+
+TFTP=/scratch/gitlab-runner/tftp
+START=`pwd`
+
+# ImageBuilder
+echo 'MEMORY_START="0"
+MEMORY_END="0x7ff00000"
+
+DEVICE_TREE="mpsoc_smmu.dtb"
+XEN="xen"
+DOM0_KERNEL="Image"
+DOM0_RAMDISK="dom0-rootfs.cpio.gz"
+XEN_CMD="console=dtuart dtuart=serial0 dom0_mem=1024M"
+
+NUM_DOMUS=1
+DOMU_KERNEL[0]="Image"
+DOMU_RAMDISK[0]="domU-rootfs.cpio.gz"
+DOMU_MEM[0]="1024"
+
+LOAD_CMD="tftpb"
+UBOOT_SOURCE="boot.source"
+UBOOT_SCRIPT="boot.scr"' > $TFTP/config
+
+cp -f binaries/xen $TFTP/
+cp -f binaries/Image $TFTP/
+cp -f binaries/dom0-rootfs.cpio.gz $TFTP/
+cp -f binaries/domU-rootfs.cpio.gz $TFTP/
+# export dtb to artifacts
+cp $TFTP/mpsoc_smmu.dtb .
+
+rm -rf imagebuilder
+git clone https://gitlab.com/ViryaOS/imagebuilder
+bash imagebuilder/scripts/uboot-script-gen -t tftp -d $TFTP/ -c $TFTP/config
+
+# restart the board
+cd /scratch/gitlab-runner
+bash zcu102.sh 2
+sleep 5
+bash zcu102.sh 1
+sleep 5
+cd $START
+
+# connect to serial
+set +e
+stty -F /dev/ttyUSB0 115200
+timeout -k 1 120 nohup sh -c "cat /dev/ttyUSB0 | tee smoke.serial"
+
+# stop the board
+cd /scratch/gitlab-runner
+bash zcu102.sh 2
+cd $START
+
+set -e
+(grep -q "^Welcome to Alpine Linux" smoke.serial && grep -q "${passed}" smoke.serial) || exit 1
+exit 0
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v3 2/2] automation: introduce a dom0less test run on Xilinx hardware
2023-03-06 23:33 ` [PATCH v3 2/2] automation: introduce a dom0less test run on Xilinx hardware Stefano Stabellini
@ 2023-03-07 7:44 ` Michal Orzel
2023-03-08 2:45 ` Stefano Stabellini
0 siblings, 1 reply; 5+ messages in thread
From: Michal Orzel @ 2023-03-07 7:44 UTC (permalink / raw
To: Stefano Stabellini, xen-devel; +Cc: cardoe, Stefano Stabellini
Hi Stefano,
On 07/03/2023 00:33, Stefano Stabellini wrote:
>
>
> From: Stefano Stabellini <stefano.stabellini@amd.com>
>
> The test prepares dom0 and domU binaries and boot artifacts, similarly
> to the existing QEMU test. (TBD: share preparation steps with the
> regular QEMU tests.)
>
> However, instead of running the test inside QEMU as usual, it copies
> the binaries to the tftp server root, triggers a Xilinx ZCU102 board
> reboot, and connects to the real serial of the board.
>
> For now and due to its novelty, allow_failure on the Xilinx hardware
> test, and only run the job on protected branches with XILINX_JOBS set to
> true (the "master" and "staging" on gitlab.com/xen-project/xen qualify).
>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
Reviewed-by: Michal Orzel <michal.orzel@amd.com>
~Michal
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3 2/2] automation: introduce a dom0less test run on Xilinx hardware
2023-03-07 7:44 ` Michal Orzel
@ 2023-03-08 2:45 ` Stefano Stabellini
0 siblings, 0 replies; 5+ messages in thread
From: Stefano Stabellini @ 2023-03-08 2:45 UTC (permalink / raw
To: Michal Orzel; +Cc: Stefano Stabellini, xen-devel, cardoe, Stefano Stabellini
On Tue, 7 Mar 2023, Michal Orzel wrote:
> Hi Stefano,
>
> On 07/03/2023 00:33, Stefano Stabellini wrote:
> >
> >
> > From: Stefano Stabellini <stefano.stabellini@amd.com>
> >
> > The test prepares dom0 and domU binaries and boot artifacts, similarly
> > to the existing QEMU test. (TBD: share preparation steps with the
> > regular QEMU tests.)
> >
> > However, instead of running the test inside QEMU as usual, it copies
> > the binaries to the tftp server root, triggers a Xilinx ZCU102 board
> > reboot, and connects to the real serial of the board.
> >
> > For now and due to its novelty, allow_failure on the Xilinx hardware
> > test, and only run the job on protected branches with XILINX_JOBS set to
> > true (the "master" and "staging" on gitlab.com/xen-project/xen qualify).
> >
> > Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
> Reviewed-by: Michal Orzel <michal.orzel@amd.com>
Thank you!
I spoke with Andrew and he also agreed on the series so I am going to
commit it with one minor change as requested by Andrew: the xilinx job
will not be optional but required. So I removed allowed_failure.
Cheers,
Stefano
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-03-08 2:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-06 23:32 [PATCH v3 0/2] automation: introduce a Xilinx hardware test Stefano Stabellini
2023-03-06 23:33 ` [PATCH v3 1/2] automation: add Ubuntu container for Xilinx hardware tests Stefano Stabellini
2023-03-06 23:33 ` [PATCH v3 2/2] automation: introduce a dom0less test run on Xilinx hardware Stefano Stabellini
2023-03-07 7:44 ` Michal Orzel
2023-03-08 2:45 ` Stefano Stabellini
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.