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

Don't clash with GH Actions runner's containerd

Browse Source 
GH runners now have a systemd-run containerd running on the standard
socket, impacting the CRI test's expectation of our CI-built containerd
running there.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
This commit is contained in:
Phil Estes 2020-07-15 13:57:32 -04:00
parent d2776ef6bc
commit 7af3d7e176
No known key found for this signature in database
GPG Key ID: 0F386284C03A1162
1 changed files with 9 additions and 8 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: