Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use containerd for public CI #811

Merged
merged 2 commits into from
Dec 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ defaults: &defaults
DOCKER_VERSION: "17.03.0-ce"
KUBECTL_VERSION: "v1.9.3"
KUBECTL_SHA1: "a27d808eb011dbeea876fe5326349ed167a7ed28"
# remove DIND_CRI to use dockershim
DIND_CRI: containerd
# Uncomment the following to use ginkgo.focus for e2e
# E2E_FOCUS: "Specify a regexp.*here"

Expand Down
3 changes: 3 additions & 0 deletions build/cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,9 @@ function prepare_node {
fi
ensure_build_container
echo >&2 "Installing CRI proxy package in the node container (${node})..."
if [[ ${DIND_CRI:-} = containerd ]]; then
docker exec "${node}" /bin/bash -c 'echo criproxy-nodeps criproxy/primary_cri select containerd | debconf-set-selections'
fi
docker exec "${node}" /bin/bash -c "curl -sSL '${CRIPROXY_DEB_URL}' >/criproxy.deb && dpkg -i /criproxy.deb && rm /criproxy.deb"

docker exec "${node}" mount --make-shared /dind
Expand Down