diff mbox series

[XEN,v2] automation: update xilinx test scripts (tty)

Message ID 8cf7c010d8412d23d2e1da272f1103477d751037.1724451299.git.victorm.lira@amd.com (mailing list archive)
State New
Headers show
Series [XEN,v2] automation: update xilinx test scripts (tty) | expand

Commit Message

Lira, Victor M Aug. 23, 2024, 10:29 p.m. UTC 
From: Victor Lira <victorm.lira@amd.com>

Update serial device names from ttyUSB* to test board specific names.

Update xilinx-smoke-dom0-x86_64 with new Xen command line console options,
which are now set as Gitlab CI/CD variables. Abstract the directory where
binaries are stored. Increase the timeout to match new setup.

Signed-off-by: Victor Lira <victorm.lira@amd.com>
---
Cc: Stefano Stabellini <sstabellini@kernel.org>
---
 automation/gitlab-ci/test.yaml                |  2 ++
 .../scripts/xilinx-smoke-dom0-x86_64.sh       | 28 +++++++++----------
 .../scripts/xilinx-smoke-dom0less-arm64.sh    |  5 ++--
 3 files changed, 19 insertions(+), 16 deletions(-)

--
2.37.6

Comments

Stefano Stabellini Aug. 24, 2024, 12:50 a.m. UTC | #1 
On Fri, 23 Aug 2024, victorm.lira@amd.com wrote:
> From: Victor Lira <victorm.lira@amd.com>
> 
> Update serial device names from ttyUSB* to test board specific names.
> 
> Update xilinx-smoke-dom0-x86_64 with new Xen command line console options,
> which are now set as Gitlab CI/CD variables. Abstract the directory where
> binaries are stored. Increase the timeout to match new setup.
> 
> Signed-off-by: Victor Lira <victorm.lira@amd.com>

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


