Skip to content

Commit e1d92e6

Browse files
authored
Merge pull request #33942 from pohly/dra-job-consolidation
DRA: consolidate pre-submit jobs
2 parents 500e955 + 229f05c commit e1d92e6

File tree

1 file changed

+22
-10
lines changed

1 file changed

+22
-10
lines changed

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

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3201,7 +3201,8 @@ presubmits:
32013201
# Not relevant for most PRs.
32023202
always_run: false
32033203
# This covers most of the code related to dynamic resource allocation.
3204-
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/
3204+
# Periodic variant: ci-kind-dra
3205+
run_if_changed: /(dra|dynamicresources|resourceclaim|deviceclass|resourceslice|resourceclaimtemplate|dynamic-resource-allocation|pkg/apis/resource|api/resource)/.*.go
32053206
# The tests might still be flaky or this job might get triggered accidentally for
32063207
# an unrelated PR.
32073208
optional: true
@@ -3257,7 +3258,8 @@ presubmits:
32573258
# Not relevant for most PRs.
32583259
always_run: false
32593260
# This covers most of the code related to dynamic resource allocation.
3260-
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/
3261+
# Periodic variant: ci-kind-dra-all
3262+
run_if_changed: /(dra|dynamicresources|resourceclaim|deviceclass|resourceslice|resourceclaimtemplate|dynamic-resource-allocation|pkg/apis/resource|api/resource)/.*.go
32613263
# The tests might still be flaky or this job might get triggered accidentally for
32623264
# an unrelated PR.
32633265
optional: true
@@ -4276,7 +4278,10 @@ presubmits:
42764278
skip_branches:
42774279
- release-\d+\.\d+ # per-release image
42784280
always_run: false
4279-
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_test.go
4281+
# Automatically testing with one container runtime in one configuration is sufficient to detect basic problems in kubelet early.
4282+
# CRI-O was picked because it was solid for testing so far.
4283+
# Periodic variant: ci-node-e2e-crio-cgrpv1-dra-features
4284+
run_if_changed: (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_).*\.(go|yaml)
42804285
optional: true
42814286
skip_report: false
42824287
labels:
@@ -4322,11 +4327,12 @@ presubmits:
43224327
limits:
43234328
cpu: 4
43244329
memory: 6Gi
4325-
- name: pull-kubernetes-node-e2e-crio-cgrpv1-dra-kubetest2
4330+
- name: pull-kubernetes-node-e2e-crio-cgrpv1-dra-kubetest2 # experimental alternative to pull-kubernetes-node-e2e-crio-cgrpv1-dra
43264331
cluster: k8s-infra-prow-build
43274332
# explicitly needs /test pull-kubernetes-node-e2e-crio-cgrpv1-dra-kubetest2 to run
43284333
always_run: false
4329-
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_test.go
4334+
# Don't run automatically while experimental!
4335+
# run_if_changed: (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_).*\.(go|yaml)
43304336
optional: true
43314337
skip_report: false
43324338
skip_branches:
@@ -4380,7 +4386,10 @@ presubmits:
43804386
skip_branches:
43814387
- release-\d+\.\d+ # per-release image
43824388
always_run: false
4383-
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_test.go
4389+
# Automatically testing with one container runtime in one configuration is sufficient to detect basic problems in kubelet early.
4390+
# CRI-O was picked because it was solid for testing so far.
4391+
# Periodic variant: ci-node-e2e-cgrpv2-crio-dra
4392+
# run_if_changed: (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_).*\.(go|yaml)
43844393
optional: true
43854394
skip_report: false
43864395
labels:
@@ -4426,11 +4435,12 @@ presubmits:
44264435
limits:
44274436
cpu: 4
44284437
memory: 6Gi
4429-
- name: pull-kubernetes-node-e2e-crio-cgrpv2-dra-kubetest2
4438+
- name: pull-kubernetes-node-e2e-crio-cgrpv2-dra-kubetest2 # experimental alternative to pull-kubernetes-node-e2e-crio-cgrpv2-dra
44304439
cluster: k8s-infra-prow-build
44314440
# explicitly needs /test pull-kubernetes-node-e2e-crio-cgrpv2-dra-kubetest2 to run
44324441
always_run: false
4433-
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_test.go
4442+
# Don't run automatically while experimental!
4443+
# run_if_changed: (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_).*\.(go|yaml)
44344444
optional: true
44354445
skip_report: false
44364446
skip_branches:
@@ -4484,8 +4494,10 @@ presubmits:
44844494
skip_branches:
44854495
- release-\d+\.\d+ # per-release image
44864496
always_run: false
4487-
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_test.go
4488-
optional: true
4497+
# Automatically testing with one container runtime in one configuration is sufficient to detect basic problems in kubelet early.
4498+
# CRI-O was picked because it was solid for testing so far.
4499+
# Periodic variant: ci-node-e2e-containerd-1-7-dra
4500+
# run_if_changed: (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/r optional: true
44894501
skip_report: false
44904502
labels:
44914503
preset-service-account: "true"

0 commit comments

Comments
 (0)