Skip to content

Commit

Permalink
node: Move dockershim tests to their own job
Browse files Browse the repository at this point in the history
This commit excludes Dockershim tests from the Serial job and moves them
to their own job. This is ahead of dockershim support being removed from
the kubelet to help clean up test flakiness.
  • Loading branch information
endocrimes committed Nov 11, 2021
1 parent 7df0aac commit efffa8a
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 2 deletions.
39 changes: 38 additions & 1 deletion config/jobs/kubernetes/sig-node/node-kubelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ periodics:
- --provider=gce
# Feature:DynamicKubeletConfig is deprecated and soon will be removed so tests are skipped.
# If we want to run these tests, we need a separate job for it.
- --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]|\[Feature:DynamicKubeletConfig\]"
- --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]|\[Feature:DynamicKubeletConfig\]|\[Feature:Docker\]"
- --timeout=240m
env:
- name: GOPATH
Expand All @@ -212,6 +212,43 @@ periodics:
testgrid-dashboards: sig-node-kubelet
testgrid-tab-name: node-kubelet-serial

- name: ci-kubernetes-node-kubelet-serial-docker
interval: 4h
labels:
preset-service-account: "true"
preset-k8s-ssh: "true"
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
args:
- --repo=k8s.io/kubernetes=master
- --timeout=260
- --root=/go/src
- --scenario=kubernetes_e2e
- --
- --deployment=node
- --gcp-project-type=node-e2e-project
- --gcp-zone=us-west1-b
- --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial.yaml
- --node-test-args=--feature-gates=LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/"
- --node-tests=true
- --provider=gce
- --test_args=--nodes=1 --focus="\[Feature:Docker\]" --skip=""
- --timeout=240m
env:
- name: GOPATH
value: /go
resources:
limits:
cpu: 4
memory: 6Gi
requests:
cpu: 4
memory: 6Gi
annotations:
testgrid-dashboards: sig-node-kubelet
testgrid-tab-name: node-kubelet-serial-docker

- name: ci-kubernetes-node-kubelet-serial-containerd
cluster: k8s-infra-prow-build
interval: 4h
Expand Down
42 changes: 41 additions & 1 deletion config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,47 @@ presubmits:
- --node-test-args=LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/"
- --node-tests=true
- --provider=gce
- --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]|\[NodeFeature:DynamicKubeletConfig\]"
- --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]|\[NodeFeature:DynamicKubeletConfig\]|\[Feature:Docker\]"
- --timeout=240m
env:
- name: GOPATH
value: /go
resources:
limits:
cpu: 4
memory: 6Gi
requests:
cpu: 4
memory: 6Gi
- name: pull-kubernetes-node-kubelet-serial-dockershim
always_run: false
optional: true
skip_report: false
skip_branches:
- release-\d+\.\d+ # per-release image
annotations:
testgrid-dashboards: sig-node-presubmits
testgrid-tab-name: pr-node-kubelet-serial-dockershim
labels:
preset-service-account: "true"
preset-k8s-ssh: "true"
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
args:
- "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)"
- --timeout=260
- --root=/go/src
- "--upload=gs://kubernetes-jenkins/pr-logs"
- --scenario=kubernetes_e2e
- --
- --deployment=node
- --gcp-zone=us-west1-b
- --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial.yaml
- --node-test-args=LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/"
- --node-tests=true
- --provider=gce
- --test_args=--nodes=1 --focus="\[Feature:Docker\]" --skip=""
- --timeout=240m
env:
- name: GOPATH
Expand Down

0 comments on commit efffa8a

Please sign in to comment.