Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Stable 1.5 backports #1546

Merged
merged 3 commits into from
Apr 17, 2019
Merged

Stable 1.5 backports #1546

merged 3 commits into from
Apr 17, 2019

Conversation

egernst
Copy link
Member

@egernst egernst commented Apr 16, 2019 •
edited
Loading

Backport fixes from master

Patches pulled:

edc77a0 Merge pull request #1502 from amshinde/make-tc-default
3852682 network: Change the package level network default
33bae70 network: Make tcfilter model as default

da08b3a Merge pull request #1509 from bergwolf/kata-check
9ac6831 cli: fix kata-check test

Patches not backported:

Questionable:

This set has conflicts:
d5a759e Merge pull request #1526 from bergwolf/ut-non-root
9040f6a ut: fix UT failure due to incorrect cleanup
a0f49a9 ut: fix UT failure due to non-root

c08976e Merge pull request #1494 from lifupan/fixstop
f7223c6 shimv2: fix the issue of stop container failed

Confidently Rejected

Not an issue with 1.5, as we don't provide host cgroups:
d99693a Merge pull request #1518 from lifupan/fixtop
1a1f93b virtcontainers: add a kata specific prefix to host cgroups path

5d875be (origin/master, origin/HEAD) Merge pull request #1409 from teawater/vmcache_templating
343a0d3 factory: Make VMCache and VM templating can work together

168665b Merge pull request #1439 from YongjiXie/pass-correct-mount-type-for-ephemeral-volumes
2d422a8 agent: pass correct mount type to agent for ephemeral volumes

2b45f0b Merge pull request #1528 from bergwolf/grpc
f512542 sandbox: return ErrNoSuchContainer when failing to find a container
8215a3c shimv2: convert vc errors to grpc errors
cf90751 vc: export vc error types

ae022dc Merge pull request #1428 from gabibeyer/slashNburn
b08ab6a vc: modify ioctl function to handle shim test
c425079 vc: Deprecate CC proxy and shim
c658770 vc: remove virtc api cli
d4ef9c0 vc: deprecate hyperstart agent

6e59578 Merge pull request #1530 from devimc/topic/virtcontainers/inheritParentCpuCgroup
59e3956 virtcontainers: inherit parent's CPU constraint

9b622b7 Merge pull request #1485 from awprice/k8s-empty-dir-local
76c4639 storage: create k8s emptyDir inside VM
228d151 mount: Add check for k8s host empty directory
70c1931 mounts: Add check for system volumes

e15f3e4 Merge pull request #1337 from jongwu/bypass
98687a3 Template: enable template for arm64

dd5c6aa Merge pull request #1507 from bergwolf/state
c414599 types: remove pid from sandbox state
03ee25d agent: treat container as shared pidns whenever it has pidns path
616f26c types: split sandbox and container state

6d81e44 Merge pull request #1437 from teawater/vmcache_grpc
ace8115 factory: Make factory status can show status of VMCache server
f639787 factory: Make factory destroy can stop VMCache server

@egernst
Copy link
Member Author

egernst commented Apr 16, 2019

/test

@jcvenegas
Copy link
Member

http://jenkins.katacontainers.io/job/kata-containers-runtime-sles-12-PR/44/console

--- FAIL: TestNsEnterSuccessful (0.00s)
    <autogenerated>:1: 
                          
	Error Trace:	nsenter_test.go:210
        
	Error:      	Expected nil, but got: &errors.errorString{s:"failed to open target ns: failed to Statfs \"/proc/106472/ns/cgroup\": no such file or directory"}
        
	Messages:   	failed to open target ns: failed to Statfs "/proc/106472/ns/cgroup": no such file or directory
    <autogenerated>:1: 
                          
	Error Trace:	nsenter_test.go:240
        
	Error:      	Not equal: 
        
	            	expected: "cgroup"
        
	            	actual: "0"
    <autogenerated>:1: 
                          
	Error Trace:	nsenter_test.go:240
        
	Error:      	Not equal: 
        
	            	expected: "ipc:[4026533094]"
        
	            	actual: "0"
    <autogenerated>:1: 
                          
	Error Trace:	nsenter_test.go:240
        
	Error:      	Not equal: 
        
	            	expected: "net:[4026533097]"
        
	            	actual: "0"
    <autogenerated>:1: 
                          
	Error Trace:	nsenter_test.go:240
        
	Error:      	Not equal: 
        
	            	expected: "pid:[4026533095]"
        
	            	actual: "0"
    <autogenerated>:1: 
                          
	Error Trace:	nsenter_test.go:240
        
	Error:      	Not equal: 
        
	            	expected: "uts:[4026533093]"
        
	            	actual: "0"
