canonical-ubuntu-qa team mailing list archive

[Adriano Cordova Fedeli <mp+482970@xxxxxxxxxxxxxxxxxx>]

Adriano Cordova Fedeli has proposed merging ~adrianoco/ubuntu-manual-tests:main into ubuntu-manual-tests:main.

Commit message:
A couple of fixes for risc-v:

- subarches visionfive2 and milkvmars have been replaced by jh7110. Reflect that on the testcases by 
  removing testcases for VisionFive2 and Milk-v Mars and adding one for JH7110
- fix the qemu invocation in the risc-v QEMU testcase

Requested reviews:
  Ubuntu Testcase Admins (ubuntu-testcase)

For more details, see:
https://code.launchpad.net/~adrianoco/ubuntu-manual-tests/+git/ubuntu-manual-tests/+merge/482970
-- 
Your team Canonical's Ubuntu QA is subscribed to branch ubuntu-manual-tests:main.

diff --git a/testcases/image/1753_QEMU_riscv64_install b/testcases/image/1753_QEMU_riscv64_install
index 6bae96d..3c99200 100644
--- a/testcases/image/1753_QEMU_riscv64_install
+++ b/testcases/image/1753_QEMU_riscv64_install
@@ -10,7 +10,6 @@ On your installed Ubuntu machine.
     <dt>Start the installer with:
 <pre>
 /usr/bin/qemu-system-riscv64 -machine virt -m 4G -smp cpus=2 -nographic \
-    -bios /usr/lib/riscv64-linux-gnu/opensbi/generic/fw_jump.bin \
     -kernel /usr/lib/u-boot/qemu-riscv64_smode/u-boot.bin \
     -netdev user,id=net0 \
     -device virtio-net-device,netdev=net0 \
@@ -26,7 +25,6 @@ On your installed Ubuntu machine.
     <dt>Run the installed system with:
 <pre>
 /usr/bin/qemu-system-riscv64 -machine virt -m 4G -smp cpus=2 -nographic \
-    -bios /usr/lib/riscv64-linux-gnu/opensbi/generic/fw_jump.bin \
     -kernel /usr/lib/u-boot/qemu-riscv64_smode/u-boot.bin \
     -netdev user,id=net0 \
     -device virtio-net-device,netdev=net0 \
diff --git a/testcases/image/1780_Install VisionFive 2 b/testcases/image/1780_Install VisionFive 2
deleted file mode 100755
index 640df46..0000000
--- a/testcases/image/1780_Install VisionFive 2
+++ /dev/null
@@ -1,38 +0,0 @@
-The scope of this test is to ensure that riscv64+visionfive2 image boots from SD card on StarFive VisionFive 2 board
-
-<dl>
-    <dt>Flash downloaded image onto SD card</dt>
-        <dd>You can use Gnome Disks app to restore img.xz onto the SD card</dd>
-        <dd>Alternatively you can use xz -d to decompress, and then dd to copy the image to the SD card</dd>
-    <dt>Connect networking, serial console to the board</dt>
-        <dd>Ethernet cable for networking</dd>
-        <dd>FTDI adapter for serial console (pinout available here: https://rvspace.org/en/Product/VisionFive/Technical_Documents/VisionFive_Single_Board_Computer_Quick_Start_Guide)</dd>
-    <dt>Connect to the serial console</dt>
-        <dd>sudo screen /dev/ttyUSB0 115200</dd>
-    <dt>Power on the board</dt>
-        <dd>You should see U-BOOT output</dd>
-        <dd>It should then boot GRUB after a delay</dd>
-        <dd>You should see GRUB menu</dd>
-        <dd>It should then boot the default kernel after a delay</dd>
-        <dd>After a while cloud-init will run</dd>
-	<dd>Wait for the 'Cloud-init finished' message</dd>
-        <dd>Then one will be able to login</dd>
-    <dt>Login and change password</dt>
-        <dd>Login using ubuntu for both username and password</dd>
-        <dd>Reenter ubuntu password again</dd>
-        <dd>Set new password</dd>
-        <dd>Confirm the new password</dd>
-    <dt>Perform generic testing</dt>
-        <dd>Check that apt update works</dd>
-        <dd>Run any command that is not installed, check that command-not-found recommends things to install</dd>
-        <dd>e.g. hello</dd>
-        <dd>Install a package and check that it works, e.g. hello</dd>
-    <dt>Reboot</dt>
-        <dd>The board should reboot normally</dt>
-    <dt>Poweroff</dt>
-        <dd>Console messages should reach poweroff target</dd>
-        <dd>There should be final kernel dmsg powering off</dd>
-        <dd>Manually turn power-off from the board</dd>
-</dl>
-<strong>If all actions produce the expected results listed, please <a href="results#add_result">submit</a> a 'passed' result.
-    If an action fails, or produces an unexpected result, please <a href="results#add_result">submit</a> a 'failed' result and <a href="../../buginstructions">file a bug</a>. Please be sure to include the bug number when you <a href="results#add_result">submit</a> your result.</strong>
diff --git a/testcases/image/1795_Install Milk-V Mars b/testcases/image/Install JH7110
similarity index 92%
rename from testcases/image/1795_Install Milk-V Mars
rename to testcases/image/Install JH7110
index 5876f76..1410051 100755
--- a/testcases/image/1795_Install Milk-V Mars
+++ b/testcases/image/Install JH7110
@@ -1,4 +1,4 @@
-The scope of this test is to ensure that riscv64+visionfive2 image boots from SD card on Milk-V Mars board
+The scope of this test is to ensure that riscv64+jh7110 image boots from SD card on JH7110 based boards
 
 <dl>
     <dt>Flash downloaded image onto SD card</dt>
@@ -6,7 +6,7 @@ The scope of this test is to ensure that riscv64+visionfive2 image boots from SD
         <dd>Alternatively you can use xz -d to decompress, and then dd to copy the image to the SD card</dd>
     <dt>Connect networking, serial console to the board</dt>
         <dd>Ethernet cable for networking</dd>
-        <dd>USB to TTL adapter for serial console (pinout available here: https://milkv.io/docs/mars/getting-started/setup)</dd>
+        <dd>USB to TTL adapter for serial console</dd>
     <dt>Connect to the serial console</dt>
         <dd>sudo screen /dev/ttyUSB0 115200</dd>
     <dt>Power on the board</dt>