cos-customizer: update cos-gpu-installer-v1 to v20230117
Also fix up GPU tests:
- Remove many obsolete version combinations
- Disable updates and the logging agent in tests
BUG=b/257271340
TEST=./run_tests
Change-Id: Ia5b37ebff591ae95d77e14c89e8b4ed753872b0b
Reviewed-on: https://cos-review.googlesource.com/c/cos/tools/+/41357
Cloud-Build: GCB Service account <228075978874@cloudbuild.gserviceaccount.com>
Reviewed-by: Meena Shanmugam <meenashanmugam@google.com>
Tested-by: Robert Kolchmeyer <rkolchmeyer@google.com>
diff --git a/src/cmd/cos_customizer/install_gpu.go b/src/cmd/cos_customizer/install_gpu.go
index 9eb3a0b..317d932 100644
--- a/src/cmd/cos_customizer/install_gpu.go
+++ b/src/cmd/cos_customizer/install_gpu.go
@@ -39,7 +39,7 @@
const (
gpuScript = "install_gpu.sh"
- installerContainer = "gcr.io/cos-cloud/cos-gpu-installer:v20230109"
+ installerContainer = "gcr.io/cos-cloud/cos-gpu-installer:v20230117"
)
// TODO(b/121332360): Move most GPU functionality to cos-gpu-installer
diff --git a/testing/gpu_test.yaml b/testing/gpu_test.yaml
index ebec116..5cfcc19 100644
--- a/testing/gpu_test.yaml
+++ b/testing/gpu_test.yaml
@@ -20,20 +20,6 @@
- '-c'
- |
test_list=("gcloud builds submit --config=testing/gpu_test/gpu_test.yaml\
- --substitutions=_DRIVER_VERSION=390.46 --async --format='value(ID)' ."
- "gcloud builds submit --config=testing/gpu_test/gpu_test.yaml\
- --substitutions=_DRIVER_VERSION=396.26 --async --format='value(ID)' ."
- "gcloud builds submit --config=testing/gpu_test/gpu_test.yaml\
- --substitutions=_DRIVER_VERSION=396.37 --async --format='value(ID)' ."
- "gcloud builds submit --config=testing/gpu_test/gpu_test.yaml\
- --substitutions=_DRIVER_VERSION=396.44 --async --format='value(ID)' ."
- "gcloud builds submit --config=testing/gpu_test/gpu_test.yaml\
- --substitutions=_DRIVER_VERSION=418.67,_INPUT_IMAGE=cos-73-11647-656-0\
- --async --format='value(ID)' ."
- "gcloud builds submit --config=testing/gpu_test/gpu_test.yaml\
- --substitutions=_DRIVER_VERSION=418.67,_INPUT_IMAGE=cos-77-12371-1079-0\
- --async --format='value(ID)' ."
- "gcloud builds submit --config=testing/gpu_test/gpu_test.yaml\
--substitutions=_DRIVER_VERSION=450.51.06,_INPUT_IMAGE=cos-81-12871-1196-0\
--async --format='value(ID)' ."
"gcloud builds submit --config=testing/gpu_test/gpu_test.yaml\
diff --git a/testing/gpu_test/gpu_test.yaml b/testing/gpu_test/gpu_test.yaml
index 5142410..c9f49de 100644
--- a/testing/gpu_test/gpu_test.yaml
+++ b/testing/gpu_test/gpu_test.yaml
@@ -14,7 +14,7 @@
substitutions:
"_TEST": "gpu_test"
- "_INPUT_IMAGE": "cos-69-10895-201-0"
+ "_INPUT_IMAGE": "cos-89-16108-798-1"
"_INPUT_PROJECT": "cos-cloud"
"_DRIVER_VERSION": ""
"_DEPS_DIR": ""
@@ -43,7 +43,7 @@
- name: 'bazel:cos_customizer'
args: ["install-gpu",
"-version=${_DRIVER_VERSION}",
- "-gpu-type=nvidia-tesla-k80",
+ "-gpu-type=nvidia-tesla-t4",
"-deps-dir=${_DEPS_DIR}"]
- name: 'bazel:cos_customizer'
args: ["run-script",
diff --git a/testing/parallel_test.yaml b/testing/parallel_test.yaml
index e656c21..598a901 100644
--- a/testing/parallel_test.yaml
+++ b/testing/parallel_test.yaml
@@ -16,7 +16,7 @@
"_TEST_1": "smoke_test"
"_INPUT_IMAGE_1": "cos-dev-69-10895-0-0"
"_TEST_2": "gpu_test"
- "_INPUT_IMAGE_2": "cos-69-10895-201-0"
+ "_INPUT_IMAGE_2": "cos-89-16108-798-1"
"_INPUT_PROJECT": "cos-cloud"
steps:
- name: 'gcr.io/cloud-builders/bazel'
@@ -56,7 +56,7 @@
"-var:test_cfg", "../${_TEST_1}/preload_test.cfg", "testing/util/run_test.wf.json"]
# TEST_2 workflow
- name: 'busybox'
- args: ["sed", "-i", "-e", "s|%s|'396.26'|",
+ args: ["sed", "-i", "-e", "s|%s|'450.216.04'|",
"testing/${_TEST_2}/preload_test.cfg"]
- name: 'bazel:cos_customizer'
waitFor: "docker-build"
@@ -73,9 +73,8 @@
id: "test-2-install-gpu"
args: ["-local-state-workdir=.${_TEST_2}",
"install-gpu",
- "-version=396.26",
- "-md5sum=4c4b23467495338ef2612769ebeadb3d",
- "-gpu-type=nvidia-tesla-k80"]
+ "-version=450.216.04",
+ "-gpu-type=nvidia-tesla-t4"]
- name: 'bazel:cos_customizer'
waitFor: "test-2-install-gpu"
id: "test-2-run-script"
diff --git a/testing/util/gpu_vm.wf.json b/testing/util/gpu_vm.wf.json
index a497f1c..50fe9ec 100644
--- a/testing/util/gpu_vm.wf.json
+++ b/testing/util/gpu_vm.wf.json
@@ -14,7 +14,9 @@
"Disks": [{"Source": "boot-disk"}],
"Metadata": {
"user-data": "${SOURCE:cloud-config}",
- "block-project-ssh-keys": "TRUE"
+ "block-project-ssh-keys": "TRUE",
+ "cos-update-strategy": "update_disabled",
+ "google-logging-enabled": "false"
},
"guestAccelerators": [
{
diff --git a/testing/util/vm.wf.json b/testing/util/vm.wf.json
index 9721c00..7792a82 100644
--- a/testing/util/vm.wf.json
+++ b/testing/util/vm.wf.json
@@ -14,7 +14,9 @@
"Disks": [{"Source": "boot-disk"}],
"Metadata": {
"user-data": "${SOURCE:cloud-config}",
- "block-project-ssh-keys": "TRUE"
+ "block-project-ssh-keys": "TRUE",
+ "cos-update-strategy": "update_disabled",
+ "google-logging-enabled": "false"
}
}
]
