Merge ~cpete/ubuntu-manual-tests:cpete/update-amd64-netboot-tests into ubuntu-manual-tests:main

[Chris Peterson]

These changes update the amd64 pxe netboot tests, for both UEFI and BIOS. I have re-written the instructions to direct the tester to only download the netboot artifacts, which should be now be included in the Ubuntu Server Subiquity product on the iso tracker. (At least for amd64)

Additionally, I have removed references to apache, configuring autoinstall, and downloading the ISO. The netboot artifacts are always generated with the ISO build, and the bootloader configurations provided contain the URL to the respective ISO hosted on cdimage (the same url in the test download information). This means the test machine will download the correct iso directly without the user having to set up apache and serve it themselves. This also means we lose out on the simplicity of autoinstall, but I think the overall simplification of the test case is well worth it.

Lastly, I have changed the names of the test files (but not the test case numbers) to be uniform with the other Ubuntu Server Subiquity amd64 testcases. This may require remapping these tests in the isotracker.

[Steve Langasek (vorlon)]

Looks good, but there are a few things that should be adjusted before landing this. Inline comments apply to both test cases for the most part

review: Needs Fixing

[Chris Peterson (cpete)]

Thank you for the review. I addressed all of your comments and made subsequent changes. I also added a note to the top of the testcase making explicit what the instructions are asking the tester to setup, with a link to https://wiki.ubuntu.com/UEFI/SecureBoot/PXE-IPv6 for further information on setting up a PXE server.

Going to try force-pushing the commit to keep commit history clean, but I hope this doesn't mess up the comments here...

Edit: Force push worked.

[Steve Langasek (vorlon)]

review: Approve

