From 8042c6f3f5bc39feaa4bddfe076556043f937541 Mon Sep 17 00:00:00 2001
From: Etienne Perot <eperot@google.com>
Date: Fri, 1 Dec 2023 18:28:47 -0800
Subject: [PATCH] Rename existing GPU tests to GPU *smoke* tests.

This is their current function, and it is useful to have smoke tests for
the gVisor release pipeline.

GPU tests that aren't of the "hello world" variety require multi-GiB
images and longer time to run, so we need to have them as separate
targets so that they can be run separately from the smoke tests.

PiperOrigin-RevId: 587187005
---
 .buildkite/pipeline.yaml                    |  4 ++--
 .buildkite/release.yaml                     |  2 +-
 Makefile                                    | 20 ++++++++++----------
 test/gpu/BUILD                              |  4 ++--
 test/gpu/{gpu_test.go => gpu_smoke_test.go} |  0
 tools/gpu/all_drivers_test.sh               |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)
 rename test/gpu/{gpu_test.go => gpu_smoke_test.go} (100%)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index a2bf25917..726e42a5b 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -174,14 +174,14 @@ steps:
     label: ":firefighter: GPU Smoke Test"
     commands:
       - make sudo TARGETS=//tools/gpu:main ARGS="install --latest" || cat /var/log/nvidia-installer.log
-      - make gpu-tests RUNTIME_ARGS="--strace --debug"
+      - make gpu-smoke-tests RUNTIME_ARGS="--strace --debug"
     agents:
       queue: gpu
   - <<: *common
     <<: *source_test_continuous
     label: ":female_supervillain: COS GPU Smoke Test"
     commands:
-      - make cos-gpu-tests RUNTIME_ARGS="--strace --debug"
+      - make cos-gpu-smoke-tests RUNTIME_ARGS="--strace --debug"
     agents:
       queue: cos-canary-gpu
   - <<: *common
diff --git a/.buildkite/release.yaml b/.buildkite/release.yaml
index 5e56c64f9..c44a104c3 100644
--- a/.buildkite/release.yaml
+++ b/.buildkite/release.yaml
@@ -48,7 +48,7 @@ steps:
   - <<: *common
     label: ":female_supervillain: COS GPU Smoke Test"
     commands:
-      - make cos-gpu-tests RUNTIME_ARGS="--strace --debug"
+      - make cos-gpu-smoke-tests RUNTIME_ARGS="--strace --debug"
     agents:
       queue: cos-canary-gpu
   - <<: *common
diff --git a/Makefile b/Makefile
index 4df2e792d..cdc2bbfed 100644
--- a/Makefile
+++ b/Makefile
@@ -273,17 +273,17 @@ arm-qemu-smoke-test: $(RUNTIME_BIN) load-arm-qemu
 simple-tests: unit-tests # Compatibility target.
 .PHONY: simple-tests
 
-gpu-tests: load-basic_cuda-vector-add load-gpu_cuda-tests $(RUNTIME_BIN)
-	@$(call test,--test_env=RUNTIME=runc //test/gpu:gpu_test)
-	@$(call install_runtime,$(RUNTIME),--platform=systrap --nvproxy=true --nvproxy-docker=true)
-	@$(call sudo,test/gpu:gpu_test,--runtime=$(RUNTIME) -test.v $(ARGS))
-.PHONY: gpu-tests
+gpu-smoke-tests: load-basic_cuda-vector-add load-gpu_cuda-tests $(RUNTIME_BIN)
+	@$(call test,--test_env=RUNTIME=runc //test/gpu:gpu_smoke_test)
+	@$(call install_runtime,$(RUNTIME),--nvproxy=true --nvproxy-docker=true)
+	@$(call sudo,test/gpu:gpu_smoke_test,--runtime=$(RUNTIME) -test.v $(ARGS))
+.PHONY: gpu-smoke-tests
 
-cos-gpu-tests: load-basic_cuda-vector-add load-gpu_cuda-tests $(RUNTIME_BIN)
-	@$(call sudo,test/gpu:gpu_test,--runtime=runc -test.v --cos-gpu $(ARGS))
-	@$(call install_runtime,$(RUNTIME),--platform=systrap --nvproxy=true)
-	@$(call sudo,test/gpu:gpu_test,--runtime=$(RUNTIME) -test.v --cos-gpu $(ARGS))
-.PHONY: cos-gpu-tests
+cos-gpu-smoke-tests: load-basic_cuda-vector-add load-gpu_cuda-tests $(RUNTIME_BIN)
+	@$(call sudo,test/gpu:gpu_smoke_test,--runtime=runc -test.v --cos-gpu $(ARGS))
+	@$(call install_runtime,$(RUNTIME),--nvproxy=true)
+	@$(call sudo,test/gpu:gpu_smoke_test,--runtime=$(RUNTIME) -test.v --cos-gpu $(ARGS))
+.PHONY: cos-gpu-smoke-tests
 
 portforward-tests: load-basic_redis load-basic_nginx $(RUNTIME_BIN)
 	@$(call install_runtime,$(RUNTIME),--network=sandbox)
diff --git a/test/gpu/BUILD b/test/gpu/BUILD
index 98fd89c0b..f8c5df9e4 100644
--- a/test/gpu/BUILD
+++ b/test/gpu/BUILD
@@ -6,8 +6,8 @@ package(
 )
 
 go_test(
-    name = "gpu_test",
-    srcs = ["gpu_test.go"],
+    name = "gpu_smoke_test",
+    srcs = ["gpu_smoke_test.go"],
     tags = [
         "local",
         "noguitar",
diff --git a/test/gpu/gpu_test.go b/test/gpu/gpu_smoke_test.go
similarity index 100%
rename from test/gpu/gpu_test.go
rename to test/gpu/gpu_smoke_test.go
diff --git a/tools/gpu/all_drivers_test.sh b/tools/gpu/all_drivers_test.sh
index e9a560642..327d0095b 100755
--- a/tools/gpu/all_drivers_test.sh
+++ b/tools/gpu/all_drivers_test.sh
@@ -26,5 +26,5 @@ read -r -a versions <<< "$(cat "${tmp_file}")"
 
 for driver in "${versions[@]}"; do
   make sudo TARGETS=tools/gpu:main ARGS="install --version ${driver}"
-  make gpu-tests
-done
\ No newline at end of file
+  make gpu-smoke-tests
+done