Merge pull request #35161 from pohly/dra-e2e

DRA integration: fix periodic job

Author: k8s-ci-robot

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

@@ -414,6 +414,12 @@ periodics:
     decorate: true
     decoration_config:
       timeout: 90m
+    extra_refs:
+    - org: kubernetes
+      repo: kubernetes
+      base_ref: master
+      path_alias: k8s.io/kubernetes
+      workdir: true
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250717-57d1ca3de9-master

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

@@ -21,6 +21,10 @@ timeout = 90m
 e2e_node_timeout = 60m
 # Values > 0 enable version skew testing with an older kubelet version.
 kubelet_skew = 0
+# Can be set to non-empty for jobs which need extra refs.
+need_kubernetes_repo =
+need_test_infra_repo =
+need_containerd_20_repo =
 
 # This jobs runs e2e.test with a focus on tests for the Dynamic Resource Allocation feature (currently beta)
 # 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
 use_dind = true
 use_dind_cdi = true
 job_type = integration
+need_kubernetes_repo = true
 cluster = eks-prow-build-cluster
 run_if_changed = /(dra|dynamicresources|resourceclaim|deviceclass|resourceslice|resourceclaimtemplate|dynamic-resource-allocation|pkg/apis/resource|api/resource)/.*.go
 
 # This job runs e2e_node.test with a focus on tests for the Dynamic Resource Allocation feature (currently beta)
 [node-e2e-crio-cgrpv1-dra]
 job_type = node
+need_kubernetes_repo = true
+need_test_infra_repo = true
 description = Runs E2E node tests for Dynamic Resource Allocation beta features with CRI-O using cgroup v1
 image_config_file = /home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv1.yaml
 inject_ssh_public_key = true
@@ -102,6 +109,8 @@ release_informing = true
 # This job is the same as ci-node-e2e-cgrpv1-crio-dra, but for cgroup v2
 [node-e2e-crio-cgrpv2-dra]
 job_type = node
+need_kubernetes_repo = true
+need_test_infra_repo = true
 description = Runs E2E node tests for Dynamic Resource Allocation beta features with CRI-O using cgroup v2
 image_config_file = /home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv2.yaml
 inject_ssh_public_key = true
@@ -110,13 +119,18 @@ release_informing = true
 # This job runs the same tests as ci-node-e2e-crio-dra with Containerd 1.7 runtime
 [node-e2e-containerd-1-7-dra]
 job_type = node
+need_kubernetes_repo = true
+need_test_infra_repo = true
 description = Runs E2E node tests for Dynamic Resource Allocation beta features with containerd 1.7
 image_config_file = /home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/dra/image-config-containerd-1.7.yaml
 release_informing = true
 
 # This job runs the same tests as ci-node-e2e-crio-dra with Containerd 2.0 runtime
 [node-e2e-containerd-2-0-dra]
 job_type = node
+need_kubernetes_repo = true
+need_test_infra_repo = true
+need_containerd_20_repo = true
 description = Runs E2E node tests for Dynamic Resource Allocation beta features with containerd 2.0
 image_config_file = /home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-release-2.0/image-config.yaml
 release_informing = true

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

@@ -64,20 +64,22 @@ presubmits:
     {%- if not ci %}
     path_alias: k8s.io/kubernetes
     {%- endif %}
-    {%- if job_type == "node" %}
+    {%- if ci and need_kubernetes_repo or need_test_infra_repo or need_containerd_20_repo %}
     extra_refs:
-    {%- if ci %}
+    {%- if ci and need_kubernetes_repo %}
     - org: kubernetes
       repo: kubernetes
       base_ref: master
       path_alias: k8s.io/kubernetes
       workdir: true
     {%- endif %}
+    {%- if need_test_infra_repo %}
     - org: kubernetes
       repo: test-infra
       base_ref: master
       path_alias: k8s.io/test-infra
-    {%- if "containerd-2-0" in job_name %}
+    {%- endif %}
+    {%- if need_containerd_20_repo %}
     - org: containerd
       repo: containerd
       base_ref: release/2.0