Skip to content

Commit 4e43008

Browse files
pohlypohly
committed
DRA integration: fix periodic job
The ci-dra-integration has to run with k/k checked out. Instead of making that depend on more logic in the template, let's explicitly configure extra repos in each job which needs them.
1 parent a641c57 commit 4e43008

File tree

5 files changed

+40
-4
lines changed

5 files changed

+40
-4
lines changed

‎config/jobs/kubernetes/sig-node/dra-canary.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ presubmits:
2121
decoration_config:
2222
timeout: 90m
2323
path_alias: k8s.io/kubernetes
24+
extra_refs:
2425
spec:
2526
containers:
2627
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -105,6 +106,7 @@ presubmits:
105106
decoration_config:
106107
timeout: 90m
107108
path_alias: k8s.io/kubernetes
109+
extra_refs:
108110
spec:
109111
containers:
110112
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -191,6 +193,7 @@ presubmits:
191193
decoration_config:
192194
timeout: 90m
193195
path_alias: k8s.io/kubernetes
196+
extra_refs:
194197
spec:
195198
containers:
196199
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -277,6 +280,7 @@ presubmits:
277280
decoration_config:
278281
timeout: 90m
279282
path_alias: k8s.io/kubernetes
283+
extra_refs:
280284
spec:
281285
containers:
282286
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -384,6 +388,7 @@ presubmits:
384388
decoration_config:
385389
timeout: 90m
386390
path_alias: k8s.io/kubernetes
391+
extra_refs:
387392
spec:
388393
containers:
389394
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -491,6 +496,7 @@ presubmits:
491496
decoration_config:
492497
timeout: 90m
493498
path_alias: k8s.io/kubernetes
499+
extra_refs:
494500
spec:
495501
containers:
496502
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master

‎config/jobs/kubernetes/sig-node/dra-ci.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ periodics:
1919
decorate: true
2020
decoration_config:
2121
timeout: 90m
22+
extra_refs:
2223
spec:
2324
containers:
2425
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -103,6 +104,7 @@ periodics:
103104
decorate: true
104105
decoration_config:
105106
timeout: 90m
107+
extra_refs:
106108
spec:
107109
containers:
108110
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -192,6 +194,7 @@ periodics:
192194
decorate: true
193195
decoration_config:
194196
timeout: 90m
197+
extra_refs:
195198
spec:
196199
containers:
197200
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -303,6 +306,7 @@ periodics:
303306
decorate: true
304307
decoration_config:
305308
timeout: 90m
309+
extra_refs:
306310
spec:
307311
containers:
308312
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -414,6 +418,12 @@ periodics:
414418
decorate: true
415419
decoration_config:
416420
timeout: 90m
421+
extra_refs:
422+
- org: kubernetes
423+
repo: kubernetes
424+
base_ref: master
425+
path_alias: k8s.io/kubernetes
426+
workdir: true
417427
spec:
418428
containers:
419429
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ presubmits:
2323
decoration_config:
2424
timeout: 90m
2525
path_alias: k8s.io/kubernetes
26+
extra_refs:
2627
spec:
2728
containers:
2829
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -109,6 +110,7 @@ presubmits:
109110
decoration_config:
110111
timeout: 90m
111112
path_alias: k8s.io/kubernetes
113+
extra_refs:
112114
spec:
113115
containers:
114116
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -196,6 +198,7 @@ presubmits:
196198
decoration_config:
197199
timeout: 90m
198200
path_alias: k8s.io/kubernetes
201+
extra_refs:
199202
spec:
200203
containers:
201204
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -284,6 +287,7 @@ presubmits:
284287
decoration_config:
285288
timeout: 90m
286289
path_alias: k8s.io/kubernetes
290+
extra_refs:
287291
spec:
288292
containers:
289293
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -393,6 +397,7 @@ presubmits:
393397
decoration_config:
394398
timeout: 90m
395399
path_alias: k8s.io/kubernetes
400+
extra_refs:
396401
spec:
397402
containers:
398403
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master
@@ -502,6 +507,7 @@ presubmits:
502507
decoration_config:
503508
timeout: 90m
504509
path_alias: k8s.io/kubernetes
510+
extra_refs:
505511
spec:
506512
containers:
507513
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master

