Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DRA: consolidate pre-submit jobs #33942

Merged
merged 3 commits into from
Dec 14, 2024
Merged

DRA: consolidate pre-submit jobs #33942

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72c1f43
node dra: don't run experimental jobs automatically
pohly Dec 13, 2024
4a41917
node dra: reduce the number of automatic pre-submit jobs
pohly Dec 13, 2024
229f05c
node dra: run_if_changed only for Go source code
pohly Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3201,7 +3201,8 @@ presubmits:
# Not relevant for most PRs.
always_run: false
# This covers most of the code related to dynamic resource allocation.
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/
# Periodic variant: ci-kind-dra
run_if_changed: /(dra|dynamicresources|resourceclaim|deviceclass|resourceslice|resourceclaimtemplate|dynamic-resource-allocation|pkg/apis/resource|api/resource)/.*.go
# The tests might still be flaky or this job might get triggered accidentally for
# an unrelated PR.
optional: true
Expand Down Expand Up @@ -3257,7 +3258,8 @@ presubmits:
# Not relevant for most PRs.
always_run: false
# This covers most of the code related to dynamic resource allocation.
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/
# Periodic variant: ci-kind-dra-all
run_if_changed: /(dra|dynamicresources|resourceclaim|deviceclass|resourceslice|resourceclaimtemplate|dynamic-resource-allocation|pkg/apis/resource|api/resource)/.*.go
# The tests might still be flaky or this job might get triggered accidentally for
# an unrelated PR.
optional: true
Expand Down Expand Up @@ -4276,7 +4278,10 @@ presubmits:
skip_branches:
- release-\d+\.\d+ # per-release image
always_run: false
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_test.go
# Automatically testing with one container runtime in one configuration is sufficient to detect basic problems in kubelet early.
# CRI-O was picked because it was solid for testing so far.
# Periodic variant: ci-node-e2e-crio-cgrpv1-dra-features
run_if_changed: (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_).*\.(go|yaml)
optional: true
skip_report: false
labels:
Expand Down Expand Up @@ -4322,11 +4327,12 @@ presubmits:
limits:
cpu: 4
memory: 6Gi
- name: pull-kubernetes-node-e2e-crio-cgrpv1-dra-kubetest2
- name: pull-kubernetes-node-e2e-crio-cgrpv1-dra-kubetest2 # experimental alternative to pull-kubernetes-node-e2e-crio-cgrpv1-dra
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elieser1101: what is the status of these kubetest2 variants?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can see they don't differ much from the correspondent kubernetes_e2e.py variants. I'd propose to drop kubernetes_e2e.py jobs.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the moment the kubetest2 variants are not working because of the --label-filter not suported. I started to look at the fix on kubetests2 kubernetes-sigs/kubetest2#285

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elieser1101 Both kubetest2 jobs are "green" in the test grid:

Do you mean they're not working correctly / as expected?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah both are green but its because test are not actually runring, we can see that from the build.log

Ran 0 of 718 Specs in 0.023 seconds
SUCCESS! -- 0 Passed | 0 Failed | 0 Pending | 718 Skipped
PASS

cluster: k8s-infra-prow-build
# explicitly needs /test pull-kubernetes-node-e2e-crio-cgrpv1-dra-kubetest2 to run
always_run: false
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_test.go
# Don't run automatically while experimental!
# run_if_changed: (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_).*\.(go|yaml)
optional: true
skip_report: false
skip_branches:
Expand Down Expand Up @@ -4380,7 +4386,10 @@ presubmits:
skip_branches:
- release-\d+\.\d+ # per-release image
always_run: false
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_test.go
# Automatically testing with one container runtime in one configuration is sufficient to detect basic problems in kubelet early.
# CRI-O was picked because it was solid for testing so far.
# Periodic variant: ci-node-e2e-cgrpv2-crio-dra
# run_if_changed: (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_).*\.(go|yaml)
optional: true
skip_report: false
labels:
Expand Down Expand Up @@ -4426,11 +4435,12 @@ presubmits:
limits:
cpu: 4
memory: 6Gi
- name: pull-kubernetes-node-e2e-crio-cgrpv2-dra-kubetest2
- name: pull-kubernetes-node-e2e-crio-cgrpv2-dra-kubetest2 # experimental alternative to pull-kubernetes-node-e2e-crio-cgrpv2-dra
cluster: k8s-infra-prow-build
# explicitly needs /test pull-kubernetes-node-e2e-crio-cgrpv2-dra-kubetest2 to run
always_run: false
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_test.go
# Don't run automatically while experimental!
# run_if_changed: (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_).*\.(go|yaml)
optional: true
skip_report: false
skip_branches:
Expand Down Expand Up @@ -4484,8 +4494,10 @@ presubmits:
skip_branches:
- release-\d+\.\d+ # per-release image
always_run: false
run_if_changed: /dra/|/dynamicresources/|/resourceclaim/|/resourceclass/|/podscheduling/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/resource/|/api/resource/|/test/e2e_node/dra_test.go
optional: true
# Automatically testing with one container runtime in one configuration is sufficient to detect basic problems in kubelet early.
# CRI-O was picked because it was solid for testing so far.
# Periodic variant: ci-node-e2e-containerd-1-7-dra
# run_if_changed: (/dra/|/dynamicresources/|/resourceclaim/|/deviceclass/|/resourceslice/|/resourceclaimtemplate/|/dynamic-resource-allocation/|/pkg/apis/r optional: true
skip_report: false
labels:
preset-service-account: "true"
Expand Down