FAIL

http://jenkins.katacontainers.io/job/kata-containers-runtime-ubuntu-18-04-PR-initrd/1812/console

• Failure in Spec Teardown (AfterEach) [73.495 seconds]
[k8s.io] Container
/tmp/jenkins/workspace/kata-containers-runtime-ubuntu-18-04-PR-initrd/go/src/github.com/kubernetes-sigs/cri-tools/pkg/framework/framework.go:72
  runtime should support basic operations on container
  /tmp/jenkins/workspace/kata-containers-runtime-ubuntu-18-04-PR-initrd/go/src/github.com/kubernetes-sigs/cri-tools/pkg/validate/container.go:68
    runtime should support stopping container [Conformance] [AfterEach]
    /tmp/jenkins/workspace/kata-containers-runtime-ubuntu-18-04-PR-initrd/go/src/github.com/kubernetes-sigs/cri-tools/pkg/validate/container.go:100

    Apr 16 21:50:05.405: stop container "b789671d2c8bcd2b9a16f49bb9cf8f024c533d2223fb3e29394d0d2af65b9b98" timeout.
    

    /tmp/jenkins/workspace/kata-containers-runtime-ubuntu-18-04-PR-initrd/go/src/github.com/kubernetes-sigs/cri-tools/pkg/validate/container.go:332
------------------------------


Summarizing 1 Failure:

[Fail] [k8s.io] Container runtime should support basic operations on container [AfterEach] runtime should support stopping container [Conformance] 
/tmp/jenkins/workspace/kata-containers-runtime-ubuntu-18-04-PR-initrd/go/src/github.com/kubernetes-sigs/cri-tools/pkg/validate/container.go:332

Ran 5 of 71 Specs in 73.540 seconds
FAIL! -- 4 Passed | 1 Failed | 0 Pending | 66 Skipped

http://jenkins.katacontainers.io/job/kata-containers-runtime-ubuntu-nemu/235/console

16:15:07 Summarizing 2 Failures:
16:15:07 
16:15:07 [Fail] docker exec [AfterEach] modifying a container with exec should have the changes 
16:15:07 /tmp/jenkins/workspace/kata-containers-runtime-ubuntu-nemu/go/src/github.com/kata-containers/tests/integration/docker/exec_test.go:35
16:15:07 
16:15:07 [Fail] docker exec [BeforeEach] check exit code using exec should have the value assigned 
16:15:07 /tmp/jenkins/workspace/kata-containers-runtime-ubuntu-nemu/go/src/github.com/kata-containers/tests/integration/docker/exec_test.go:31
16:15:07 
16:15:07 Ran 225 of 234 Specs in 2288.334 seconds
16:15:07 FAIL! -- 223 Passed | 2 Failed | 0 Pending | 9 Skipped --- FAIL: TestIntegration (2311.67s)
16:15:07 FAIL
16:15:07

http://jenkins.katacontainers.io/job/kata-containers-runtime-fedora-vsocks-PR/632/console

• Failure in Spec Teardown (AfterEach) [73.934 seconds]
[k8s.io] Container
/tmp/jenkins/workspace/kata-containers-runtime-fedora-vsocks-PR/go/src/github.com/kubernetes-sigs/cri-tools/pkg/framework/framework.go:72
  runtime should support basic operations on container
  /tmp/jenkins/workspace/kata-containers-runtime-fedora-vsocks-PR/go/src/github.com/kubernetes-sigs/cri-tools/pkg/validate/container.go:68
    runtime should support stopping container [Conformance] [AfterEach]
    /tmp/jenkins/workspace/kata-containers-runtime-fedora-vsocks-PR/go/src/github.com/kubernetes-sigs/cri-tools/pkg/validate/container.go:100

    Apr 16 21:43:49.915: stop container "e16f2cebf6d0d1c9b9ef6985ad3bdefa79d388c47d9c4ac6cc2984dcfc9e5ccc" timeout.
    

    /tmp/jenkins/workspace/kata-containers-runtime-fedora-vsocks-PR/go/src/github.com/kubernetes-sigs/cri-tools/pkg/validate/container.go:332
------------------------------


Summarizing 1 Failure:

[Fail] [k8s.io] Container runtime should support basic operations on container [AfterEach] runtime should support stopping container [Conformance] 
/tmp/jenkins/workspace/kata-containers-runtime-fedora-vsocks-PR/go/src/github.com/kubernetes-sigs/cri-tools/pkg/validate/container.go:332

