Dave Jones has proposed merging ~waveform/ubuntu-manual-tests:pi5 into
ubuntu-manual-tests:main.
Commit message:
Several commits tidying up redundant Pi test cases and adding Pi 5 cases
Requested reviews:
Ubuntu Testcase Admins (ubuntu-testcase)
For more details, see:
https://code.launchpad.net/~waveform/ubuntu-manual-tests/+git/ubuntu-manual-tests/+merge/452380
--
Your team Ubuntu Testcase Admins is requested to review the proposed merge of
~waveform/ubuntu-manual-tests:pi5 into ubuntu-manual-tests:main.
diff --git a/definitions/pi_desktop_cases.xml b/definitions/pi_desktop_cases.xml
index 8d2b0b2..b1e482b 100644
--- a/definitions/pi_desktop_cases.xml
+++ b/definitions/pi_desktop_cases.xml
@@ -219,24 +219,6 @@
</dd>
</ut:test>
- <ut:case id="1751_RaspberryPi 4 2GB Desktop">
- <ut:define name="model">Raspberry Pi 2 4GB</ut:define>
- <ut:include ref="startup-splash" />
- <ut:include ref="startup-sound" />
- <ut:include ref="startup-timezone" />
- <ut:include ref="startup-identity" />
- <ut:include ref="flash-kernel" />
- <ut:include ref="reboot" />
- <ut:include ref="shutdown" />
- <ut:include ref="ram-free"><ut:define name="mem">1.6-1.8GB</ut:define></ut:include>
- <ut:incldue ref="dual-monitor" />
- <ut:include ref="ethernet"><ut:define name="intf">eth0</ut:define></ut:include>
- <ut:include ref="wifi"><ut:define name="intf">wlan0</ut:define></ut:include>
- <ut:include ref="www-video" />
- <ut:include ref="local-video" />
- <ut:include ref="lock-screen" />
- </ut:case>
-
<ut:case id="1745_RaspberryPi 4 4GB Desktop">
<ut:define name="model">Raspberry Pi 4 4GB</ut:define>
<ut:include ref="startup-splash" />
@@ -359,4 +341,40 @@
<ut:include ref="local-video" />
<ut:include ref="lock-screen" />
</ut:case>
+
+ <ut:case id="1796_RaspberryPi 5 4GB Desktop">
+ <ut:define name="model">Raspberry Pi 5 4GB</ut:define>
+ <ut:include ref="startup-splash" />
+ <ut:include ref="startup-sound" />
+ <ut:include ref="startup-timezone" />
+ <ut:include ref="startup-identity" />
+ <ut:include ref="flash-kernel" />
+ <ut:include ref="reboot" />
+ <ut:include ref="shutdown" />
+ <ut:include ref="ram-free"><ut:define name="mem">3.6-3.8GB</ut:define></ut:include>
+ <ut:incldue ref="dual-monitor" />
+ <ut:include ref="ethernet"><ut:define name="intf">eth0</ut:define></ut:include>
+ <ut:include ref="wifi"><ut:define name="intf">wlan0</ut:define></ut:include>
+ <ut:include ref="www-video" />
+ <ut:include ref="local-video" />
+ <ut:include ref="lock-screen" />
+ </ut:case>
+
+ <ut:case id="1797_RaspberryPi 5 8GB Desktop">
+ <ut:define name="model">Raspberry Pi 5 8GB</ut:define>
+ <ut:include ref="startup-splash" />
+ <ut:include ref="startup-sound" />
+ <ut:include ref="startup-timezone" />
+ <ut:include ref="startup-identity" />
+ <ut:include ref="flash-kernel" />
+ <ut:include ref="reboot" />
+ <ut:include ref="shutdown" />
+ <ut:include ref="ram-free"><ut:define name="mem">7.6-7.8GB</ut:define></ut:include>
+ <ut:incldue ref="dual-monitor" />
+ <ut:include ref="ethernet"><ut:define name="intf">eth0</ut:define></ut:include>
+ <ut:include ref="wifi"><ut:define name="intf">wlan0</ut:define></ut:include>
+ <ut:include ref="www-video" />
+ <ut:include ref="local-video" />
+ <ut:include ref="lock-screen" />
+ </ut:case>
</ut:configuration>
diff --git a/definitions/pi_server_cases.xml b/definitions/pi_server_cases.xml
index a46c724..5ec84a1 100644
--- a/definitions/pi_server_cases.xml
+++ b/definitions/pi_server_cases.xml
@@ -24,31 +24,6 @@
<ut:define name="post-install"></ut:define>
- <ut:test id="uboot-video">
- <dt>
- Immediately after the "rainbow" splash screen, U-Boot starts. Press a key
- to interrupt the sequence, then type "boot" to continue it.
- </dt>
- <dd>
- Check that the U-Boot prompt (including a two-second wait) appears on
- the primary monitor connected to the Pi, that the keyboard will interrupt
- the sequence, and that boot successfully concludes after resumption.
- </dd>
- </ut:test>
-
- <ut:test id="uboot-serial">
- <dt>
- During the boot sequence, U-Boot starts interacting via serial (GPIO14
- and GPIO15, pins 8 and 10 respectively, on the 40-pin GPIO header). Press
- a key to interrupt the sequence, then type "boot" to continue it.
- </dt>
- <dd>
- Check that the U-Boot prompt (including a two-second wait) appears on
- the attached serial console, that the keyboard will interrupt
- the sequence, and that boot successfully concludes after resumption.
- </dd>
- </ut:test>
-
<ut:test id="flash-kernel">
<dt>
Run <code>sudo flash-kernel</code>
@@ -209,8 +184,6 @@
<ut:case id="1711_RaspberryPi 4 2GB Post-install">
<ut:define name="model">Raspberry Pi 4 2GB</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -238,8 +211,6 @@
<ut:case id="1719_RaspberryPi 4 4GB Post-install">
<ut:define name="model">Raspberry Pi 4 4GB</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -267,8 +238,6 @@
<ut:case id="1720_RaspberryPi 4 8GB Post-install">
<ut:define name="model">Raspberry Pi 4 8GB</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -296,8 +265,6 @@
<ut:case id="1721_RaspberryPi 3B+ Post-install">
<ut:define name="model">Raspberry Pi 3B+</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -318,8 +285,6 @@
<ut:case id="1722_RaspberryPi 3B Post-install">
<ut:define name="model">Raspberry Pi 3B</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -340,8 +305,6 @@
<ut:case id="1723_RaspberryPi 3A+ Post-install">
<ut:define name="model">Raspberry Pi 3A+</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -361,8 +324,6 @@
<ut:case id="1724_RaspberryPi 2 Post-install">
<ut:define name="model">Raspberry Pi 2</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -382,8 +343,6 @@
<ut:case id="1726_RaspberryPi CM3+ Post-install">
<ut:define name="model">Raspberry Pi Compute Module 3+</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -398,8 +357,6 @@
<ut:case id="1727_RaspberryPi CM3+ Lite Post-install">
<ut:define name="model">Raspberry Pi Compute Module 3+ Lite</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -414,8 +371,6 @@
<ut:case id="1740_RaspberryPi 400 Post-install">
<ut:define name="model">Raspberry Pi 400</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -442,8 +397,6 @@
(1st) partition and uncomment the <code>#dtoverlay=dwc2,dr_mode=host</code>
line to ensure the USB ports on the IO board operate correctly</p>
</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -470,8 +423,6 @@
(1st) partition and uncomment the <code>#dtoverlay=dwc2,dr_mode=host</code>
line to ensure the USB ports on the IO board operate correctly</p>
</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -498,8 +449,6 @@
(1st) partition and uncomment the <code>#dtoverlay=dwc2,dr_mode=host</code>
line to ensure the USB ports on the IO board operate correctly</p>
</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -521,8 +470,6 @@
<ut:case id="1752_RaspberryPi Zero 2 Post-install">
<ut:define name="model">Raspberry Pi Zero 2</ut:define>
- <ut:include ref="uboot-video" />
- <ut:include ref="uboot-serial" />
<ut:include ref="flash-kernel" />
<ut:include ref="reboot" />
<ut:include ref="shutdown" />
@@ -535,4 +482,50 @@
</ut:include>
<ut:include ref="wifi"><ut:define name="intf">wlan0</ut:define></ut:include>
</ut:case>
+
+ <ut:case id="1798_RaspberryPi 5 4GB Post-install">
+ <ut:define name="model">Raspberry Pi 5 4GB</ut:define>
+ <ut:include ref="flash-kernel" />
+ <ut:include ref="reboot" />
+ <ut:include ref="shutdown" />
+ <ut:include ref="ram-free"><ut:define name="mem">3.6-3.8GB</ut:define></ut:include>
+ <ut:include ref="usb-file-transfer" />
+ <ut:include ref="usb-keyboard"><ut:define name="usb">USB2 (black)</ut:define></ut:include>
+ <ut:include ref="usb-keyboard"><ut:define name="usb">USB3 (blue)</ut:define></ut:include>
+ <ut:include ref="audio">
+ <ut:define name="device">an HDMI monitor that supports audio plugged into
+ the HDMI0 output</ut:define>
+ <ut:define name="output">HDMI0 port</ut:define>
+ </ut:include>
+ <ut:include ref="audio">
+ <ut:define name="device">an HDMI monitor that supports audio plugged into
+ the HDMI1 output</ut:define>
+ <ut:define name="output">HDMI1 port</ut:define>
+ </ut:include>
+ <ut:include ref="ethernet"><ut:define name="intf">eth0</ut:define></ut:include>
+ <ut:include ref="wifi"><ut:define name="intf">wlan0</ut:define></ut:include>
+ </ut:case>
+
+ <ut:case id="1799_RaspberryPi 5 8GB Post-install">
+ <ut:define name="model">Raspberry Pi 5 8GB</ut:define>
+ <ut:include ref="flash-kernel" />
+ <ut:include ref="reboot" />
+ <ut:include ref="shutdown" />
+ <ut:include ref="ram-free"><ut:define name="mem">7.6-7.8GB</ut:define></ut:include>
+ <ut:include ref="usb-file-transfer" />
+ <ut:include ref="usb-keyboard"><ut:define name="usb">USB2 (black)</ut:define></ut:include>
+ <ut:include ref="usb-keyboard"><ut:define name="usb">USB3 (blue)</ut:define></ut:include>
+ <ut:include ref="audio">
+ <ut:define name="device">an HDMI monitor that supports audio plugged into
+ the HDMI0 output</ut:define>
+ <ut:define name="output">HDMI0 port</ut:define>
+ </ut:include>
+ <ut:include ref="audio">
+ <ut:define name="device">an HDMI monitor that supports audio plugged into
+ the HDMI1 output</ut:define>
+ <ut:define name="output">HDMI1 port</ut:define>
+ </ut:include>
+ <ut:include ref="ethernet"><ut:define name="intf">eth0</ut:define></ut:include>
+ <ut:include ref="wifi"><ut:define name="intf">wlan0</ut:define></ut:include>
+ </ut:case>
</ut:configuration>
--
Mailing list: https://launchpad.net/~canonical-ubuntu-qa
Post to : canonical-ubuntu-qa@lists.launchpad.net
Unsubscribe : https://launchpad.net/~canonical-ubuntu-qa
More help : https://help.launchpad.net/ListHelp
