Commit Graph

9960 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
f33d38c7cb
integration: align tags of test images
I noticed we were using some different versions of the same test
images, so changing them to be the same (can help with find/replace
if we need to update them).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-12-03 15:14:09 +01:00
Maksym Pavlenko
106086d65a
Merge pull request #6321 from gabriel-samfira/update-volume-test-images
Update volume test images
2021-12-02 16:43:05 -08:00
Gabriel Adrian Samfira
fd0850e9ef
Update continuity dependency
This change ensures that Windows security info is
copied.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
2021-12-03 00:26:45 +02:00
Gabriel Adrian Samfira
ff9d7aef32
Update volume test images
Update volume test images to version 2.1. This enables Windows
volume tests.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
2021-12-03 00:02:45 +02:00
Phil Estes
08812f3fb7
Merge pull request #6201 from dmcgowan/test-restart-monitor-check-timestamp
Update TestRestartMonitor expected time check
2021-12-02 15:30:27 -05:00
Phil Estes
8063fdab08
Merge pull request #6319 from dmcgowan/update-windows-integration-image-to-ghcr
Move test volume images from gcr to ghcr
2021-12-02 15:02:22 -05:00
Derek McGowan
bae0d88ae7
Add error logging on cleanup
Check the errors for task and container deletion during restart test
cleanup.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-12-02 11:47:14 -08:00
Maksym Pavlenko
d43a90b984
Merge pull request #6301 from mxpv/migration
Revert shim service plugin migration
2021-12-02 11:11:39 -08:00
Maksym Pavlenko
6bccd67e84 Revert shim plugin migration
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-12-02 10:35:15 -08:00
Derek McGowan
665877a5bf
Move volume images from gcr to ghcr
With the ghcr images now built and working, switch over to
use these new images and update the default name.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-12-02 10:29:44 -08:00
Derek McGowan
2190192b54
Merge pull request #6317 from gabriel-samfira/add-github-packages-login
Authenticate against ghcr.io
2021-12-02 09:17:37 -08:00
Gabriel Adrian Samfira
323a62d7b9
Add permissions
Limit the scope of GITHUB_TOKEN to only have write access to packages
and read access to metadata. By default it seems to be granted access
equal to that of the github.actor that triggered the workflow, which
may include access to more than the workflow needs.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
2021-12-02 18:28:51 +02:00
Phil Estes
16c233b6d7
Merge pull request #6306 from thaJeztah/update_oci_getdevices
oci/deviceFromPath(): correctly check device types
2021-12-02 10:51:43 -05:00
Gabriel Adrian Samfira
c6d26f0d37
Authenticate against ghcr.io
This change adds a login step that authenticates the runner to
ghcr.io. This allows whomever triggers the action to use github
packages as a destination for the container images.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
2021-12-02 17:41:54 +02:00
Akihiro Suda
30d8dccd3d
Merge pull request #6315 from dcantah/skip-multilayertest-windows
Skip TestExportAndImportMultiLayer on Windows
2021-12-02 21:13:54 +09:00
Daniel Canter
2a6857d060 Skip TestExportAndImportMultiLayer on Windows
This change skips the TestExportAndImportMultiLayer in integration/client
for the time being. It seems the image was updated recently and no longer
has a Windows entry in the manifest so the test will always fail. This should
be reverted when we figure out what happened to the image, but this is to
unblock PRs for the time being.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2021-12-01 16:58:52 -08:00
Sebastiaan van Stijn
94462d8f5d
oci/deviceFromPath(): correctly check device types
This ports the changes of 95a59bf206
to this repository.