> ---
> Cc: Stefano Stabellini <sstabellini@kernel.org>
> ---
>  automation/gitlab-ci/test.yaml                |  2 ++
>  .../scripts/xilinx-smoke-dom0-x86_64.sh       | 28 +++++++++----------
>  .../scripts/xilinx-smoke-dom0less-arm64.sh    |  5 ++--
>  3 files changed, 19 insertions(+), 16 deletions(-)
> 
> diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
> index 4e74946419..3b339f387f 100644
> --- a/automation/gitlab-ci/test.yaml
> +++ b/automation/gitlab-ci/test.yaml
> @@ -101,6 +101,8 @@
>    variables:
>      CONTAINER: ubuntu:xenial-xilinx
>      LOGFILE: xilinx-smoke-x86_64.log
> +    XEN_CMD_CONSOLE: "console=com2 com2=115200,8n1,0x2F8,4"
> +    TEST_BOARD: "crater"
>    artifacts:
>      paths:
>        - smoke.serial
> diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh
> index e6e6fac6a5..4559e2b9ee 100755
> --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh
> +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh
> @@ -12,7 +12,6 @@ fatal() {
>  # Test parameter defaults.
>  TEST="$1"
>  PASS_MSG="Test passed: ${TEST}"
> -XEN_CMD_CONSOLE="console=com1 com1=115200,8n1,0x3F8,4"
>  XEN_CMD_DOM0="dom0=pvh dom0_max_vcpus=4 dom0_mem=4G"
>  XEN_CMD_XEN="sched=null loglvl=all guest_loglvl=all console_timestamps=boot"
>  XEN_CMD_EXTRA=""
> @@ -28,7 +27,7 @@ memory = 512
>  vif = [ "bridge=xenbr0", ]
>  disk = [ ]
>  '
> -TIMEOUT_SECONDS=120
> +TIMEOUT_SECONDS=200
> 
>  # Select test variant.
>  if [ "${TEST}" = "ping" ]; then
> @@ -113,27 +112,28 @@ cd ..
>  # Load software into TFTP server directory.
>  TFTP="/scratch/gitlab-runner/tftp"
>  XEN_CMDLINE="${XEN_CMD_CONSOLE} ${XEN_CMD_XEN} ${XEN_CMD_DOM0} ${XEN_CMD_EXTRA}"
> -cp -f binaries/xen ${TFTP}/pxelinux.cfg/xen
> -cp -f binaries/bzImage ${TFTP}/pxelinux.cfg/vmlinuz
> -cp -f binaries/dom0-rootfs.cpio.gz ${TFTP}/pxelinux.cfg/initrd-dom0
> +cp -f binaries/xen ${TFTP}/${TEST_BOARD}/xen
> +cp -f binaries/bzImage ${TFTP}/${TEST_BOARD}/vmlinuz
> +cp -f binaries/dom0-rootfs.cpio.gz ${TFTP}/${TEST_BOARD}/initrd-dom0
>  echo "
>  net_default_server=10.0.6.1
> -multiboot2 (tftp)/pxelinux.cfg/xen ${XEN_CMDLINE}
> -module2 (tftp)/pxelinux.cfg/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen
> -module2 (tftp)/pxelinux.cfg/initrd-dom0
> +multiboot2 (tftp)/${TEST_BOARD}/xen ${XEN_CMDLINE}
> +module2 (tftp)/${TEST_BOARD}/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen
> +module2 (tftp)/${TEST_BOARD}/initrd-dom0
>  boot
> -" > ${TFTP}/pxelinux.cfg/grub.cfg
> +" > ${TFTP}/${TEST_BOARD}/grub.cfg
> 
>  # Power cycle board and collect serial port output.
> -SERIAL_CMD="cat /dev/ttyUSB9 | tee smoke.serial | sed 's/\r//'"
> -sh /scratch/gitlab-runner/v2000a.sh 2
> +SERIAL_DEV="/dev/serial/${TEST_BOARD}"
> +SERIAL_CMD="cat ${SERIAL_DEV} | tee smoke.serial | sed 's/\r//'"
> +sh /scratch/gitlab-runner/${TEST_BOARD}.sh 2
>  sleep 5
> -sh /scratch/gitlab-runner/v2000a.sh 1
> +sh /scratch/gitlab-runner/${TEST_BOARD}.sh 1
>  sleep 5
>  set +e
> -stty -F /dev/ttyUSB9 115200
> +stty -F ${SERIAL_DEV} 115200
>  timeout -k 1 ${TIMEOUT_SECONDS} nohup sh -c "${SERIAL_CMD}"
> -sh /scratch/gitlab-runner/v2000a.sh 2
> +sh /scratch/gitlab-runner/${TEST_BOARD}.sh 2
> 
>  set -e
> 
> diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh
> index 666411d6a0..18aa07f0a2 100755
> --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh
> +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh
> @@ -134,9 +134,10 @@ sleep 5
>  cd $START
> 
>  # connect to serial
> +SERIAL_DEV="/dev/serial/zynq"
>  set +e
> -stty -F /dev/ttyUSB0 115200
> -timeout -k 1 120 nohup sh -c "cat /dev/ttyUSB0 | tee smoke.serial | sed 's/\r//'"
> +stty -F ${SERIAL_DEV} 115200
> +timeout -k 1 120 nohup sh -c "cat ${SERIAL_DEV} | tee smoke.serial | sed 's/\r//'"
> 
>  # stop the board
>  cd /scratch/gitlab-runner
> --
> 2.37.6
>
diff mbox series

Patch

diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 4e74946419..3b339f387f 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -101,6 +101,8 @@ 
   variables:
     CONTAINER: ubuntu:xenial-xilinx
     LOGFILE: xilinx-smoke-x86_64.log
+    XEN_CMD_CONSOLE: "console=com2 com2=115200,8n1,0x2F8,4"
+    TEST_BOARD: "crater"
   artifacts:
     paths:
       - smoke.serial
diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh
index e6e6fac6a5..4559e2b9ee 100755
--- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh
+++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh
@@ -12,7 +12,6 @@  fatal() {
 # Test parameter defaults.
 TEST="$1"
 PASS_MSG="Test passed: ${TEST}"
-XEN_CMD_CONSOLE="console=com1 com1=115200,8n1,0x3F8,4"
 XEN_CMD_DOM0="dom0=pvh dom0_max_vcpus=4 dom0_mem=4G"
 XEN_CMD_XEN="sched=null loglvl=all guest_loglvl=all console_timestamps=boot"
 XEN_CMD_EXTRA=""
@@ -28,7 +27,7 @@  memory = 512
 vif = [ "bridge=xenbr0", ]
 disk = [ ]
 '
-TIMEOUT_SECONDS=120
+TIMEOUT_SECONDS=200

 # Select test variant.
 if [ "${TEST}" = "ping" ]; then
@@ -113,27 +112,28 @@  cd ..
 # Load software into TFTP server directory.
 TFTP="/scratch/gitlab-runner/tftp"
 XEN_CMDLINE="${XEN_CMD_CONSOLE} ${XEN_CMD_XEN} ${XEN_CMD_DOM0} ${XEN_CMD_EXTRA}"
-cp -f binaries/xen ${TFTP}/pxelinux.cfg/xen
-cp -f binaries/bzImage ${TFTP}/pxelinux.cfg/vmlinuz
-cp -f binaries/dom0-rootfs.cpio.gz ${TFTP}/pxelinux.cfg/initrd-dom0
+cp -f binaries/xen ${TFTP}/${TEST_BOARD}/xen
+cp -f binaries/bzImage ${TFTP}/${TEST_BOARD}/vmlinuz
+cp -f binaries/dom0-rootfs.cpio.gz ${TFTP}/${TEST_BOARD}/initrd-dom0
 echo "
 net_default_server=10.0.6.1
-multiboot2 (tftp)/pxelinux.cfg/xen ${XEN_CMDLINE}
-module2 (tftp)/pxelinux.cfg/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen
-module2 (tftp)/pxelinux.cfg/initrd-dom0
+multiboot2 (tftp)/${TEST_BOARD}/xen ${XEN_CMDLINE}
+module2 (tftp)/${TEST_BOARD}/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen
+module2 (tftp)/${TEST_BOARD}/initrd-dom0
 boot
-" > ${TFTP}/pxelinux.cfg/grub.cfg
+" > ${TFTP}/${TEST_BOARD}/grub.cfg

 # Power cycle board and collect serial port output.
-SERIAL_CMD="cat /dev/ttyUSB9 | tee smoke.serial | sed 's/\r//'"
-sh /scratch/gitlab-runner/v2000a.sh 2
+SERIAL_DEV="/dev/serial/${TEST_BOARD}"
+SERIAL_CMD="cat ${SERIAL_DEV} | tee smoke.serial | sed 's/\r//'"
+sh /scratch/gitlab-runner/${TEST_BOARD}.sh 2
 sleep 5
-sh /scratch/gitlab-runner/v2000a.sh 1
+sh /scratch/gitlab-runner/${TEST_BOARD}.sh 1
 sleep 5
 set +e
-stty -F /dev/ttyUSB9 115200
+stty -F ${SERIAL_DEV} 115200
 timeout -k 1 ${TIMEOUT_SECONDS} nohup sh -c "${SERIAL_CMD}"
-sh /scratch/gitlab-runner/v2000a.sh 2
+sh /scratch/gitlab-runner/${TEST_BOARD}.sh 2

 set -e

diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh
index 666411d6a0..18aa07f0a2 100755
--- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh
+++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh
@@ -134,9 +134,10 @@  sleep 5
 cd $START

 # connect to serial
+SERIAL_DEV="/dev/serial/zynq"
 set +e
-stty -F /dev/ttyUSB0 115200
-timeout -k 1 120 nohup sh -c "cat /dev/ttyUSB0 | tee smoke.serial | sed 's/\r//'"
+stty -F ${SERIAL_DEV} 115200
+timeout -k 1 120 nohup sh -c "cat ${SERIAL_DEV} | tee smoke.serial | sed 's/\r//'"

 # stop the board
 cd /scratch/gitlab-runner