Speedup Ruby test and hopefully reduce its flakiness

The Ruby test is flaky: 7 fails in 1000 runs. This CL creates the test image with the depencies ahead-of-time instead of just-in-time which brings down the test time from ~23s to below 2s.

It also adds docker logs when the test fails. This should help with debugging hard to reproduce fails.

PiperOrigin-RevId: 862091724

Author: AnilAltinay

Makefile

@@ -249,6 +249,9 @@ integration-tests: docker-tests overlay-tests hostnet-tests swgso-tests
 integration-tests: do-tests kvm-tests containerd-tests-min
 .PHONY: integration-tests
 
+integration-test-images: load-image-test load-basic
+.PHONY: integration-test-images
+
 network-tests: ## Run all networking integration tests.
 network-tests: iptables-tests packetdrill-tests packetimpact-tests
 .PHONY: network-tests
@@ -367,7 +370,7 @@ portforward-tests: load-basic_redis load-basic_nginx $(RUNTIME_BIN)
 # Standard integration targets.
 INTEGRATION_TARGETS := //test/image:image_test //test/e2e:integration_test
 
-docker-tests: load-basic $(RUNTIME_BIN)
+docker-tests: integration-test-images $(RUNTIME_BIN)
 	@$(call install_runtime,$(RUNTIME),) # Clear flags.
 	@$(call install_runtime,$(RUNTIME)-docker,--net-raw --allow-packet-socket-write) # Used by TestDocker*.
 	@$(call install_runtime,$(RUNTIME)-fdlimit,--fdlimit=2000) # Used by TestRlimitNoFile.