From that PR:

    (mode&S_IFCHR == S_IFCHR) is the wrong way of checking the type of an
    inode because the S_IF* bits are actually not a bitmask and instead must
    be checked using S_IF*. This bug was neatly hidden behind a (major == 0)
    sanity-check but that was removed by [1].

    In addition, add a test that makes sure that HostDevices() doesn't give
    rubbish results -- because we broke this and fixed this before[2].

    [1]: 24388be71e ("configs: use different types for .Devices and .Resources.Devices")
    [2]: 3ed492ad33 ("Handle non-devices correctly in DeviceFromPath")

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-12-01 13:21:34 +01:00
Derek McGowan
591d7097e7
Merge pull request #6290 from gabriel-samfira/add-test-image-build-action
Integration: Add image build workflow
2021-11-30 13:51:24 -08:00
Maksym Pavlenko
f419d4a0ac
Merge pull request #6286 from aznashwan/windows-integration-separate-trigger
Integration: Separate Windows Periodic Tests workflow trigger.
2021-11-30 12:41:04 -08:00
Phil Estes
3d1c85d954
Merge pull request #6274 from gabriel-samfira/build-image-on-windows
Build volume test images on Windows
2021-11-30 09:49:08 -05:00
Phil Estes
2a36dcdda3
Merge pull request #6297 from adisky/patch-2
Add VMware TKG & TCE to Containerd adopters
2021-11-30 09:45:21 -05:00
Aditi Sharma
7a4415dd57 Add VMware TKG & TCE to Containerd adopters
Signed-off-by: Aditi Sharma <adi.sky17@gmail.com>
2021-11-30 12:29:19 +05:30
Derek McGowan
8757b92c76
Merge pull request #6293 from AkihiroSuda/fedora35
Vagrantfile: update to Fedora 35
2021-11-29 09:28:16 -08:00
Mike Brown
1fe214c22a
Merge pull request #6269 from estesp/test-ci-readme
Update README.md repo->org
2021-11-29 08:42:29 -06:00
Akihiro Suda
46892d3408
Vagrantfile: update to Fedora 35
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-11-29 16:13:32 +09:00
Akihiro Suda
2877865a94
Merge pull request #6278 from mxpv/resolve
Fix executable file not found when restoring shims
2021-11-29 13:33:12 +09:00
Maksym Pavlenko
9e7910ebdc
Merge pull request #6271 from fuweid/move_stdout_to_stderr
ctr/snapshots/diff: show media-type in stderr
2021-11-28 11:29:21 -08:00
Maksym Pavlenko
0d720ff9c9
Merge pull request #6289 from ManaSugi/add-ctr-caps
ctr: Add Linux Capabilities control flags
2021-11-28 11:26:50 -08:00
Maksym Pavlenko
7cfccdbad6
Merge pull request #6270 from fuweid/enhance_test_case
integration: add stats result in error message
2021-11-28 11:23:37 -08:00
Wei Fu
8de1117c99 integration: add stats result in error message
```
// from  https://github.com/containerd/containerd/pull/6150#issuecomment-974747473

container_stats_test.go:364:
        	Error Trace:	container_stats_test.go:364
        	Error:      	Received unexpected error:
        	            	unexpected stats length
        	            	github.com/containerd/containerd/integration.TestContainerListStatsWithIdSandboxIdFilter.func4
        	            		/home/runner/work/containerd/containerd/integration/container_stats_test.go:371
        	            	github.com/containerd/containerd/integration.Eventually
        	            		/home/runner/work/containerd/containerd/integration/main_test.go:324
        	            	github.com/containerd/containerd/integration.TestContainerListStatsWithIdSandboxIdFilter
        	            		/home/runner/work/containerd/containerd/integration/container_stats_test.go:364
        	            	testing.tRunner
        	            		/opt/hostedtoolcache/go/1.17.3/x64/src/testing/testing.go:1259
        	            	runtime.goexit
        	            		/opt/hostedtoolcache/go/1.17.3/x64/src/runtime/asm_amd64.s:1581
        	Test:       	TestContainerListStatsWithIdSandboxIdFilter
```

Add stats result for the purpose of debug.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2021-11-28 16:57:40 +08:00
Wei Fu
6681cc4b94 ctr/snapshots/diff: don't show the media-type in output
By default, diff subcommand will print tar(.gz) on stdout. If we print
the media-type in stdout, the output will create invalid tar(.gz) data.

```
// before
➜  containerd git:(move_stdout_to_stderr) sudo ctr snapshot diff sha256:9f54eef412758095c8079ac465d494a2872e02e90bf1fb5f12a1641c0d1bb78b > /tmp/1.tar
➜  containerd git:(move_stdout_to_stderr) file /tmp/1.tar
/tmp/1.tar: data

// after change
➜  containerd git:(move_stdout_to_stderr) make bin/ctr
+ bin/ctr
➜  containerd git:(move_stdout_to_stderr) sudo bin/ctr snapshot diff sha256:9f54eef412758095c8079ac465d494a2872e02e90bf1fb5f12a1641c0d1bb78b > /tmp/2.tar

➜  containerd git:(move_stdout_to_stderr) file /tmp/2.tar
/tmp/2.tar: gzip compressed data, original size modulo 2^32 75155456
```

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2021-11-28 10:38:42 +08:00
Gabriel Adrian Samfira
1698d061c3 Build volume test images on Windows
* Adds Windows dockerfile for volume-ownership image
  * Build volume-copy-up on Windows
  * Adds a helper tool that fetches the owner username and SID of
a file or folder
  * Adds README
  * Remove 2004 from Windows versions
  * Add ltsc2022 to Windows versions

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
2021-11-25 09:54:35 +00:00
Gabriel Adrian Samfira
7ccd733d25 Add image build workflow
This change adds a new workflow that builds the volume test images
and pushes them to a remote registry.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
2021-11-25 09:26:17 +00:00
Manabu Sugimoto
95b3ab2a4a ctr: Add Linux Capabilities control flags
This allows Linux Capabilities to be modified via `ctr`.

