diff --git a/Makefile b/Makefile index 9d74e3d185e..21f922e4d9f 100644 --- a/Makefile +++ b/Makefile @@ -478,7 +478,7 @@ docker-tests: integration-test-images $(RUNTIME_BIN) @$(call install_runtime_noreload,$(RUNTIME)-overlay,--overlay2=all:self) # Used by TestOverlay*. @$(call install_runtime_noreload,$(RUNTIME)-net-uds,--network-proxy-path=$(NET_PROXY_SOCKET)) # Used by TestExternalUDSProxy*. @$(call install_runtime,$(RUNTIME)-cgroupv2,--in-sandbox-cgroup=v2) # Used by TestSystemd* and TestPIDFDSelftests. - @$(call test_runtime_cached,$(RUNTIME),--test_env=TEST_SAVE_RESTORE_NETSTACK=true -- $(INTEGRATION_TARGETS) //test/e2e:integration_runtime_test //test/e2e:runtime_in_docker_test //test/e2e:uds_proxy_test) + @$(call test_runtime_cached,$(RUNTIME),-- $(INTEGRATION_TARGETS) //test/e2e:integration_runtime_test //test/e2e:runtime_in_docker_test //test/e2e:uds_proxy_test) .PHONY: docker-tests plugin-network-tests: integration-test-images $(RUNTIME_BIN) diff --git a/test/runner/defs.bzl b/test/runner/defs.bzl index 6fe30d7b132..2caf8aa442b 100644 --- a/test/runner/defs.bzl +++ b/test/runner/defs.bzl @@ -80,7 +80,6 @@ def _syscall_test( leak_check = False, save = False, save_resume = False, - netstack_sr = False, nftables = False, kvm_use_cpu_nums = True, in_sandbox_cgroup = "v1", @@ -104,8 +103,6 @@ def _syscall_test( name += "_save" if save_resume: name += "_save_resume" - if save and netstack_sr: - name += "_netstack_save" if nftables: name += "_nftables" @@ -179,7 +176,6 @@ def _syscall_test( "--leak-check=" + str(leak_check), "--save=" + str(save), "--save-resume=" + str(save_resume), - "--netstack-sr=" + str(netstack_sr), "--nftables=" + str(nftables), "--kvm-use-cpu-nums=" + str(kvm_use_cpu_nums), ] @@ -229,7 +225,6 @@ def syscall_test_variants( size = "medium", timeout = None, overlay = False, - netstack_sr = False, nftables = False, kvm_use_cpu_nums = False, in_sandbox_cgroup = "v1", @@ -259,7 +254,6 @@ def syscall_test_variants( timeout: timeout for the test. save_resume: save resume test. overlay: add overlayfs test variants. - netstack_sr: if save is true, add netstack save/restore test variants. nftables: if nftables is true, enable nftables. kvm_use_cpu_nums: use cpu numbers in kvm platform. in_sandbox_cgroup: cgroup version to use inside the sandbox. @@ -288,7 +282,6 @@ def syscall_test_variants( size = size, timeout = timeout, overlay = overlay, - netstack_sr = netstack_sr, nftables = nftables, kvm_use_cpu_nums = kvm_use_cpu_nums, in_sandbox_cgroup = in_sandbox_cgroup, @@ -315,7 +308,6 @@ def syscall_test_variants( save_resume = save_resume, size = size, timeout = timeout, - netstack_sr = netstack_sr, nftables = nftables, kvm_use_cpu_nums = kvm_use_cpu_nums, in_sandbox_cgroup = in_sandbox_cgroup, @@ -344,7 +336,6 @@ def syscall_test_variants( save_resume = save_resume, size = size, timeout = timeout, - netstack_sr = netstack_sr, nftables = nftables, kvm_use_cpu_nums = kvm_use_cpu_nums, in_sandbox_cgroup = in_sandbox_cgroup, @@ -371,7 +362,6 @@ def syscall_test_variants( save_resume = save_resume, size = size, timeout = timeout, - netstack_sr = netstack_sr, nftables = nftables, kvm_use_cpu_nums = kvm_use_cpu_nums, in_sandbox_cgroup = in_sandbox_cgroup, @@ -396,7 +386,6 @@ def syscall_test_variants( save_resume = save_resume, size = size, timeout = timeout, - netstack_sr = netstack_sr, nftables = nftables, kvm_use_cpu_nums = kvm_use_cpu_nums, in_sandbox_cgroup = in_sandbox_cgroup, @@ -424,7 +413,6 @@ def syscall_test( save = None, size = "medium", overlay = False, - netstack_sr = False, nftables = False, perf = False, kvm_use_cpu_nums = False, @@ -453,7 +441,6 @@ def syscall_test( save: enables save/restore and save/resume test variants. size: test size. overlay: add overlayfs test variants. - netstack_sr: if save is true, add netstack save/restore test variants. nftables: if nftables is true, enable nftables. perf: test is a benchmark. kvm_use_cpu_nums: use cpu numbers in kvm platform. @@ -514,7 +501,6 @@ def syscall_test( False, # save_resume, generate all tests without save_resume variant. size, overlay = overlay, - netstack_sr = False, nftables = nftables, kvm_use_cpu_nums = kvm_use_cpu_nums, in_sandbox_cgroup = in_sandbox_cgroup, @@ -547,42 +533,12 @@ def syscall_test( False, # save_resume, generate all tests without save_resume variant. "large", # size, use size as large by default for all S/R tests. "long", # timeout, use long timeout for S/R tests. - netstack_sr = False, nftables = nftables, kvm_use_cpu_nums = kvm_use_cpu_nums, in_sandbox_cgroup = in_sandbox_cgroup, **kwargs ) - if netstack_sr: - syscall_test_variants( - test, - use_tmpfs, - add_fusefs, - add_overlay, - add_host_uds, - add_host_connector, - add_host_fifo, - add_host_tty, - add_hostinet, - add_directfs, - one_sandbox, - iouring, - allow_native, - leak_check, - debug, - container, - tags, - True, # save, generate all tests with save variant. - False, # save_resume, generate all tests without save_resume variant. - "large", # size, use size as large by default for all S/R tests. - "long", # timeout, use long timeout for S/R tests. - netstack_sr = True, # netstack_sr, generate all tests with netstack s/r. - nftables = nftables, - kvm_use_cpu_nums = kvm_use_cpu_nums, - **kwargs - ) - # Add save resume variant to all other variants generated above. syscall_test_variants( test, @@ -606,7 +562,6 @@ def syscall_test( True, # save_resume, generate all tests with save_resume variant. "large", # size, use size as large by default for all S/R tests. "long", # timeout, use long timeout for S/R tests. - netstack_sr = False, nftables = nftables, kvm_use_cpu_nums = kvm_use_cpu_nums, in_sandbox_cgroup = in_sandbox_cgroup, diff --git a/test/runner/main.go b/test/runner/main.go index 73c55fed565..23ca9b137eb 100644 --- a/test/runner/main.go +++ b/test/runner/main.go @@ -78,7 +78,6 @@ var ( waitForPid = flag.Duration("delay-for-debugger", 0, "Print out the sandbox PID and wait for the specified duration to start the test. This is useful for attaching a debugger to the runsc-sandbox process.") save = flag.Bool("save", false, "enables save restore") saveResume = flag.Bool("save-resume", false, "enables save resume") - netstackSR = flag.Bool("netstack-sr", false, "enables netstack s/r") nftables = flag.Bool("nftables", false, "enables nftables") kvmUseCPUNums = flag.Bool("kvm-use-cpu-nums", false, "use cpu numbers in kvm platform") inSandboxCgroup = flag.String("in-sandbox-cgroup", "v1", "cgroup setup to use inside the sandbox (v1 or v2)") @@ -487,9 +486,6 @@ func runRunsc(tc *gtest.TestCase, spec *specs.Spec) error { // Create the state file. if *save || *saveResume { - if *netstackSR { - args = append(args, "--save-restore-netstack=true") - } saveArgs = args args, currentSaveDir, err = prepareSave(args, undeclaredOutputsDir, 0) if err != nil { diff --git a/test/syscalls/BUILD b/test/syscalls/BUILD index 150759522c5..3156855dbf1 100644 --- a/test/syscalls/BUILD +++ b/test/syscalls/BUILD @@ -502,7 +502,6 @@ syscall_test( syscall_test( add_hostinet = True, - netstack_sr = True, test = "//test/syscalls/linux:network_namespace_test", ) @@ -526,7 +525,6 @@ syscall_test( syscall_test( add_hostinet = True, - netstack_sr = True, test = "//test/syscalls/linux:packet_socket_dgram_test", ) @@ -896,20 +894,17 @@ syscall_test( syscall_test( add_hostinet = True, - netstack_sr = True, test = "//test/syscalls/linux:socket_ipv4_udp_unbound_external_networking_test", ) syscall_test( # TODO(b/446206378): TestJoinLeaveMulticast fails with add_hostinet. - netstack_sr = True, test = "//test/syscalls/linux:socket_ipv6_udp_unbound_external_networking_test", ) syscall_test( size = "large", add_hostinet = True, - netstack_sr = True, shard_count = most_shards, test = "//test/syscalls/linux:socket_ip_tcp_generic_loopback_test", ) @@ -990,7 +985,6 @@ syscall_test( syscall_test( add_hostinet = True, - netstack_sr = True, test = "//test/syscalls/linux:socket_ipv6_udp_unbound_loopback_netlink_test", ) @@ -1011,7 +1005,6 @@ syscall_test( syscall_test( add_hostinet = True, - netstack_sr = True, test = "//test/syscalls/linux:socket_ip_unbound_netlink_test", ) @@ -1133,7 +1126,6 @@ syscall_test( syscall_test( size = "medium", - netstack_sr = True, shard_count = most_shards, test = "//test/syscalls/linux:socket_unix_stream_test", ) @@ -1286,14 +1278,12 @@ syscall_test( syscall_test( size = "medium", add_hostinet = True, - netstack_sr = True, shard_count = more_shards, test = "//test/syscalls/linux:udp_socket_test", ) syscall_test( add_hostinet = True, - netstack_sr = True, test = "//test/syscalls/linux:udp_raw_socket_test", )