Skip to content

Commit 539bf37

Browse files
authored
Merge pull request #34945 from elieser1101/update-node-release-blocking
Add 1.33 sig node tests and remove 1.29/1.30
2 parents a800a58 + 3531904 commit 539bf37

File tree

3 files changed

+24
-75
lines changed

3 files changed

+24
-75
lines changed
Lines changed: 23 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,5 @@
11
periodics:
2-
- name: ci-kubernetes-node-release-branch-1-29
3-
cluster: k8s-infra-prow-build
4-
interval: 24h
5-
labels:
6-
preset-service-account: "true"
7-
preset-k8s-ssh: "true"
8-
decorate: true
9-
decoration_config:
10-
timeout: 240m
11-
extra_refs:
12-
- org: kubernetes
13-
repo: kubernetes
14-
base_ref: release-1.29
15-
path_alias: k8s.io/kubernetes
16-
workdir: true
17-
- org: kubernetes
18-
repo: test-infra
19-
base_ref: master
20-
path_alias: k8s.io/test-infra
21-
spec:
22-
containers:
23-
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250702-e205934cd3-master
24-
command:
25-
- runner.sh
26-
- /workspace/scenarios/kubernetes_e2e.py
27-
args:
28-
- --deployment=node
29-
- --gcp-zone=us-central1-a
30-
- --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/k8s-release-branches/image-config-1.29.yaml
31-
- '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"'
32-
- --node-tests=true
33-
- --provider=gce
34-
- --test_args=--nodes=8 --focus="\[NodeConformance\]" --skip="\[Flaky\]|\[Slow\]|\[Serial\]"
35-
- --timeout=180m
36-
env:
37-
- name: GOPATH
38-
value: /go
39-
resources:
40-
limits:
41-
cpu: 4
42-
memory: 6Gi
43-
requests:
44-
cpu: 4
45-
memory: 6Gi
46-
annotations:
47-
testgrid-dashboards: sig-node-release-blocking
48-
testgrid-tab-name: node-conformance-release-1.29
49-
testgrid-alert-email: [email protected]
50-
description: Node conformance tests in release branch 1.29
51-
- name: ci-kubernetes-node-release-branch-1-30
2+
- name: ci-kubernetes-node-release-branch-1-31
523
cluster: k8s-infra-prow-build
534
interval: 24h
545
labels:
@@ -60,7 +11,7 @@ periodics:
6011
extra_refs:
6112
- org: kubernetes
6213
repo: kubernetes
63-
base_ref: release-1.30
14+
base_ref: release-1.31
6415
path_alias: k8s.io/kubernetes
6516
workdir: true
6617
- org: kubernetes
@@ -76,7 +27,7 @@ periodics:
7627
args:
7728
- --deployment=node
7829
- --gcp-zone=us-central1-a
79-
- --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/k8s-release-branches/image-config-1.30.yaml
30+
- --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/k8s-release-branches/image-config-1.31.yaml
8031
- '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"'
8132
- --node-tests=true
8233
- --provider=gce
@@ -94,10 +45,10 @@ periodics:
9445
memory: 6Gi
9546
annotations:
9647
testgrid-dashboards: sig-node-release-blocking
97-
testgrid-tab-name: node-conformance-release-1.30
48+
testgrid-tab-name: node-conformance-release-1.31
9849
testgrid-alert-email: [email protected]
99-
description: Node conformance tests in release branch 1.30
100-
- name: ci-kubernetes-node-release-branch-1-31
50+
description: Node conformance tests in release branch 1.31
51+
- name: ci-kubernetes-node-release-branch-1-32
10152
cluster: k8s-infra-prow-build
10253
interval: 24h
10354
labels:
@@ -109,7 +60,7 @@ periodics:
10960
extra_refs:
11061
- org: kubernetes
11162
repo: kubernetes
112-
base_ref: release-1.31
63+
base_ref: release-1.32
11364
path_alias: k8s.io/kubernetes
11465
workdir: true
11566
- org: kubernetes
@@ -125,7 +76,7 @@ periodics:
12576
args:
12677
- --deployment=node
12778
- --gcp-zone=us-central1-a
128-
- --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/k8s-release-branches/image-config-1.31.yaml
79+
- --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/k8s-release-branches/image-config-1.32.yaml
12980
- '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"'
13081
- --node-tests=true
13182
- --provider=gce
@@ -143,10 +94,10 @@ periodics:
14394
memory: 6Gi
14495
annotations:
14596
testgrid-dashboards: sig-node-release-blocking
146-
testgrid-tab-name: node-conformance-release-1.31
97+
testgrid-tab-name: node-conformance-release-1.32
14798
testgrid-alert-email: [email protected]
148-
description: Node conformance tests in release branch 1.31
149-
- name: ci-kubernetes-node-release-branch-1-32
99+
description: Node conformance tests in release branch 1.32
100+
- name: ci-kubernetes-node-release-branch-1-33
150101
cluster: k8s-infra-prow-build
151102
interval: 24h
152103
labels:
@@ -158,7 +109,7 @@ periodics:
158109
extra_refs:
159110
- org: kubernetes
160111
repo: kubernetes
161-
base_ref: release-1.32
112+
base_ref: release-1.33
162113
path_alias: k8s.io/kubernetes
163114
workdir: true
164115
- org: kubernetes
@@ -170,15 +121,18 @@ periodics:
170121
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250702-e205934cd3-master
171122
command:
172123
- runner.sh
173-
- /workspace/scenarios/kubernetes_e2e.py
174124
args:
175-
- --deployment=node
125+
- kubetest2
126+
- noop
127+
- --test=node
128+
- --
129+
- --repo-root=.
176130
- --gcp-zone=us-central1-a
177-
- --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/k8s-release-branches/image-config-1.32.yaml
131+
- --parallelism=8
132+
- --focus-regex=\[NodeConformance\]
133+
- --skip-regex=\[Flaky\]|\[Slow\]|\[Serial\]
178134
- '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"'
179-
- --node-tests=true
180-
- --provider=gce
181-
- --test_args=--nodes=8 --focus="\[NodeConformance\]" --skip="\[Flaky\]|\[Slow\]|\[Serial\]"
135+
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/k8s-release-branches/image-config-1.33.yaml
182136
- --timeout=180m
183137
env:
184138
- name: GOPATH
@@ -192,6 +146,6 @@ periodics:
192146
memory: 6Gi
193147
annotations:
194148
testgrid-dashboards: sig-node-release-blocking
195-
testgrid-tab-name: node-conformance-release-1.32
149+
testgrid-tab-name: node-conformance-release-1.33
196150
testgrid-alert-email: [email protected]
197-
description: Node conformance tests in release branch 1.32
151+
description: Node conformance tests in release branch 1.33

jobs/e2e_node/containerd/k8s-release-branches/image-config-1.30.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
images:
22
cos-dev:
3-
image_family: cos-109-lts
3+
image_family: cos-121-lts
44
project: cos-cloud
55
metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/init.yaml,cni-template</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/cni.template,containerd-config</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/config-systemd.toml"

0 commit comments

Comments
 (0)