Skip to content

Commit 79fe3cf

Browse files
committed
DRA: remove debugging code
Enabling CDI support in containerd will be done in the local-up-cluster.sh, so removing from here.
1 parent 28c3aef commit 79fe3cf

File tree

2 files changed

+2
-24
lines changed

2 files changed

+2
-24
lines changed

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -499,21 +499,10 @@ presubmits:
499499
- /bin/bash
500500
- -xce
501501
- |
502-
timeout 30 service docker stop || true
503-
# force kill docker related processes
504-
(cat /var/run/docker*.pid | xargs kill -9) || true
505-
rm /var/log/docker.log
506-
containerd config default > /etc/containerd/config.toml
507-
sed -ie 's/enable_cdi = false/enable_cdi = true/' /etc/containerd/config.toml
508-
containerd >/var/log/containerd.log 2>&1 &
509-
service docker start
510-
ps -efww
511-
cat /var/log/docker.log
512-
cat /var/log/containerd.log
513502
make WHAT="cmd/kube-apiserver cmd/kube-scheduler cmd/kube-controller-manager cmd/kube-proxy cmd/kubelet"
514503
# "Normal" integration tests under test/integration/dra run in pull-kubernetes-integration.
515504
# The "more complex" ones with a dependency on local-up-cluster.sh are under test/integration/dra/cluster, in a separate Ginkgo suite.
516-
make test WHAT="test/integration/dra/cluster" FULL_LOG=true KUBETEST_IN_DOCKER=true CONTAINER_RUNTIME_ENDPOINT=/var/run/docker/containerd/containerd.sock KUBERNETES_SERVER_BIN_DIR="$(pwd)/_output/local/bin/linux/amd64" KUBERNETES_SERVER_CACHE_DIR=/tmp/cache-dir KUBE_TIMEOUT=-timeout=30m KUBE_TEST_ARGS="-args -ginkgo.junit-report=${ARTIFACTS}/junit.xml"
505+
make test WHAT="test/integration/dra/cluster" FULL_LOG=true KUBETEST_IN_DOCKER=true KUBERNETES_SERVER_BIN_DIR="$(pwd)/_output/local/bin/linux/amd64" KUBERNETES_SERVER_CACHE_DIR=/tmp/cache-dir KUBE_TIMEOUT=-timeout=30m KUBE_TEST_ARGS="-args -ginkgo.junit-report=${ARTIFACTS}/junit.xml"
517506
# docker-in-docker needs privileged mode
518507
securityContext:
519508
privileged: true

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -117,21 +117,10 @@ presubmits:
117117
- /bin/bash
118118
- -xce
119119
- |
120-
timeout 30 service docker stop || true
121-
# force kill docker related processes
122-
(cat /var/run/docker*.pid | xargs kill -9) || true
123-
rm /var/log/docker.log
124-
containerd config default > /etc/containerd/config.toml
125-
sed -ie 's/enable_cdi = false/enable_cdi = true/' /etc/containerd/config.toml
126-
containerd >/var/log/containerd.log 2>&1 &
127-
service docker start
128-
ps -efww
129-
cat /var/log/docker.log
130-
cat /var/log/containerd.log
131120
make WHAT="cmd/kube-apiserver cmd/kube-scheduler cmd/kube-controller-manager cmd/kube-proxy cmd/kubelet"
132121
# "Normal" integration tests under test/integration/dra run in pull-kubernetes-integration.
133122
# The "more complex" ones with a dependency on local-up-cluster.sh are under test/integration/dra/cluster, in a separate Ginkgo suite.
134-
make test WHAT="test/integration/dra/cluster" FULL_LOG=true KUBETEST_IN_DOCKER=true CONTAINER_RUNTIME_ENDPOINT=/var/run/docker/containerd/containerd.sock KUBERNETES_SERVER_BIN_DIR="$(pwd)/_output/local/bin/linux/amd64" KUBERNETES_SERVER_CACHE_DIR=/tmp/cache-dir KUBE_TIMEOUT=-timeout=30m KUBE_TEST_ARGS="-args -ginkgo.junit-report=${ARTIFACTS}/junit.xml"
123+
make test WHAT="test/integration/dra/cluster" FULL_LOG=true KUBETEST_IN_DOCKER=true KUBERNETES_SERVER_BIN_DIR="$(pwd)/_output/local/bin/linux/amd64" KUBERNETES_SERVER_CACHE_DIR=/tmp/cache-dir KUBE_TIMEOUT=-timeout=30m KUBE_TEST_ARGS="-args -ginkgo.junit-report=${ARTIFACTS}/junit.xml"
135124
{%- elif job_type == "e2e" %}
136125
args:
137126
- /bin/bash

0 commit comments

Comments
 (0)