Merge pull request #35004 from pohly/dra-integration-tests

DRA canary: add integration test job

Author: k8s-ci-robot

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

@@ -387,6 +387,45 @@ presubmits:
             cpu: 2
             memory: 6Gi
 
+  - name: pull-kubernetes-dra-integration-canary
+    cluster: eks-prow-build-cluster
+    skip_branches:
+    - release-\d+\.\d+  # per-release image
+    always_run: false
+    optional: true
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-presubmits
+      description: Runs integration tests for DRA which need some additional setup in the job.
+      testgrid-alert-email: [email protected], [email protected]
+    decorate: true
+    decoration_config:
+      timeout: 90m
+    path_alias: k8s.io/kubernetes
+    spec:
+      containers:
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250613-876fb90a97-master
+        command:
+        - runner.sh
+        - /bin/bash
+        - -xce
+        - |
+          # The latest kind is assumed to work also for older release branches, should this job get forked.
+          curl --fail --silent --show-error --location https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" kind
+          # "Normal" integration tests under test/integration/dra run in pull-kubernetes-integration.
+          # The "more complex" ones with a dependency on kind are under test/e2e/dra, in a separate Ginkgo suite.
+          make test WHAT="test/e2e/dra" KIND_COMMAND=kind KUBE_TIMEOUT=-timeout=30m KUBE_TEST_ARGS="-args -ginkgo.junit-report=${ARTIFACTS}/junit.xml"
+        resources:
+          limits:
+            cpu: 2
+            memory: 6Gi
+          requests:
+            cpu: 2
+            memory: 6Gi
+
   - name: pull-kubernetes-node-e2e-crio-cgrpv1-dra-canary
     cluster: k8s-infra-prow-build
     skip_branches:

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

@@ -26,6 +26,7 @@ kubelet_skew = 0
 # on a kind cluster with containerd updated to a version with CDI support.
 [kind-dra]
 description = Runs E2E tests for Dynamic Resource Allocation beta features against a Kubernetes master cluster created with sigs.k8s.io/kind
+job_type = e2e
 use_dind = true
 cluster = eks-prow-build-cluster
 run_if_changed = /(dra|dynamicresources|resourceclaim|deviceclass|resourceslice|resourceclaimtemplate|dynamic-resource-allocation|pkg/apis/resource|api/resource)/.*.go
@@ -37,6 +38,7 @@ release_informing = true
 # Compared to ci-kind-dra, this one enables all DRA-related features.
 [kind-dra-all]
 description = Runs E2E tests for Dynamic Resource Allocation alpha and beta features against a Kubernetes master cluster created with sigs.k8s.io/kind
+job_type = e2e
 cluster = eks-prow-build-cluster
 all_features = true
 use_dind = true
@@ -47,6 +49,7 @@ run_if_changed = /(dra|dynamicresources|resourceclaim|deviceclass|resourceslice|
 # It enables and tests the same features as kind-dra.
 [kind-dra-n-1]
 description = Runs E2E tests for Dynamic Resource Allocation beta features against a Kubernetes master cluster created with sigs.k8s.io/kind with kubelet from the "current - 1" release.
+job_type = e2e
 use_dind = true
 cluster = eks-prow-build-cluster
 run_if_changed = /(dra|dynamicresources|resourceclaim|deviceclass|resourceslice|resourceclaimtemplate|dynamic-resource-allocation|pkg/apis/resource|api/resource)/.*.go
@@ -57,11 +60,23 @@ kubelet_skew = 1
 # It enables and tests the same features as kind-dra.
 [kind-dra-n-2]
 description = Runs E2E tests for Dynamic Resource Allocation beta features against a Kubernetes master cluster created with sigs.k8s.io/kind with kubelet from the "current - 2" release.
+job_type = e2e
 use_dind = true
 cluster = eks-prow-build-cluster
 run_if_changed = /(dra|dynamicresources|resourceclaim|deviceclass|resourceslice|resourceclaimtemplate|dynamic-resource-allocation|pkg/apis/resource|api/resource)/.*.go
 kubelet_skew = 2
 
+# This executes long-running unit tests in test/e2e/dra.
+# They don't run in pull-kubernetes-unit or pull-kubernetes-integration
+# because they are too slow and depend on kind.
+[dra-integration]
+description = Runs integration tests for DRA which need some additional setup in the job.
+use_dind = true
+job_type = integration
+cluster = eks-prow-build-cluster
+run_if_changed = /(dra|dynamicresources|resourceclaim|deviceclass|resourceslice|resourceclaimtemplate|dynamic-resource-allocation|pkg/apis/resource|api/resource)/.*.go
+generate = canary
+
 # 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

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

@@ -88,6 +88,7 @@ presubmits:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250613-876fb90a97-master
         command:
         - runner.sh
+
         {%- if job_type == "node" %}
         args:
         - kubetest2
@@ -111,7 +112,18 @@ presubmits:
         - name: KUBE_SSH_USER
           value: core
         {%- endif %}
-        {%- else %}
+
+        {%- elif job_type == "integration" %}
+        - /bin/bash
+        - -xce
+        - |
+          # The latest kind is assumed to work also for older release branches, should this job get forked.
+          curl --fail --silent --show-error --location https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" kind
+          # "Normal" integration tests under test/integration/dra run in pull-kubernetes-integration.
+          # The "more complex" ones with a dependency on kind are under test/e2e/dra, in a separate Ginkgo suite.
+          make test WHAT="test/e2e/dra" KIND_COMMAND=kind KUBE_TIMEOUT=-timeout=30m KUBE_TEST_ARGS="-args -ginkgo.junit-report=${ARTIFACTS}/junit.xml"
+
+        {%- elif job_type == "e2e" %}
         args:
         - /bin/bash
         - -xce