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

Merge pull request #4380 from estesp/clashing-containerds

Browse Source 
Don't clash with GH Actions runner's containerd
This commit is contained in:
Derek McGowan 2020-07-15 12:38:01 -07:00 committed by GitHub
commit c763f3afc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/ci.yml vendored
View File

@ -415,18 +415,19 @@ jobs:
env: env:
TEST_RUNTIME: ${{ matrix.runtime }} TEST_RUNTIME: ${{ matrix.runtime }}
run: | run: |
sudo mkdir -p /etc/containerd BDIR="$(mktemp -d -p $PWD)"
sudo bash -c "cat > /etc/containerd/config.toml <<EOF mkdir -p ${BDIR}/{root,state}
cat > ${BDIR}/config.toml <<EOF
[plugins.cri.containerd.default_runtime] [plugins.cri.containerd.default_runtime]
runtime_type = \"${TEST_RUNTIME}\" runtime_type = \"${TEST_RUNTIME}\"
EOF" EOF
sudo PATH=$PATH containerd -log-level debug &> /tmp/containerd-cri.log & sudo PATH=$PATH BDIR=$BDIR /usr/local/bin/containerd -a ${BDIR}/c.sock -root ${BDIR}/root -state ${BDIR}/state -log-level debug &> ${BDIR}/containerd-cri.log &
sudo ctr version sudo BDIR=$BDIR /usr/local/bin/ctr -a ${BDIR}/c.sock version
sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=unix:///var/run/containerd/containerd.sock --parallel=8 sudo PATH=$PATH BDIR=$BDIR GOPATH=$GOPATH critest --runtime-endpoint=unix:///${BDIR}/c.sock --parallel=8
TEST_RC=$? TEST_RC=$?
test $TEST_RC -ne 0 && cat /tmp/containerd-cri.log test $TEST_RC -ne 0 && cat ${BDIR}/containerd-cri.log
sudo pkill containerd sudo pkill containerd
sudo rm -rf /etc/containerd sudo BDIR=$BDIR rm -rf ${BDIR}
test $TEST_RC -eq 0 || /bin/false test $TEST_RC -eq 0 || /bin/false
cgroup2: cgroup2:

2
script/setup/install-critools
View File

@ -21,7 +21,7 @@
set -eu -o pipefail set -eu -o pipefail
go get -u github.com/onsi/ginkgo/ginkgo go get -u github.com/onsi/ginkgo/ginkgo
CRITEST_COMMIT=75ef33dc2b4ecb08e0237d91de1b664909d262de CRITEST_COMMIT=16911795a3c33833fa0ec83dac1ade3172f6989e
go get -d github.com/kubernetes-sigs/cri-tools/... go get -d github.com/kubernetes-sigs/cri-tools/...
cd "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools cd "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools
git checkout $CRITEST_COMMIT git checkout $CRITEST_COMMIT