Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#493 from nitkon/critest
Browse files Browse the repository at this point in the history
Critest
  • Loading branch information
k8s-ci-robot authored Aug 2, 2019
2 parents 5e04185 + 69c5a52 commit 24f0bb5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
9 changes: 7 additions & 2 deletions hack/install-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ set -o errexit
set -o nounset
set -o pipefail

arch=$(uname -m)

# Workarounds for error "Failed to fetch https://packagecloud.io/github/git-lfs/ubuntu/dists/trusty/InRelease"
# TODO: remove it after the issue fixed in git-lfs.
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
Expand All @@ -38,7 +40,10 @@ sudo add-apt-repository \
sudo apt-get update
# Docker is downgraded because exec process in 18.x doesn't inherit additional group id from the init process.
# See more details at https://github.com/moby/moby/issues/38865.
sudo apt-get -y --allow-downgrades install docker-ce=5:18.09.5~3-0~ubuntu-xenial

if [ "$arch" == x86_64 ]; then
sudo apt-get -y --allow-downgrades install docker-ce=5:18.09.5~3-0~ubuntu-xenial
elif [ "$arch" == ppc64le ]; then
sudo apt-get -y --allow-downgrades install docker-ce=18.06.0~ce~3-0~ubuntu
fi
# Restart docker daemon.
sudo service docker restart
8 changes: 7 additions & 1 deletion hack/run-critest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,14 @@ set -o errexit
set -o nounset
set -o pipefail

arch=$(uname -m)

# Install nsenter
docker run --rm -v /usr/local/bin:/target jpetazzo/nsenter
if [ "$arch" == x86_64 ]; then
docker run --rm -v /usr/local/bin:/target jpetazzo/nsenter
else
apt-get install util-linux
fi

# Start dockershim first
/usr/local/bin/kubelet --v=3 --logtostderr --experimental-dockershim &
Expand Down

0 comments on commit 24f0bb5

Please sign in to comment.