diff --git a/testcases/image/1734_Netinstall (amd64 server live) b/testcases/image/1734_Netinstall (amd64 server live)
deleted file mode 100644
index 12c6e11..0000000
--- a/testcases/image/1734_Netinstall (amd64 server live)
+++ /dev/null
@@ -1,37 +0,0 @@
-This testcase is to run netboot installation on amd64 machines with live images. You need an installed Ubuntu machine in the same network.
-
-<em>Proceed in your native language if you wish. Instructions will remain in English.</em>
-
-RELEASE is the current development codename.
-HOST is the IP address of installed Ubuntu machine.
-On your installed Ubuntu machine.
-
-<dl>
-    <dt>sudo apt install -y tftpd-hpa apache2</dt>
-    <dt>sudo curl http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/RELEASE-live-server-amd64.iso -o /var/www/html/test-live-server-amd64.iso</dt>
-    <dt>sudo mkdir /srv/tftp/grub</dt>
-    <dt>sudo mount -o loop,ro /var/www/html/test-live-server-amd64.iso /mnt</dt>
-    <dt>sudo cp /mnt/casper/initrd /srv/tftp</dt>
-    <dt>sudo cp /mnt/casper/vmlinuz /srv/tftp</dt>
-    <dt>sudo curl http://archive.ubuntu.com/ubuntu/dists/RELEASE/main/uefi/grub2-amd64/current/grubnetx64.efi -o /srv/tftp/grubnetx64.efi</dt>
-    <dt>echo "menuentry \"Netboot from Ubuntu Live image\" {" | sudo tee /srv/tftp/grub/grub.cfg</dt>
-    <dt>echo "  set gfxpayload=keep" | sudo tee -a /srv/tftp/grub/grub.cfg</dt>
-    <dt>echo "  linux /vmlinuz url=http://HOST/test-live-server-amd64.iso only-ubiquity ip=dhcp ---" | sudo tee -a /srv/tftp/grub/grub.cfg</dt>
-    <dt>echo "  initrd /initrd" | sudo tee -a /srv/tftp/grub/grub.cfg</dt>
-    <dt>echo "}" | sudo tee -a /srv/tftp/grub/grub.cfg</dt>
-</dl>
-
-You might also need to append machine specific kernel cmdline into grub.cfg. e.g. console=ttyS0,115200n8.
-
-Reconfigure the dhcp server for grubnetx64.efi as filename and next-server as installed Ubuntu machine. e.g.
-
-host testbed {
-  hardware ethernet 00:00:00:11:22:33;
-  next-server <host>;
-  filename "grubnetx64.efi";
-}
-
-Power on your amd64 machine and boot from ethernet. Connect to console output and you shall see grub menu. Press ENTER to load kernel and finish the installation.
-
-<strong>If you finish the installation, please <a href="results#add_result">submit</a> a 'passed' result.
-    If any 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/1734_PXE UEFI Netboot (Server live) b/testcases/image/1734_PXE UEFI Netboot (Server live)
new file mode 100644
index 0000000..1518a3f
--- /dev/null
+++ b/testcases/image/1734_PXE UEFI Netboot (Server live)
@@ -0,0 +1,71 @@
+<p>
+The purpose of this testcase is to run netboot installation on amd64 machines
+with <b>UEFI</b> firmware using live images. You need an installed Ubuntu machine
+in the same network, configured with a static IP, which will be functioning as
+a PXE server with DHCP. This testcase includes instructions for setting up the
+PXE server with DHCPv4 via dnsmasq. You can find additional information and alternative
+methods of setting up DHCP at <a href="https://wiki.ubuntu.com/UEFI/SecureBoot/PXE-IPv6">https://wiki.ubuntu.com/UEFI/SecureBoot/PXE-IPv6</a>.
+
+</p>
+
+<em>
+    Proceed in your native language if you wish. Instructions will remain in
+    English.
+</em>
+
+<ul>
+    <li>HOST is the IP address of the machine acting as the PXE server.</li>
+    <li>NETBOOT-URL is the compressed netboot artifacts archive, as listed in the
+    download links for the test case.</li>
+    <li>INTERFACE is the relevant network interface on the PXE server.</li>
+    <li>STARTADDR and ENDADDR are the start and end points for dhcp addresses to
+    be handed out on this test network.  Choose appropriate values to match
+    the static network configuration of the PXE server, and see the manpage for
+    dnsmasq for more details.</li>
+</ul>
+
+
+<p>Install dnsmasq on the PXE server:</p>
+<ol>
+    <li>sudo apt install -y dnsmasq</li>
+</ol>
+
+<p>Configure the PXE server with DHCP and TFTP by modifying <i>/etc/dnsmasq.conf</i> with:</p>
+
+<pre>
+# Base DHCP and TFTP settings
+interface=INTERFACE
+bind-interfaces
+dhcp-range=INTERFACE,STARTADDR,ENDADDR
+enable-tftp
+tftp-root=/srv/tftp
+
+# PXE boot settings
+dhcp-match=set:efi-x86_64,option:client-arch,7
+dhcp-boot=tag:efi-x86_64,amd64/bootx64.efi
+</pre>
+
+<p>Restart dnsmasq:</p>
+
+<ol>
+    <li>sudo systemctl restart dnsmasq.service</li>
+</ol>
+
+<p>Download and place the netboot artifacts:</p>
+<ol>
+    <li>sudo wget -O /tmp/netboot-artifacts.tar.gz NETBOOT-URL </li>
+    <li>sudo mkdir -p /srv/tftp/</li>
+    <li>sudo tar -zxvf /tmp/netboot-artifacts.tar.gz -C /srv/tftp/</li>
+</ol>
+
+
+
+<p>
+Power on the test machine and ensure that it boots from the network device.
+Complete the installation, using the provided defaults where possible.
+Reboot the machine and ensure that you can log into the system with the username
+and password you provided.
+</p>
+
+<strong>If you finish the installation, please <a href="results#add_result">submit</a> a 'passed' result.
+    If any 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/1759_PXE BIOS Netboot (Server live) b/testcases/image/1759_PXE BIOS Netboot (Server live)
new file mode 100644
index 0000000..56bf364
--- /dev/null
+++ b/testcases/image/1759_PXE BIOS Netboot (Server live)
@@ -0,0 +1,70 @@
+<p>
+The purpose of this testcase is to run netboot installation on amd64 machines
+with <b>BIOS</b> firmware using live images. You need an installed Ubuntu machine
+in the same network, configured with a static IP, which will be functioning as
+a PXE server with DHCP. This testcase includes instructions for setting up the
+PXE server with DHCPv4 via dnsmasq. You can find additional information and alternative
+methods of setting up DHCP at <a href="https://wiki.ubuntu.com/UEFI/SecureBoot/PXE-IPv6">https://wiki.ubuntu.com/UEFI/SecureBoot/PXE-IPv6</a>.
+
+</p>
+
+<em>
+    Proceed in your native language if you wish. Instructions will remain in
+    English.
+</em>
+
+<ul>
+    <li>HOST is the IP address of the machine acting as the PXE server.</li>
+    <li>NETBOOT-URL is the compressed netboot artifacts archive, as listed in the
+    download links for the test case.</li>
+    <li>INTERFACE is the relevant network interface on the PXE server.</li>
+    <li>STARTADDR and ENDADDR are the start and end points for dhcp addresses to
+    be handed out on this test network.  Choose appropriate values to match
+    the static network configuration of the PXE server, and see the manpage for
+    dnsmasq for more details.</li>
+</ul>
+
+
+<p>Install dnsmasq on the PXE server:</p>
+<ol>
+    <li>sudo apt install -y dnsmasq</li>
+</ol>
+
+<p>Configure the PXE server with DHCP and TFTP by modifying <i>/etc/dnsmasq.conf</i> with:</p>
+
+<pre>
+# Base DHCP and TFTP settings
+interface=INTERFACE
+bind-interfaces
+dhcp-range=INTERFACE,STARTADDR,ENDADDR
+enable-tftp
+tftp-root=/srv/tftp
+
+# PXE boot settings
+dhcp-boot=amd64/pxelinux.0
+</pre>
+
+<p>Restart dnsmasq:</p>
+
+<ol>
+    <li>sudo systemctl restart dnsmasq.service</li>
+</ol>
+
+<p>Download and place the netboot artifacts:</p>
+<ol>
+    <li>sudo wget -O /tmp/netboot-artifacts.tar.gz NETBOOT-URL </li>
+    <li>sudo mkdir -p /srv/tftp/</li>
+    <li>sudo tar -zxvf /tmp/netboot-artifacts.tar.gz -C /srv/tftp/</li>
+</ol>
+
+
+
+<p>
+Power on the test machine and ensure that it boots from the network device.
+Complete the installation, using the provided defaults where possible.
+Reboot the machine and ensure that you can log into the system with the username
+and password you provided.
+</p>
+
+<strong>If you finish the installation, please <a href="results#add_result">submit</a> a 'passed' result.
+    If any 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/1759_PXE Netboot Live Server Autoinstall b/testcases/image/1759_PXE Netboot Live Server Autoinstall
deleted file mode 100644
index 6a31db6..0000000
--- a/testcases/image/1759_PXE Netboot Live Server Autoinstall
+++ /dev/null
@@ -1,80 +0,0 @@
-<p>
-This testcase is to run netboot installation on amd64 machines with live
-images. You need an installed Ubuntu machine in the same network, configured
-with a static IP, which will be functioning as a PXE server with DHCP.
-</p>
-
-<em>
-Proceed in your native language if you wish. Instructions will remain in
-English.
-</em>
-
-<dl>
- <dt>HOST is the IP address of the machine acting as the PXE/DHCP/HTTP
-     server.</dt>
- <dt>URL is the ISO being tested, as listed in the download links for
-     the test case.</dt>
- <dt>INTERFACE is the relevant network interface on the HOST.</dt>
- <dt>STARTADDR and ENDADDR are the start and end points for dhcp addresses to
-     be handed out on this test network.  Choose appropriate values to match
-     the static network configuration of the HOST, and see the manpage for
-     dnsmasq for more details.</dt>
-</dl>
-
-<p>Setup the various services:</p>
-<dl>
- <dt>sudo apt install -y curl dnsmasq apache2 syslinux-common</dt>
- <dt>sudo curl URL -o /var/www/html/test-live-server-amd64.iso</dt>
- <dt>sudo mkdir -p /srv/tftp/pxelinux.cfg</dt>
- <dt>sudo mount -o loop,ro /var/www/html/test-live-server-amd64.iso /mnt</dt>
- <dt>sudo cp /mnt/casper/initrd /srv/tftp</dt>
- <dt>sudo cp /mnt/casper/vmlinuz /srv/tftp</dt>
- <dt>sudo cp /usr/lib/syslinux/modules/bios/ldlinux.c32 /srv/tftp</dt>
- <dt>sudo curl http://archive.ubuntu.com/ubuntu/dists/focal/main/installer-amd64/current/legacy-images/netboot/pxelinux.0 -o /srv/tftp/pxelinux.0</dt>
- <dt>sudo systemctl restart dnsmasq.service</dt>
-</dl>
-
-<p>
-Configure /etc/dnsmasq.d/pxe.conf:
-</p>
-<pre>
-interface=INTERFACE,lo
-bind-interfaces
-dhcp-range=INTERFACE,STARTADDR,ENDADDR
-dhcp-boot=pxelinux.0
-enable-tftp
-tftp-root=/srv/tftp
-</pre>
-
-<p>Configure /var/www/html/autoinstall.yaml:</p>
-<pre>
-#cloud-config
-autoinstall:
- version: 1
- identity:
-  hostname: live-server
-  # This password is ubuntu
-  # To use a different password, set the appropriate hash here.
-  # `mkpasswd`, from the 'whois' package, can help with hash creation.
-  password: $1$glNWVUKh$VxFYudlLU5FR9WDGXOK761
-  username: ubuntu
- apt:
-  fallback: offline-install
-</pre>
-
-<p>Configure /srv/tftp/pxelinux.cfg/default:</p>
-<pre>
-DEFAULT install
-LABEL install
-  KERNEL vmlinuz
-  INITRD initrd
-  APPEND root=/dev/ram0 ramdisk_size=1500000 ip=dhcp cloud-config-url=http://HOST/autoinstall.yaml url=http://HOST/test-live-server-amd64.iso autoinstall
-</pre>
-
-<p>
-Power on the test machine and ensure that it boots PXE. The install should
-complete without further interaction.
-</p>
-
-<strong>If you finish the installation, please <a href="results#add_result">submit</a> a 'passed' result.
-    If any 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>