@@ -378,30 +381,30 @@ docker-tests: load-basic $(RUNTIME_BIN)
 	@$(call test_runtime_cached,$(RUNTIME),$(INTEGRATION_TARGETS) --test_env=TEST_SAVE_RESTORE_NETSTACK=true //test/e2e:integration_runtime_test //test/e2e:runtime_in_docker_test)
 .PHONY: docker-tests
 
-plugin-network-tests: load-basic $(RUNTIME_BIN)
+plugin-network-tests: integration-test-images $(RUNTIME_BIN)
 	@$(call install_runtime,$(RUNTIME)-dpdk,--network=plugin)
 	@$(call test_runtime_cached,$(RUNTIME)-dpdk, --test_arg=-test.run=ConnectToSelf $(INTEGRATION_TARGETS))
 
 plugin-network-tests: RUNSC_TARGET=--config plugin-tldk //runsc:runsc-plugin-stack
 
-overlay-tests: load-basic $(RUNTIME_BIN)
+overlay-tests: integration-test-images $(RUNTIME_BIN)
 	@$(call install_runtime,$(RUNTIME)-overlay,--overlay2=all:dir=/tmp)
 	@$(call install_runtime,$(RUNTIME)-overlay-docker,--net-raw --allow-packet-socket-write --overlay2=all:dir=/tmp)
 	@$(call test_runtime_cached,$(RUNTIME)-overlay,--test_env=TEST_OVERLAY=true $(INTEGRATION_TARGETS))
 .PHONY: overlay-tests
 
-swgso-tests: load-basic $(RUNTIME_BIN)
+swgso-tests: integration-test-images $(RUNTIME_BIN)
 	@$(call install_runtime,$(RUNTIME)-swgso,--software-gso=true --gso=false)
 	@$(call install_runtime,$(RUNTIME)-swgso-docker,--net-raw --allow-packet-socket-write --software-gso=true --gso=false)
 	@$(call test_runtime_cached,$(RUNTIME)-swgso,$(INTEGRATION_TARGETS))
 .PHONY: swgso-tests
 
-hostnet-tests: load-basic $(RUNTIME_BIN)
+hostnet-tests: integration-test-images $(RUNTIME_BIN)
 	@$(call install_runtime,$(RUNTIME)-hostnet,--network=host --net-raw)
 	@$(call test_runtime_cached,$(RUNTIME)-hostnet,--test_env=TEST_CHECKPOINT=false --test_env=TEST_HOSTNET=true --test_env=TEST_NET_RAW=true $(INTEGRATION_TARGETS))
 .PHONY: hostnet-tests
 
-kvm-tests: load-basic $(RUNTIME_BIN)
+kvm-tests: integration-test-images $(RUNTIME_BIN)
 	@(lsmod | grep -E '^(kvm_intel|kvm_amd)') || sudo modprobe kvm
 	@if ! test -w /dev/kvm; then sudo chmod a+rw /dev/kvm; fi
 	@$(call test,//pkg/sentry/platform/kvm:kvm_test)
@@ -410,7 +413,7 @@ kvm-tests: load-basic $(RUNTIME_BIN)
 	@$(call test_runtime_cached,$(RUNTIME)-kvm,$(INTEGRATION_TARGETS))
 .PHONY: kvm-tests
 
-systrap-tests: load-basic $(RUNTIME_BIN)
+systrap-tests: integration-test-images $(RUNTIME_BIN)
 	@$(call install_runtime,$(RUNTIME)-systrap,--platform=systrap)
 	@$(call install_runtime,$(RUNTIME)-systrap-docker,--net-raw --allow-packet-socket-write --platform=systrap)
 	@$(call test_runtime_cached,$(RUNTIME)-systrap,$(INTEGRATION_TARGETS))

images/image-test/ruby/Dockerfile

@@ -0,0 +1,6 @@
+FROM ruby:3.3.5
+
+RUN gem install sinatra rackup puma
+
+COPY server.rb /server.rb
+CMD ["ruby", "/server.rb"]

test/image/ruby.rb images/image-test/ruby/server.rbtest/image/ruby.rb renamed to images/image-test/ruby/server.rb

@@ -19,5 +19,4 @@
 
 get '/' do
   'Hello World'
-end
-
+end

test/image/BUILD

@@ -14,8 +14,6 @@ go_test(
     data = [
         "latin10k.txt",
         "mysql.sql",
-        "ruby.rb",
-        "ruby.sh",
         # runsc is needed to invalidate the bazel cache in case of any code changes.
         "//runsc",
     ],

test/image/image_test.go

@@ -273,6 +273,14 @@ func TestTomcat(t *testing.T) {
 	}
 }
 
+func dockerLogs(ctx context.Context, d *dockerutil.Container) string {
+	logs, err := d.Logs(ctx)
+	if err != nil {
+		return fmt.Sprintf("Failed to get docker logs: %v", err)
+	}
+	return logs
+}
+
 func TestRuby(t *testing.T) {
 	ctx := context.Background()
 	d := dockerutil.MakeContainer(ctx, t)
@@ -281,10 +289,10 @@ func TestRuby(t *testing.T) {
 	// Execute the ruby workload.
 	port := 8080
 	opts := dockerutil.RunOpts{
-		Image: "basic/ruby",
+		Image: "image-test/ruby",
 	}
-	d.CopyFiles(&opts, "/src", "test/image/ruby.rb", "test/image/ruby.sh")
-	if err := d.Spawn(ctx, opts, "/src/ruby.sh"); err != nil {
+
+	if err := d.Spawn(ctx, opts); err != nil {
 		t.Fatalf("docker run failed: %v", err)
 	}
 
@@ -294,26 +302,26 @@ func TestRuby(t *testing.T) {
 		t.Fatalf("docker.FindIP failed: %v", err)
 	}
 
-	// Wait until it's up and running, 'gem install' can take some time.
+	// Wait until it's up and running.
 	if err := testutil.WaitForHTTP(ip.String(), port, time.Minute); err != nil {
-		t.Fatalf("WaitForHTTP() timeout: %v", err)
+		t.Fatalf("WaitForHTTP() timeout: %v, docker logs: %v", err, dockerLogs(ctx, d))
 	}
 
 	// Ensure that content is being served.
 	url := fmt.Sprintf("http://%s:%d", ip.String(), port)
 	resp, err := http.Get(url)
 	if err != nil {
-		t.Errorf("error reaching http server: %v", err)
+		t.Errorf("error reaching http server: %v, docker logs: %v", err, dockerLogs(ctx, d))
 	}
 	if want := http.StatusOK; resp.StatusCode != want {
-		t.Errorf("wrong response code, got: %d, want: %d", resp.StatusCode, want)
+		t.Errorf("wrong response code, got: %d, want: %d, docker logs: %v", resp.StatusCode, want, dockerLogs(ctx, d))
 	}
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		t.Fatalf("error reading body: %v", err)
+		t.Fatalf("error reading body: %v, docker logs: %v", err, dockerLogs(ctx, d))
 	}
 	if got, want := string(body), "Hello World"; !strings.Contains(got, want) {
-		t.Errorf("invalid body content, got: %q, want: %q", got, want)
+		t.Errorf("invalid body content, got: %q, want: %q, docker logs: %v", got, want, dockerLogs(ctx, d))
 	}
 }