WIP install: new variant to select ipv4 or ipv6 for the installer

This allows upgrading installer with network_config6 support with
patches from https://github.com/xcp-ng/host-installer/commits/ipv6/
(assumes you have that in ~/src/xs/host-installer)

* just using network_config=none to try beneficiating from default
  ipv6 autoconf bombs out because of lack of v6 config
* network_config6=autoconf currently gets no DNS configuration, so only
  works if not using the network for installation AND numeric IP address
  for ARP_SERVER, so is left out for now

FIXME:
- this uses an unreleased installer patch
- should support upg and rst

Author: ydirson

tests/install/conftest.py

@@ -121,10 +121,12 @@ def system_disks_names(request):
 #     in contexts where the same IP is reused by successively different MACs
 #     (when cloning VMs from cache)
 @pytest.fixture(scope='function')
-def remastered_iso(installer_iso, answerfile):
+def remastered_iso(request, installer_iso, answerfile):
     iso_file = installer_iso['iso']
     unsigned = installer_iso['unsigned']
 
+    install_iface = request.getfixturevalue("install_iface")
+
     assert "iso-remaster" in TOOLS
     iso_remaster = TOOLS["iso-remaster"]
     assert os.access(iso_remaster, os.X_OK)
@@ -161,6 +163,9 @@ def remastered_iso(installer_iso, answerfile):
 test ! -e "{answerfile_xml}" ||
     cp "{answerfile_xml}" "$INSTALLIMG/root/answerfile.xml"
 
+HOSTINSTALLER=$HOME/src/xs/host-installer
+make -C "$HOSTINSTALLER" DESTDIR="$INSTALLIMG" XS_MPATH_CONF="$HOME/src/xapi/sm/multipath/multipath.conf"
+
 mkdir -p "$INSTALLIMG/usr/local/sbin"
 cat > "$INSTALLIMG/usr/local/sbin/test-pingpxe.sh" << 'EOF'
 #! /bin/bash
@@ -187,8 +192,8 @@ def remastered_iso(installer_iso, answerfile):
     PINGARGS="-c1"
 fi
 
-# detect lack of ipv4 in installed host
-if grep -q "^MODE='none'\\$" /etc/firstboot.d/data/management.conf; then
+# detect lack of ipv4 both in installer and in installed host
+if grep -q -w network_config=none /proc/cmdline || grep -q "^MODE='none'\\$" /etc/firstboot.d/data/management.conf; then
     PINGARGS+=" -6"
 fi
 
@@ -252,6 +257,11 @@ def remastered_iso(installer_iso, answerfile):
 set -ex
 ISODIR="$1"
 SED_COMMANDS=(-e "s@/vmlinuz@/vmlinuz network_device=all sshpassword={passwd} atexit=shell@")
+case "{install_iface}" in
+ipv4dhcp) ;;
+ipv6dhcp) SED_COMMANDS+=(-e "s@/vmlinuz@/vmlinuz network_config=none network_config6=dhcp@") ;;
+*) echo >&2 "ERROR unhandled install_iface '{install_iface}'"; exit 1 ;;
+esac
 test ! -e "{answerfile_xml}" ||
     SED_COMMANDS+=(-e "s@/vmlinuz@/vmlinuz install answerfile=file:///root/answerfile.xml@")
 # assuming *gpgcheck only appear within unsigned ISO

tests/install/test.py

@@ -47,6 +47,7 @@ class TestNested:
     @pytest.mark.parametrize("local_sr", ("nosr", "ext", "lvm"))
     @pytest.mark.parametrize("package_source", ("iso", "net"))
     @pytest.mark.parametrize("system_disk_config", ("disk", "raid1"))
+    @pytest.mark.parametrize("install_iface", ("ipv4dhcp", "ipv6dhcp"))
     @pytest.mark.parametrize("iso_version", (
         "83nightly", "830net",
         "830",
@@ -136,7 +137,7 @@ class TestNested:
             else ValueError(f"system_disk_config {system_disk_config!r}"),
         ))
     def test_install(self, vm_booted_with_installer, system_disks_names,
-                     firmware, iso_version, package_source, system_disk_config, local_sr, admin_iface):
+                     firmware, iso_version, install_iface, package_source, system_disk_config, local_sr, admin_iface):
         host_vm = vm_booted_with_installer
         installer.monitor_install(ip=host_vm.ip)
 
@@ -146,6 +147,7 @@ def test_install(self, vm_booted_with_installer, system_disks_names,
     @pytest.mark.parametrize("package_source", ("iso", "net"))
     @pytest.mark.parametrize("system_disk_config", ("disk", "raid1"))
     @pytest.mark.parametrize("machine", ("host1", "host2"))
+    @pytest.mark.parametrize("install_iface", ("ipv4dhcp", "ipv6dhcp"))
     @pytest.mark.parametrize("version", (
         "83nightly", "830net",
         "830",
@@ -158,12 +160,12 @@ def test_install(self, vm_booted_with_installer, system_disks_names,
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda version, firmware, local_sr, admin_iface, package_source, system_disk_config: [dict(
+        lambda version, firmware, install_iface, local_sr, admin_iface, package_source, system_disk_config: [dict(
             vm="vm1",
-            image_test=(f"TestNested::test_install[{firmware}-{version}-{system_disk_config}"
+            image_test=(f"TestNested::test_install[{firmware}-{version}-{install_iface}-{system_disk_config}"
                         f"-{package_source}-{local_sr}-{admin_iface}]"))])
     def test_tune_firstboot(self, create_vms, helper_vm_with_plugged_disk,
-                            firmware, version, machine, local_sr, admin_iface, package_source, system_disk_config):
+                            firmware, version, install_iface, machine, local_sr, admin_iface, package_source, system_disk_config):
         helper_vm = helper_vm_with_plugged_disk
 
         if system_disk_config == "disk":
@@ -374,6 +376,7 @@ def _test_firstboot(self, create_vms, mode, admin_iface, *, machine='DEFAULT', i
     @pytest.mark.parametrize("package_source", ("iso", "net"))
     @pytest.mark.parametrize("system_disk_config", ("disk", "raid1"))
     @pytest.mark.parametrize("machine", ("host1", "host2"))
+    @pytest.mark.parametrize("install_iface", ("ipv4dhcp", "ipv6dhcp"))
     @pytest.mark.parametrize("version", (
         "83nightly", "830net",
         "830",
@@ -386,13 +389,13 @@ def _test_firstboot(self, create_vms, mode, admin_iface, *, machine='DEFAULT', i
     ))
     @pytest.mark.parametrize("firmware", ("uefi", "bios"))
     @pytest.mark.continuation_of(
-        lambda firmware, version, machine, local_sr, admin_iface, package_source, system_disk_config: [
+        lambda firmware, version, install_iface, machine, local_sr, admin_iface, package_source, system_disk_config: [
             dict(vm="vm1",
                  image_test=("TestNested::test_tune_firstboot"
-                             f"[None-{firmware}-{version}-{machine}-{system_disk_config}"
+                             f"[None-{firmware}-{version}-{install_iface}-{machine}-{system_disk_config}"
                              f"-{package_source}-{local_sr}-{admin_iface}]"))])
     def test_boot_inst(self, create_vms,
-                       firmware, version, machine, package_source, system_disk_config, local_sr, admin_iface):
+                       firmware, version, install_iface, machine, package_source, system_disk_config, local_sr, admin_iface):
         self._test_firstboot(create_vms, version, admin_iface, machine=machine)
 
     @pytest.mark.usefixtures("xcpng_chained")