diff --git a/Makefile b/Makefile index 5fa66bc3f..f3a6290a4 100644 --- a/Makefile +++ b/Makefile @@ -231,6 +231,10 @@ syscall-tests: ## Run all system call tests. @$(call test,$(PARTITIONS) test/syscalls/...) .PHONY: syscall-tests +packetimpact-tests: + @$(call test,--jobs=HOST_CPUS*3 --local_test_jobs=HOST_CPUS*3 //test/packetimpact/tests:all_tests) +.PHONY: packetimpact-tests + %-runtime-tests: load-runtimes_% $(RUNTIME_BIN) @$(call install_runtime,$(RUNTIME),) # Ensure flags are cleared. @$(call test_runtime,$(RUNTIME),--test_timeout=10800 //test/runtimes:$*) @@ -302,13 +306,6 @@ packetdrill-tests: load-packetdrill $(RUNTIME_BIN) @$(call test_runtime,$(RUNTIME),//test/packetdrill:all_tests) .PHONY: packetdrill-tests -packetimpact-tests: load-packetimpact $(RUNTIME_BIN) - @sudo modprobe iptable_filter - @sudo modprobe ip6table_filter - @$(call install_runtime,$(RUNTIME),) # Clear flags. - @$(call test_runtime,$(RUNTIME),--jobs=HOST_CPUS*3 --local_test_jobs=HOST_CPUS*3 //test/packetimpact/tests:all_tests) -.PHONY: packetimpact-tests - fsstress-test: load-basic $(RUNTIME_BIN) @$(call install_runtime,$(RUNTIME),--vfs2) @$(call test_runtime,$(RUNTIME),//test/fsstress:fsstress_test) diff --git a/images/packetimpact/Dockerfile b/images/packetimpact/Dockerfile deleted file mode 100644 index 906d5cdd6..000000000 --- a/images/packetimpact/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:focal -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - # iptables to disable OS native packet processing. - iptables \ - # nc to check that the posix_server is running. - netcat \ - # tcpdump to log brief packet sniffing. - tcpdump \ - # ip link show to display MAC addresses. - iproute2 \ - # tshark to log verbose packet sniffing. - tshark \ - # killall for cleanup. - psmisc \ - # qemu-system-x86 to emulate fuchsia. - qemu-system-x86 \ - # sha1sum to generate entropy. - libdigest-sha-perl diff --git a/test/packetimpact/runner/main.go b/test/packetimpact/runner/main.go index 0590f4b39..f5e9d82fe 100644 --- a/test/packetimpact/runner/main.go +++ b/test/packetimpact/runner/main.go @@ -95,15 +95,12 @@ func main() { } var ( - dutBinary string - testBinary string - expectFailure bool - numDUTs int - variant string - runtime string - partition int - totalPartitions int - dutArgs dutArgList + dutBinary string + testBinary string + expectFailure bool + numDUTs int + variant string + dutArgs dutArgList ) fs := flag.NewFlagSet(os.Args[0], flag.ContinueOnError) fs.StringVar(&dutBinary, "dut_binary", "", "path to the DUT binary") @@ -112,10 +109,6 @@ func main() { fs.IntVar(&numDUTs, "num_duts", 1, "number of DUTs to create") fs.StringVar(&variant, "variant", "", "test variant could be native, gvisor or fuchsia") fs.Var(&dutArgs, "dut_arg", "argument to the DUT binary") - // The following args are passed by CI environment which are not used by us. - fs.StringVar(&runtime, "runtime", "", "docker runtime to use (unused)") - fs.IntVar(&partition, "partition", 1, "1-indexed partition (unused)") - fs.IntVar(&totalPartitions, "total_partitions", 1, "total partitions (unused)") if err := fs.Parse(os.Args[1:]); err != nil { log.Fatal(err) }