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

Update cri validation test version.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2018-03-26 22:20:51 +00:00
parent 8958b489ba
commit 74e45c0392
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -74,7 +74,8 @@ script:
- if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH TESTFLAGS_PARALLEL=1 make integration ; fi - if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH TESTFLAGS_PARALLEL=1 make integration ; fi
- if [ "$GOOS" = "linux" ]; then - if [ "$GOOS" = "linux" ]; then
sudo PATH=$PATH containerd -log-level debug &> /tmp/containerd-cri.log & sudo PATH=$PATH containerd -log-level debug &> /tmp/containerd-cri.log &
sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=/var/run/containerd/containerd.sock --ginkgo-flags=--nodes=8 validation ; sudo ctr version ;
sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=/var/run/containerd/containerd.sock --parallel=8 ;
exit_code=$? ; exit_code=$? ;
test $exit_code -ne 0 && cat /tmp/containerd-cri.log ; test $exit_code -ne 0 && cat /tmp/containerd-cri.log ;
sudo pkill containerd ; sudo pkill containerd ;

2
daemon_config_linux_test.go
View File

@ -127,6 +127,8 @@ func testDaemonRuntimeRoot(t *testing.T, noShim bool) {
[plugins.linux] [plugins.linux]
no_shim = %v no_shim = %v
runtime_root = "%s" runtime_root = "%s"
[plugins.cri]
stream_server_port = "0"
`, noShim, runtimeRoot) `, noShim, runtimeRoot)
client, _, cleanup := newDaemonWithConfig(t, configTOML) client, _, cleanup := newDaemonWithConfig(t, configTOML)

1
script/setup/install-cni
View File

@ -42,6 +42,7 @@ bash -c 'cat >'$CNI_CONFIG_DIR'/10-containerd-net.conflist <<EOF
"bridge": "cni0", "bridge": "cni0",
"isGateway": true, "isGateway": true,
"ipMasq": true, "ipMasq": true,
"promiscMode": true,
"ipam": { "ipam": {
"type": "host-local", "type": "host-local",
"subnet": "10.88.0.0/16", "subnet": "10.88.0.0/16",

3
script/setup/install-critools
View File

@ -20,7 +20,8 @@
# #
set -eu -o pipefail set -eu -o pipefail
CRITEST_COMMIT=b184f9aefe60a4441330e615ee20634ee26474fb go get -u github.com/onsi/ginkgo/ginkgo
CRITEST_COMMIT=207e773f72fde8d8aed1447692d8f800a6686d6c
go get -d github.com/kubernetes-incubator/cri-tools/... go get -d github.com/kubernetes-incubator/cri-tools/...
cd $GOPATH/src/github.com/kubernetes-incubator/cri-tools cd $GOPATH/src/github.com/kubernetes-incubator/cri-tools
git checkout $CRITEST_COMMIT git checkout $CRITEST_COMMIT