Merge pull request #3357 from arixmkii/wsl2-port-forwarding

Enable port forwarding tests for WSL2

Author: AkihiroSuda

.github/workflows/test.yml

@@ -166,12 +166,13 @@ jobs:
       run: make
     - name: Integration tests (WSL2, Windows host)
       run: |
-        $env:Path = "$pwd\_output\bin;" + 'C:\Program Files\Git\usr\bin;' + $env:Path
-        Set-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH -Value $env:Path
-        $env:MSYS2_ENV_CONV_EXCL='HOME_HOST;HOME_GUEST'
-        $env:HOME_HOST=$(cygpath.exe "$env:USERPROFILE")
-        $env:HOME_GUEST="/mnt$env:HOME_HOST"
-        $env:LIMACTL_CREATE_ARGS='--vm-type=wsl2 --mount-type=wsl2 --containerd=system'
+        $env:PATH = "$pwd\_output\bin;" + 'C:\msys64\usr\bin;' + $env:PATH
+        pacman -Sy --noconfirm openbsd-netcat diffutils
+        $env:MSYS2_ENV_CONV_EXCL = 'HOME_HOST;HOME_GUEST;_LIMA_WINDOWS_EXTRA_PATH'
+        $env:HOME_HOST = $(cygpath.exe "$env:USERPROFILE")
+        $env:HOME_GUEST = "/mnt$env:HOME_HOST"
+        $env:LIMACTL_CREATE_ARGS = '--vm-type=wsl2 --mount-type=wsl2 --containerd=system'
+        $env:_LIMA_WINDOWS_EXTRA_PATH = 'C:\Program Files\Git\usr\bin'
         bash.exe -c "./hack/test-templates.sh templates/experimental/wsl2.yaml"
 
   qemu:

hack/test-port-forwarding.pl

@@ -68,6 +68,9 @@
 # Otherwise $instance must be the name of an already running instance that has been
 # configured with our portForwards settings.
 
+my $instanceType = qx(limactl ls --json "$instance" | jq -r '.vmType' | sed s/x/x/);
+chomp $instanceType;
+
 # Get sshLocalPort for lima instance
 my $sshLocalPort;
 open(my $ls, "limactl ls --json |") or die;
@@ -96,12 +99,20 @@
     /^(forward|ignore):\s+([0-9.:]+)\s+(\d+)(?:\s+→)?(?:\s+([0-9.:]+)(?:\s+(\d+))?)?/;
     die "Cannot parse test '$_'" unless $1;
     my %test; @test{qw(mode guest_ip guest_port host_ip host_port)} = ($1, $2, $3, $4, $5);
+    $test{host_ip} ||= "127.0.0.1";
+    $test{host_port} ||= $test{guest_port};
     if ($test{mode} eq "forward" && $test{host_port} < 1024 && $Config{osname} ne "darwin") {
         printf "🚧 Not supported on $Config{osname}: # $_\n";
         next;
     }
-    $test{host_ip} ||= "127.0.0.1";
-    $test{host_port} ||= $test{guest_port};
+    if ($test{mode} eq "ignore" && ($test{guest_ip} eq "0.0.0.0" || $test{guest_ip} eq "127.0.0.1") && "$instanceType" eq "wsl2") {
+        printf "🚧 Not supported for $instanceType machines: # $_\n";
+        next;
+    }
+    if ($test{guest_ip} eq "192.168.5.15" && "$instanceType" eq "wsl2") {
+        printf "🚧 Not supported for $instanceType machines: # $_\n";
+        next;
+    }
 
     my $remote = JoinHostPort($test{guest_ip},$test{guest_port});
     my $local = JoinHostPort($test{host_ip},$test{host_port});

hack/test-templates.sh

@@ -93,7 +93,6 @@ case "$NAME" in
 "wsl2")
 	# TODO https://github.com/lima-vm/lima/issues/3268
 	CHECKS["proxy-settings"]=
-	CHECKS["port-forwards"]=
 	;;
 esac