Skip to content

Commit 2893ec6

Browse files
authored
Merge pull request #34840 from BenTheElder/canary-cos
ensure kind canary jobs select the new nodepool, drop cgroup bind mount on cgroup v2
2 parents e488cf6 + e43ac5f commit 2893ec6

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

config/jobs/kubernetes/sig-testing/kubernetes-kind.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ presubmits:
8484
requests:
8585
cpu: 7
8686
memory: 9000Mi
87+
# use experimental new nodepool with C4 VM, cgroup v2
88+
nodeSelector:
89+
cloud.google.com/gke-nodepool: "pool6-20250327232037500200000001"
8790
tolerations:
8891
- key: "dedicated"
8992
operator: "Equal"
@@ -104,7 +107,6 @@ presubmits:
104107
- release-\d+\.\d+ # per-release settings
105108
labels:
106109
preset-dind-enabled: "true"
107-
preset-kind-volume-mounts: "true"
108110
decoration_config:
109111
timeout: 60m
110112
grace_period: 15m
@@ -138,6 +140,14 @@ presubmits:
138140
requests:
139141
cpu: 4
140142
memory: 9Gi
143+
# use experimental new nodepool with C4 VM, cgroup v2
144+
nodeSelector:
145+
cloud.google.com/gke-nodepool: "pool6-20250327232037500200000001"
146+
tolerations:
147+
- key: "dedicated"
148+
operator: "Equal"
149+
value: "sig-testing"
150+
effect: "NoSchedule"
141151
annotations:
142152
fork-per-release: "true"
143153
testgrid-num-failures-to-alert: '10'
@@ -153,7 +163,6 @@ presubmits:
153163
- release-\d+\.\d+ # per-release settings
154164
labels:
155165
preset-dind-enabled: "true"
156-
preset-kind-volume-mounts: "true"
157166
decoration_config:
158167
timeout: 60m
159168
grace_period: 15m

0 commit comments

Comments
 (0)