Skip to content

Commit b5a0166

Browse files
authored
Merge pull request #35681 from upodroid/delete-dupe-gpu-job
remove duplicate GPU job
2 parents 418185d + 2b16ca9 commit b5a0166

File tree

3 files changed

+10
-72
lines changed

3 files changed

+10
-72
lines changed

config/jobs/kubernetes/sig-cloud-provider/gcp/gpu/gcp-gpu-presubmits.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,14 @@ presubmits:
4444
- --node-size=g2-standard-24
4545
- --num-nodes=2
4646
- --gcp-zone=us-east1-b
47+
- --env=KUBE_CLUSTER_INITIALIZATION_TIMEOUT=900
4748
- --boskos-resource-type=gpu-project
4849
- --node-accelerators=type=nvidia-l4,count=2
4950
- --test=ginkgo
5051
- --
5152
- --provider=gce
5253
- --use-built-binaries=true
54+
- --test-args=--minStartupPods=8
5355
- --focus-regex=\[Feature:GPUDevicePlugin\]
5456
resources:
5557
limits:

config/jobs/kubernetes/sig-cloud-provider/gcp/gpu/gpu-gce.yaml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ presets:
66
value: type=nvidia-tesla-t4,count=2
77
- name: NODE_SIZE
88
value: n1-standard-2
9-
- labels:
10-
preset-ci-gce-device-plugin-gpu-nvidia-t4: "true"
11-
env:
12-
- name: NODE_ACCELERATORS
13-
value: type=nvidia-tesla-t4,count=2
14-
- name: NODE_SIZE
15-
value: n1-standard-2
169

1710
periodics:
1811
- name: ci-kubernetes-e2e-gce-device-plugin-gpu
@@ -24,9 +17,9 @@ periodics:
2417
fork-per-release: "true"
2518
fork-per-release-replacements: "latest.txt -> latest-{{.Version}}"
2619
fork-per-release-cron: 0 0-23/2 * * *, 0 3-23/6 * * *, 0 8-23/12 * * *, 0 8-23/24 * * *, 0 14-23/24 * * *
27-
testgrid-dashboards: sig-release-master-blocking, google-gce, sig-node-gpu
20+
testgrid-dashboards: sig-release-master-blocking, google-gce, sig-node-gpu, sig-node-containerd
2821
testgrid-tab-name: gce-device-plugin-gpu-master
29-
testgrid-alert-email: [email protected], [email protected]
22+
3023
description: "Uses kubetest2 to run e2e tests (+Feature:GPUDevicePlugin) against a cluster created with cluster/kube-up.sh"
3124
testgrid-num-failures-to-alert: '6'
3225
testgrid-alert-stale-results-hours: '24'
@@ -55,19 +48,21 @@ periodics:
5548
- --gcp-zone=us-east1-b
5649
- --boskos-resource-type=gpu-project
5750
- --node-accelerators=type=nvidia-l4,count=2
51+
- --env=KUBE_CLUSTER_INITIALIZATION_TIMEOUT=900
5852
- --kubernetes-version=https://dl.k8s.io/ci/latest.txt
5953
- --test=ginkgo
6054
- --
6155
- --provider=gce
6256
- --test-package-url=https://dl.k8s.io
6357
- --test-package-dir=ci
58+
- --test-args=--minStartupPods=8
6459
- --test-package-marker=latest.txt
6560
- --focus-regex=\[Feature:GPUDevicePlugin\]
6661
image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20250925-95b5a2c7a5-master
6762
resources:
6863
limits:
69-
cpu: 1
70-
memory: 3Gi
64+
cpu: 2
65+
memory: 6Gi
7166
requests:
72-
cpu: 1
73-
memory: 3Gi
67+
cpu: 2
68+
memory: 6Gi

config/jobs/kubernetes/sig-node/containerd.yaml

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -350,65 +350,6 @@ periodics:
350350
testgrid-tab-name: containerd-node-e2e-features-1.7
351351
testgrid-alert-email: [email protected]
352352

353-
- name: ci-cri-containerd-e2e-gce-device-plugin-gpu
354-
cluster: k8s-infra-prow-build
355-
cron: "30 1-23/3 * * *"
356-
labels:
357-
preset-service-account: "true"
358-
preset-k8s-ssh: "true"
359-
preset-e2e-containerd: "true"
360-
preset-ci-gce-device-plugin-gpu: "true"
361-
preset-e2e-containerd-image-load: "true"
362-
decorate: true
363-
decoration_config:
364-
timeout: 300m
365-
extra_refs:
366-
- org: kubernetes
367-
repo: kubernetes
368-
base_ref: master
369-
path_alias: k8s.io/kubernetes
370-
workdir: true
371-
- org: kubernetes
372-
repo: test-infra
373-
base_ref: master
374-
path_alias: k8s.io/test-infra
375-
workdir: true
376-
- org: containerd
377-
repo: containerd
378-
base_ref: main
379-
path_alias: github.com/containerd/containerd
380-
spec:
381-
containers:
382-
- command:
383-
- runner.sh
384-
- /workspace/scenarios/kubernetes_e2e.py
385-
args:
386-
- --check-leaked-resources
387-
- --extract=ci/latest
388-
# Note: The GCE Node image used may have a dependency on the nvidia-driver-installer image defined in https://github.com/kubernetes/kubernetes/blob/master/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml
389-
# If updating the image defined here, the cos-gpu-installer image may need to updated to support the corresponding COS image.
390-
- --env=KUBE_GCE_NODE_IMAGE=cos-109-17800-147-22
391-
- --gcp-node-image=gci
392-
- --gcp-project-type=gpu-project
393-
- --gcp-zone=us-central1-b
394-
- --provider=gce
395-
- --test_args=--ginkgo.focus=\[Feature:GPUDevicePlugin\] --minStartupPods=8
396-
- --timeout=180m
397-
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250925-95b5a2c7a5-master
398-
resources:
399-
limits:
400-
cpu: 4
401-
memory: 6Gi
402-
requests:
403-
cpu: 4
404-
memory: 6Gi
405-
annotations:
406-
testgrid-dashboards: sig-node-containerd, sig-node-gpu
407-
testgrid-tab-name: e2e-cos-device-plugin-gpu
408-
testgrid-num-failures-to-alert: '8'
409-
testgrid-alert-stale-results-hours: '24'
410-
testgrid-alert-email: [email protected]
411-
412353
- name: ci-kubernetes-node-kubelet-containerd-eviction
413354
cluster: k8s-infra-prow-build
414355
interval: 4h30m

0 commit comments

Comments
 (0)