Ran 5 of 68 Specs in 73.977 seconds
FAIL! -- 4 Passed | 1 Failed | 0 Pending | 63 Skipped

http://jenkins.katacontainers.io/job/kata-containers-runtime-fedora-PR/1920/console

• Failure in Spec Teardown (AfterEach) [74.163 seconds]
[k8s.io] Container
/tmp/jenkins/workspace/kata-containers-runtime-fedora-PR/go/src/github.com/kubernetes-sigs/cri-tools/pkg/framework/framework.go:72
  runtime should support basic operations on container
  /tmp/jenkins/workspace/kata-containers-runtime-fedora-PR/go/src/github.com/kubernetes-sigs/cri-tools/pkg/validate/container.go:68
    runtime should support stopping container [Conformance] [AfterEach]
    /tmp/jenkins/workspace/kata-containers-runtime-fedora-PR/go/src/github.com/kubernetes-sigs/cri-tools/pkg/validate/container.go:100

    Apr 16 21:23:10.514: stop container "18c9bb241ead41c8da5816f21d3b62c3ef3bfb2e6d279698a2a338638550d8b7" timeout.
    

    /tmp/jenkins/workspace/kata-containers-runtime-fedora-PR/go/src/github.com/kubernetes-sigs/cri-tools/pkg/validate/container.go:332
------------------------------


Summarizing 1 Failure:

[Fail] [k8s.io] Container runtime should support basic operations on container [AfterEach] runtime should support stopping container [Conformance] 
/tmp/jenkins/workspace/kata-containers-runtime-fedora-PR/go/src/github.com/kubernetes-sigs/cri-tools/pkg/validate/container.go:332

Ran 5 of 68 Specs in 74.230 seconds
FAIL! -- 4 Passed | 1 Failed | 0 Pending | 63 Skipped

http://jenkins.katacontainers.io/job/kata-containers-runtime-centos-7-4-q-35-PR/1605/console

docker: Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?.
See 'docker run --help'.
make: *** [ramdisk] Error 125
Process leaked file descriptors. See https://jenkins.io/redirect/troubleshooting/process-leaked-file-descriptors for more information
Build step 'Execute shell' marked build as failure
Performing Post build task...
Match found for :.* : True
Logical operation result is TRUE
Running script  : #!/bin/bash

http://jenkins.katacontainers.io/job/kata-containers-runtime-ARM-18.04-PR/483/console

16:02:01 --- FAIL: TestEnvGetEnvInfoSetsCPUType (0.02s)
16:02:01     assertions.go:239: 
                          
	Error Trace:	kata-env_generic_test.go:48
16:02:01         
	            	
			kata-env_arm64_test.go:98
16:02:01         
	Error:      	Not equal: 
16:02:01         
	            	expected: main.EnvInfo{Meta:main.MetaInfo{Version:"1.0.20"}, Runtime:main.RuntimeInfo{Version:main.RuntimeVersionInfo{Semver:"1.5.3", Commit:"0baa56bb694bd0ffc8f7d623a2a1c1cdd909d69f", OCI:"1.0.1-dev"}, Config:main.RuntimeConfigInfo{Path:"/tmp/836348800/runtime.toml"}, Debug:false, Trace:false, DisableGuestSeccomp:false, DisableNewNetNs:false, Path:"/tmp/go-build793471919/b001/cli.test"}, Hypervisor:main.HypervisorInfo{MachineType:"machineType", Version:"QEMU emulator version 2.7.0+git.741f430a96-6.1, Copyright (c) 2003-2016 Fabrice Bellard and the QEMU Project developers", Path:"/tmp/836348800/hypervisor", BlockDeviceDriver:"virtio-scsi", EntropySource:"/dev/urandom", Msize9p:0x2000, MemorySlots:0xa, Debug:false, UseVSock:false}, Image:main.ImageInfo{Path:"/tmp/836348800/image"}, Kernel:main.KernelInfo{Path:"/tmp/836348800/kernel", Parameters:"init=/usr/lib/systemd/systemd systemd.unit=kata-containers.target systemd.mask=systemd-networkd.service systemd.mask=systemd-networkd.socket foo=bar xyz"}, Initrd:main.InitrdInfo{Path:""}, Proxy:main.ProxyInfo{Type:"kataProxy", Version:"proxy version 0.1", Path:"/tmp/836348800/proxy", Debug:false}, Shim:main.ShimInfo{Type:"kataShim", Version:"shim version 0.1", Path:"/tmp/836348800/shim", Debug:false}, Agent:main.AgentInfo{Type:"kata"}, Host:main.HostInfo{Kernel:"99.1", Architecture:"arm64", Distro:main.DistroInfo{Name:"Foo", Version:"42"}, CPU:main.CPUInfo{Vendor:"ARM Limited", Model:"v8"}, VMContainerCapable:true, SupportVSocks:false}, Netmon:main.NetmonInfo{Version:"netmon version 0.1", Path:"/tmp/836348800/netmon", Debug:false, Enable:false}}
