Skip to content

Commit 8a0acef

Browse files
authored
Merge pull request #35017 from pohly/dra-integration-tests
DRA canary: fix dind in integration test job
2 parents 9e5f6a0 + 11ba9dc commit 8a0acef

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,9 @@ presubmits:
418418
# "Normal" integration tests under test/integration/dra run in pull-kubernetes-integration.
419419
# The "more complex" ones with a dependency on kind are under test/e2e/dra, in a separate Ginkgo suite.
420420
make test WHAT="test/e2e/dra" KIND_COMMAND=kind KUBE_TIMEOUT=-timeout=30m KUBE_TEST_ARGS="-args -ginkgo.junit-report=${ARTIFACTS}/junit.xml"
421+
# docker-in-docker needs privileged mode
422+
securityContext:
423+
privileged: true
421424
resources:
422425
limits:
423426
cpu: 2

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@ presubmits:
229229
KUBECONFIG=${HOME}/.kube/config ${ginkgo} run --nodes=8 --timeout=24h --silence-skips --force-newlines --no-color --label-filter="DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation } {%- if kubelet_skew|int > 0 %}$kubelet_label_filter{%- endif %} {%- if not all_features %} && !Alpha {%- endif %} && !Flaky {%- if not ci %} && !Slow {%- endif %}" ${e2e_test} -- -provider=local -report-dir="${ARTIFACTS}" -report-complete-ginkgo -report-complete-junit &
230230
GINKGO_E2E_PID=$!
231231
wait "${GINKGO_E2E_PID}"
232+
{%- endif %}
233+
{%- if use_dind == "true" %}
232234
# docker-in-docker needs privileged mode
233235
securityContext:
234236
privileged: true

0 commit comments

Comments
 (0)