Derek McGowan
ec4d7736d8
Increase timeout for linux integration tests
...
The integration test times have slightly increased and are often
hitting the 25 minutes timeout. This increases to give more room
but still keeps it low enough to catch regressions in tests
causing longer than expected execution.
Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-03-23 12:10:41 -07:00
Derek McGowan
d54225ccee
Merge pull request #5125 from Iceber/add-caller-info
2021-03-23 08:28:20 -07:00
Phil Estes
717dde3c27
Merge pull request #5252 from thaJeztah/separate_userns
...
Move RunningInUserNS() to its own package
2021-03-23 08:56:04 -04:00
Sebastiaan van Stijn
708299ca40
Move RunningInUserNS() to its own package
...
This allows using the utility without bringing whole of "sys" with it.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-23 11:29:53 +01:00
Iceber Gu
bf9db47e8a
add caller info to the testHook
...
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
2021-03-23 09:26:27 +08:00
Derek McGowan
edf6484165
Merge pull request #5243 from AkihiroSuda/update-zfs-20210322
...
go.mod: github.com/containerd/zfs v0.0.0-20210322090317-0e92c2247fb7 (for snapshot usage)
2021-03-22 15:09:58 -07:00
Derek McGowan
4e919ffaba
Merge pull request #5244 from pacoxu/fix/night-run
2021-03-22 06:12:03 -07:00
pacoxu
01765d0974
night ci fix: add packages for ubuntu 20.04
...
Signed-off-by: pacoxu <paco.xu@daocloud.io>
2021-03-22 17:57:14 +08:00
Akihiro Suda
8cdc1f13b6
go.mod: github.com/containerd/zfs v0.0.0-20210322090317-0e92c2247fb7
...
Contains "Implements zfs usage by returning the USED field from the zfs snapshot"
(https://github.com/containerd/zfs/pull/38 )
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-03-22 16:58:00 +09:00
Maksym Pavlenko
56f17a0856
Merge pull request #5148 from wzshiming/fix/defer-cleanup
...
runtime/v2: Fix defer cleanup for TaskManager.Create
2021-03-20 13:24:42 -07:00
Shiming Zhang
30e1e66e5c
runtime/v2: Fix defer cleanup
...
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
2021-03-20 18:40:36 +08:00
Akihiro Suda
6150170d95
Merge pull request #5235 from estesp/testimage-userns-ro
...
Use specific image for user namespaces tests
2021-03-20 14:34:14 +09:00
Phil Estes
33776ada04
Use specific image for user namespaces tests
...
Due to the lack of an existing /proc dir in the rootfs of busybox, there
seems to be a race between the mount of /proc and whether the root dir
is already readonly? May need investigation, but for now use an image
that has a /proc dir existing.
Signed-off-by: Phil Estes <estesp@amazon.com>
2021-03-19 22:51:32 -04:00
Maksym Pavlenko
a47feaf462
Merge pull request #4898 from timchenxiaoyu/makefile
...
standard makefile,fix not work no macos
2021-03-19 16:05:46 -07:00
Michael Crosby
f7bd43c137
Merge pull request #5216 from estesp/testimage-429
...
Switch test image to a non rate-limited manifest list
2021-03-19 15:02:47 -04:00
Michael Crosby
a7b456d2f8
Merge pull request #5233 from kzys/mkfs-error
...
Specifically mention "mkfs.ext4" on the error from the command
2021-03-19 14:31:38 -04:00
Michael Crosby
e0c94bb269
Merge pull request #4708 from kzys/enable-criu
...
Re-enable CRIU tests by not using overlayfs snapshotter
2021-03-19 14:23:05 -04:00
Derek McGowan
0d569f8f4a
Merge pull request #5229 from wzshiming/fix/log-cp-file
...
Fix error log when copy file
2021-03-19 10:51:23 -07:00
Kazuyoshi Kato
7704fe72d0
Specifically mention "mkfs.ext4" on the error from the command
...
Before the change, the error on the caller-side (e.g. ctr) was
something like
> unpack: failed to prepare extraction snapshot "...": exit status 5:
> unknown
which was too cryptic.
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2021-03-19 10:38:47 -07:00
Phil Estes
2061227b56
Merge pull request #4949 from hs0210/work
...
Add unit test for func in remotes/docker/pusher.go
2021-03-19 13:11:46 -04:00
Shiming Zhang
1410220d8f
Fix error log when copy file
...
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
2021-03-20 00:13:00 +08:00
Phil Estes
86a7db4865
Merge pull request #5227 from tonistiigi/grpc-stream-close
...
contentproxy: ensure grpc stream is closed on commit
2021-03-19 09:21:56 -04:00
Phil Estes
fbf79545df
Merge pull request #5230 from wzshiming/fix/log-kill-shim
...
Fix error log when kill shim
2021-03-19 09:20:18 -04:00
Shiming Zhang
fe787efa2b
Fix error log when kill shim
...
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
2021-03-19 19:03:47 +08:00
Tonis Tiigi
8d8c15ca53
contentproxy: ensure grpc stream is closed on commit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-03-18 22:46:49 -07:00
Maksym Pavlenko
2d5f9bf870
Merge pull request #4990 from kzys/host-status
...
ci: log the status of GitHub Actions' VM at the end
2021-03-18 15:56:46 -07:00
Phil Estes
6e343f25e8
Switch test image to a non rate-limited manifest list
...
Signed-off-by: Phil Estes <estesp@amazon.com>
2021-03-18 14:07:32 -04:00
Michael Crosby
969b3d638b
Merge pull request #5202 from wzshiming/fix/dgst-debug
...
Change dgst to digest in debug
2021-03-18 11:54:44 -04:00
Michael Crosby
63b605d8fd
Merge pull request #5210 from thaJeztah/bump_k8s
...
go.mod: kubernetes v1.20.4
2021-03-18 11:44:55 -04:00
Michael Crosby
3f98a6d2d3
Merge pull request #5211 from pacoxu/pause/3.5
...
upgrade pause image to 3.5 for non-root
2021-03-18 11:43:59 -04:00
Michael Crosby
31c0587351
Merge pull request #5218 from alakesh/runtime-v2-stress
...
change default runtime for containerd-stress app
2021-03-18 11:42:30 -04:00
Phil Estes
92c1bbb253
Merge pull request #5222 from fuweid/follow-up-5174
...
runtime/v2: add comment for checkCopyShimLogError
2021-03-18 09:18:43 -04:00
Wei Fu
9fdc96c095
runtime/v2: add comment for checkCopyShimLogError
...
After #4906 , containerd opens fifo in read/write mode in linux platform
The original comment doesn't correct and is removed by #5174 .
```
// original comment
// When using a multi-container shim, the fifo of the 2nd to Nth
// container will not be opened when the ctx is done. This will
// cause an ErrReadClosed that can be ignored.
```
However, we should add comment for checkCopyShimLogError to mention why
we call checkCopyShimLogError. The checkCopyShimLogError, it is to prevent
the flood of expected error messages after task die and the expected
errors depend on platform.
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2021-03-18 13:02:28 +08:00
Alakesh Haloi
24602e7a98
change default runtime for containerd-stress app
...
This fixes following warning message by changing the default runtime
to io.containerd.runc.v2 and does not require user to set the runtime
from command line anymore.
"WARN[2021-03-17T21:11:01.441207858Z] runtime v1 is deprecated since
containerd v1.4, consider using runtime v2"
Signed-off-by: Alakesh Haloi <alakeshh@amazon.com>
2021-03-17 21:49:30 +00:00
Phil Estes
32a08f1a6a
Merge pull request #4847 from cpuguy83/devices_by_dir
...
Support adding devices by dir
2021-03-17 09:41:02 -04:00
Phil Estes
b395f2f9a9
Merge pull request #5160 from MadhavJivrajani/master
...
Use net.IP.IsLoopback() to match loopback addresses
2021-03-17 09:37:17 -04:00
Phil Estes
a0cc9b432d
Merge pull request #5195 from fuweid/fix-5173
...
runtime/v2/runc: fix leaking socket path
2021-03-17 09:33:41 -04:00
Fu, Wei
1a0973dde3
Merge pull request #5206 from Iceber/fix-new-container
...
runtime/v2/runc: fix the defer cleanup of the NewContainer
2021-03-17 12:11:45 +08:00
Akihiro Suda
5978fe807a
Merge pull request #5212 from thaJeztah/gofmt_all_the_things
...
gofmt -s -w all the things
2021-03-17 10:50:26 +09:00
Kazuyoshi Kato
8731888ec0
Re-enable CRIU tests by not using overlayfs snapshotter
...
While the issue hasn't been fixed in the kernel yet, we can workaround
the issue by not using overlayfs snapshotter.
The newly added step runs all tests that match /TestCheckpoint/.
So, TestCRWithImagePath has been renamed to match the regexp.
Fixes #3930 .
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2021-03-16 16:48:30 -07:00
Kazuyoshi Kato
b520428b5a
Fix CRIU
...
- process.Init#io could be nil
- Make sure CreateTaskRequest#Options is not empty before unmarshaling
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2021-03-16 16:46:45 -07:00
Sebastiaan van Stijn
4e76bcf061
gofmt -s -w all the things
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-16 21:29:41 +01:00
Derek McGowan
f201b78b90
Merge pull request #5205 from dmcgowan/prepare-v1.5.0-beta.4
...
Prepare release notes for v1.5.0-beta.4
2021-03-16 10:45:28 -07:00
Derek McGowan
767600899b
Merge pull request #5207 from thaJeztah/bump_btrfs
...
go.mod: update various dependencies
2021-03-16 10:34:51 -07:00
Sebastiaan van Stijn
569023fd51
go.mod: github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14
...
full diff: eb1350a751...dbaa18c31c
2021-03-16 17:56:01 +01:00
Sebastiaan van Stijn
0e1f59e896
go.mod: github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960
...
no significant changes; removes the vendor directory in the repo
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-16 16:49:06 +01:00
Michael Crosby
1a28c2f7ec
Merge pull request #5200 from pacoxu/skip-error-check
...
ctr plugin ls: plugin status should be skip, not error
2021-03-16 11:48:56 -04:00
pacoxu
ffff688663
upgrade pause image to 3.5 for non-root
...
Signed-off-by: pacoxu <paco.xu@daocloud.io>
2021-03-16 23:20:35 +08:00
Sebastiaan van Stijn
88d3881e1d
go.mod: github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d
...
full diff: 0724c46b32...115abcc95a
2021-03-16 16:01:16 +01:00
Sebastiaan van Stijn
a22c43fa44
go.mod: github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97
...
full diff: ffdde14902...20793ff83c
2021-03-16 15:36:29 +01:00