‎config/jobs/kubernetes/sig-node/dra.generate.conf‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ timeout = 90m
2121
e2e_node_timeout = 60m
2222
# Values > 0 enable version skew testing with an older kubelet version.
2323
kubelet_skew = 0
24+
# Can be set to non-empty for jobs which need extra refs.
25+
need_kubernetes_repo =
26+
need_test_infra_repo =
27+
need_containerd_20_repo =
2428

2529
# This jobs runs e2e.test with a focus on tests for the Dynamic Resource Allocation feature (currently beta)
2630
# on a kind cluster with containerd updated to a version with CDI support.
@@ -85,12 +89,15 @@ description = Runs integration tests for DRA which need some additional setup in
8589
use_dind = true
8690
use_dind_cdi = true
8791
job_type = integration
92+
need_kubernetes_repo = true
8893
cluster = eks-prow-build-cluster
8994
run_if_changed = /(dra|dynamicresources|resourceclaim|deviceclass|resourceslice|resourceclaimtemplate|dynamic-resource-allocation|pkg/apis/resource|api/resource)/.*.go
9095

9196
# This job runs e2e_node.test with a focus on tests for the Dynamic Resource Allocation feature (currently beta)
9297
[node-e2e-crio-cgrpv1-dra]
9398
job_type = node
99+
need_kubernetes_repo = true
100+
need_test_infra_repo = true
94101
description = Runs E2E node tests for Dynamic Resource Allocation beta features with CRI-O using cgroup v1
95102
image_config_file = /home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv1.yaml
96103
inject_ssh_public_key = true
@@ -102,6 +109,8 @@ release_informing = true
102109
# This job is the same as ci-node-e2e-cgrpv1-crio-dra, but for cgroup v2
103110
[node-e2e-crio-cgrpv2-dra]
104111
job_type = node
112+
need_kubernetes_repo = true
113+
need_test_infra_repo = true
105114
description = Runs E2E node tests for Dynamic Resource Allocation beta features with CRI-O using cgroup v2
106115
image_config_file = /home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv2.yaml
107116
inject_ssh_public_key = true
@@ -110,13 +119,18 @@ release_informing = true
110119
# This job runs the same tests as ci-node-e2e-crio-dra with Containerd 1.7 runtime
111120
[node-e2e-containerd-1-7-dra]
112121
job_type = node
122+
need_kubernetes_repo = true
123+
need_test_infra_repo = true
113124
description = Runs E2E node tests for Dynamic Resource Allocation beta features with containerd 1.7
114125
image_config_file = /home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/dra/image-config-containerd-1.7.yaml
115126
release_informing = true
116127

117128
# This job runs the same tests as ci-node-e2e-crio-dra with Containerd 2.0 runtime
118129
[node-e2e-containerd-2-0-dra]
119130
job_type = node
131+
need_kubernetes_repo = true
132+
need_test_infra_repo = true
133+
need_containerd_20_repo = true
120134
description = Runs E2E node tests for Dynamic Resource Allocation beta features with containerd 2.0
121135
image_config_file = /home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-release-2.0/image-config.yaml
122136
release_informing = true

‎config/jobs/kubernetes/sig-node/dra.jinja‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,25 @@ presubmits:
6464
{%- if not ci %}
6565
path_alias: k8s.io/kubernetes
6666
{%- endif %}
67-
{%- if job_type == "node" %}
6867
extra_refs:
69-
{%- if ci %}
68+
{%- if ci and need_kubernetes_repo %}
7069
- org: kubernetes
7170
repo: kubernetes
7271
base_ref: master
7372
path_alias: k8s.io/kubernetes
7473
workdir: true
7574
{%- endif %}
75+
{%- if need_test_infra_repo %}
7676
- org: kubernetes
7777
repo: test-infra
7878
base_ref: master
7979
path_alias: k8s.io/test-infra
80-
{%- if "containerd-2-0" in job_name %}
80+
{%- endif %}
81+
{%- if need_containerd_20_repo %}
8182
- org: containerd
8283
repo: containerd
8384
base_ref: release/2.0
8485
{%- endif %}
85-
{%- endif %}
8686
spec:
8787
containers:
8888
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250714-70266d743a-master

0 commit comments

Comments
 (0)