github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #108 from mikebrow/wait-for-containerd

Browse Source 
loop waiting for containerd server to respond to client connection
This commit is contained in:
Lantao Liu 2017-08-03 10:33:19 -07:00 committed by GitHub
commit 230f03a47d
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hack/test-cri.sh
View File

@ -26,9 +26,9 @@ SKIP=${SKIP:-"Streaming|RunAsUser|host port"}
REPORT_DIR=${REPORT_DIR:-"/tmp"} REPORT_DIR=${REPORT_DIR:-"/tmp"}
if [[ -z "${GOPATH}" ]]; then if [[ -z "${GOPATH}" ]]; then
echo "GOPATH is not set" echo "GOPATH is not set"
exit 1 exit 1
fi fi
if [[ ! "${PATH}" =~ (^|:)${GOPATH}/bin(|/)(:|$) ]]; then if [[ ! "${PATH}" =~ (^|:)${GOPATH}/bin(|/)(:|$) ]]; then
echo "GOPATH/bin is not in path" echo "GOPATH/bin is not in path"
@ -46,12 +46,12 @@ CRICONTAINERD_SOCK=/var/run/cri-containerd.sock
# Install critest # Install critest
if [ ! -x "$(command -v ${CRITEST})" ]; then if [ ! -x "$(command -v ${CRITEST})" ]; then
go get -d ${CRITEST_PKG}/... go get -d ${CRITEST_PKG}/...
cd ${GOPATH}/src/${CRITEST_PKG} cd ${GOPATH}/src/${CRITEST_PKG}
git fetch --all git fetch --all
git checkout ${CRITEST_VERSION} git checkout ${CRITEST_VERSION}
make make
fi fi
which ${CRITEST} which ${CRITEST}
# Start containerd # Start containerd
@ -61,11 +61,20 @@ if [ ! -x "$(command -v containerd)" ]; then
fi fi
sudo pkill containerd sudo pkill containerd
sudo containerd -l debug &> ${REPORT_DIR}/containerd.log & sudo containerd -l debug &> ${REPORT_DIR}/containerd.log &
sleep 1 # sleep 1 seconds for containerd to be ready.
# Wait for containerd to be running by using the containerd client ctr to check the version
# of the containerd server. Wait an increasing amount of time after each of five attempts
MAX_ATTEMPTS=5
attempt_num=1
until sudo ctr version &> /dev/null || (( attempt_num == MAX_ATTEMPTS ))
do
echo "Attempt $attempt_num to connect to containerd failed! Trying again in $attempt_num seconds..."
sleep $(( attempt_num++ ))
done
# Start cri-containerd # Start cri-containerd
cd ${ROOT} cd ${ROOT}
sudo _output/cri-containerd --alsologtostderr --v 4 &> ${REPORT_DIR}/cri-containerd.log & sudo _output/cri-containerd --alsologtostderr --v 4 &> ${REPORT_DIR}/cri-containerd.log &
# Run cri validation test # Run cri validation test
sudo env PATH=${PATH} GOPATH=${GOPATH} ${CRITEST} --runtime-endpoint=${CRICONTAINERD_SOCK} --focus="${FOCUS}" --ginkgo-flags="--skip=\"${SKIP}\"" validation sudo env PATH=${PATH} GOPATH=${GOPATH} ${CRITEST} --runtime-endpoint=${CRICONTAINERD_SOCK} --focus="${FOCUS}" --ginkgo-flags="--skip=\"${SKIP}\"" validation