16:02:01         
	            	actual: main.EnvInfo{Meta:main.MetaInfo{Version:"1.0.20"}, Runtime:main.RuntimeInfo{Version:main.RuntimeVersionInfo{Semver:"1.5.3", Commit:"0baa56bb694bd0ffc8f7d623a2a1c1cdd909d69f", OCI:"1.0.1-dev"}, Config:main.RuntimeConfigInfo{Path:"/tmp/836348800/runtime.toml"}, Debug:false, Trace:false, DisableGuestSeccomp:false, DisableNewNetNs:false, Path:"/tmp/go-build793471919/b001/cli.test"}, Hypervisor:main.HypervisorInfo{MachineType:"machineType", Version:"QEMU emulator version 2.7.0+git.741f430a96-6.1, Copyright (c) 2003-2016 Fabrice Bellard and the QEMU Project developers", Path:"/tmp/836348800/hypervisor", BlockDeviceDriver:"virtio-scsi", EntropySource:"/dev/urandom", Msize9p:0x2000, MemorySlots:0xa, Debug:false, UseVSock:false}, Image:main.ImageInfo{Path:"/tmp/836348800/image"}, Kernel:main.KernelInfo{Path:"/tmp/836348800/kernel", Parameters:"init=/usr/lib/systemd/systemd systemd.unit=kata-containers.target systemd.mask=systemd-networkd.service systemd.mask=systemd-networkd.socket foo=bar xyz"}, Initrd:main.InitrdInfo{Path:""}, Proxy:main.ProxyInfo{Type:"kataProxy", Version:"proxy version 0.1", Path:"/tmp/836348800/proxy", Debug:false}, Shim:main.ShimInfo{Type:"kataShim", Version:"shim version 0.1", Path:"/tmp/836348800/shim", Debug:false}, Agent:main.AgentInfo{Type:"kata"}, Host:main.HostInfo{Kernel:"99.1", Architecture:"arm64", Distro:main.DistroInfo{Name:"Foo", Version:"42"}, CPU:main.CPUInfo{Vendor:"ARM Limited", Model:"v8"}, VMContainerCapable:true, SupportVSocks:true}, Netmon:main.NetmonInfo{Version:"netmon version 0.1", Path:"/tmp/836348800/netmon", Debug:false, Enable:false}}
16:02:01         
	            	
16:02:01         
	            	Diff:
16:02:01         
	            	--- Expected
16:02:01         
	            	+++ Actual
16:02:01         
	            	@@ -67,3 +67,3 @@
16:02:01         
	            	   VMContainerCapable: (bool) true,
16:02:01         
	            	-  SupportVSocks: (bool) false
16:02:01         
	            	+  SupportVSocks: (bool) true
16:02:01         
	            	  },

@jcvenegas
Copy link
Member

hi @Pennyzct, is there a fix for unit test in ARM CI?

@jcvenegas
Copy link
Member

@egernst I'll restart fedora as both fedora jobs failed in the same test.

@jcvenegas
Copy link
Member

#1538 is looking good so it is an issue related with this backport

@jcvenegas
Copy link
Member

@egernst could you remove c08976e Merge pull request #1494 from lifupan/fixstop from this PR ?

amshinde and others added 3 commits April 17, 2019 09:27
@amshinde
network: Make tcfilter model as default
4c764f3 
tcfilter requires no changes to the interface provided by the network
plugin and supports a larger set of plugins.

Fixes kata-containers#1501

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
@amshinde
network: Change the package level network default
749d84c 
Change the package level default network model to tcfilter.

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
@bergwolf
cli: fix kata-check test
8874e25 
We don't really require nested nor unrestricted_guest to run. And there
is no point validating host cpu properties in UT.

Fixes: kata-containers#1508

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
@egernst
Copy link
Member Author

egernst commented Apr 17, 2019

repushed

@egernst
Copy link
Member Author

egernst commented Apr 17, 2019

/test

@jcvenegas jcvenegas merged commit e53cc2e into kata-containers:stable-1.5 Apr 17, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jodh-intel jodh-intel jodh-intel approved these changes

@jcvenegas jcvenegas jcvenegas approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@egernst @jcvenegas @jodh-intel @amshinde @bergwolf