e.g.
```
$ sudo ./bin/ctr run --cap-add "CAP_SYS_ADMIN" --cap-drop "CAP_NET_RAW" \
--rm docker.io/library/busybox:latest foo cat /proc/self/status | grep Cap
CapInh: 00000000a82405fb
CapPrm: 00000000a82405fb
CapEff: 00000000a82405fb
CapBnd: 00000000a82405fb
CapAmb: 0000000000000000
```

Signed-off-by: Manabu Sugimoto <Manabu.Sugimoto@sony.com>
2021-11-25 14:50:43 +09:00
Akihiro Suda
ff1a105d7f
Merge pull request #6287 from samuelkarp/1.4-extended-docs
releases: mark 1.4 as Extended
2021-11-25 07:20:25 +09:00
Samuel Karp
3d318b3bb4
docs: mark 1.4 as Extended
Signed-off-by: Samuel Karp <skarp@amazon.com>
2021-11-24 10:19:26 -08:00
Samuel Karp
9a994877cc
docs: fix RELEASES.md gRPC API anchor
Signed-off-by: Samuel Karp <skarp@amazon.com>
2021-11-24 10:19:26 -08:00
Nashwan Azhari
0a25bc1aac Integration: Separate Windows Periodic Tests workflow trigger.
Following PR #6284, the Windows Periodic Workflow is prevented from
running on any repository outside of the original.

While this achieves the goal of preventing senseless Windows workflow
failures in contributors' forks, it makes running the workflow for
contributors (even manually) impossible.

This PR adds a separate workflow file which triggers the Windows
Integration workflow iff it is being run off of the original repository,
thus maintaining the upstream scheduling, while allowing contributors to
manually trigger the workflow on their forks if they so desire.

Signed-off-by: Nashwan Azhari <nazhari@cloudbasesolutions.com>
2021-11-24 18:18:14 +02:00
Phil Estes
0a284fcdbc
Merge pull request #6284 from jonyhy96/feat-ci-skip-fork
feat: skip ci for fork
2021-11-23 23:20:37 -05:00
haoyun
507bfc91ba feat: skip ci for fork
Signed-off-by: haoyun <yun.hao@daocloud.io>
2021-11-24 10:24:13 +08:00
Maksym Pavlenko
cf6f19cea0
Merge pull request #6280 from wzshiming/fix/close-with-seek-fail
content/local: Close the file if Seek fails
2021-11-23 12:38:17 -08:00
Phil Estes
72384a6531
Merge pull request #6268 from aznashwan/windows-ci-autodetect-az-cli
Integration: Remove explicit version passing to `azure/CLI`.
2021-11-23 12:44:35 -05:00
Shiming Zhang
9dfbcbbc48 content/local: Close the file if Seek fails
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
2021-11-23 16:18:13 +08:00
Maksym Pavlenko
5015130f7a Fix executable file not found when restoring shims
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-11-22 17:46:03 -08:00
Phil Estes
51e60404ae
Merge pull request #6276 from sachaos/feature/fix-wrong-document-about-make-install-deps
Fix wrong make target on documentation
2021-11-22 16:50:07 -05:00
Takumasa Sakao
2b28dd363b Fix wrong make target on documentation
Signed-off-by: Takumasa Sakao <sakataku7@gmail.com>
2021-11-23 03:42:08 +09:00
Nashwan Azhari
cb1359fa8b Integration: Remove explicit version passing to azure/CLI.
In the Windows CI's periodic runs the `azure/CLI` GitHub action library
is leveraged to run various Azure-related commands.

To avoid possible desyncing between the auth libraries of `azure/Login`
and `azure/CLI` as described
[here](https://github.com/Azure/cli/issues/56#issuecomment-958705517),
this patch neglects to pass an explicit `azcliversion` to `azure/CLI` in
order to have it default to the Azure CLI version set up by `azure/Login`.

Signed-off-by: Nashwan Azhari <nazhari@cloudbasesolutions.com>
2021-11-22 20:15:36 +02:00
Fu Wei
b6b8facf15
Merge pull request #6272 from jonyhy96/fix-error-return 2021-11-22 17:35:56 +08:00
haoyun
fa6759ae53 fix: server error return
Signed-off-by: haoyun <yun.hao@daocloud.io>
2021-11-22 13:54:53 +08:00
Derek McGowan
1a88cf5242
Merge pull request #6267 from dmcgowan/prepare-v1.6.0-beta.3
Prepare release notes for v1.6.0-beta.3
2021-11-19 09:41:32 -08:00