Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

Conversation

fidencio
Copy link
Member

This will easily allow us to test against the forked and the upstream containerd.

As the tests had changed completely on main, and as the main branch should never ever see the forked containerd, we're doing this only for the CCv0 case.

This will represent whether we will use the forked containerd for the
Confidential Containers use case or not.

This will never land into the main branch, but it's needed here for the
time being.

Signed-off-by: Fabiano Fidêncio <[email protected]>
@fidencio
Copy link
Member Author

/test

@katacontainersbot katacontainersbot added the size/small Small and simple task label Sep 19, 2023
@fidencio fidencio force-pushed the topic/CC-adapt-to-containerd-changes-in-the-kata-repo-versions-file branch from 336ab89 to 5cc79c5 Compare September 19, 2023 12:26
@fidencio
Copy link
Member Author

/test

@stevenhorsman
Copy link
Member

Sorry, I forgot to point out that

readonly cri_containerd_repo=$(get_version "externals.containerd.url")
will also need updating

@fidencio
Copy link
Member Author

Sorry, I forgot to point out that

readonly cri_containerd_repo=$(get_version "externals.containerd.url")

will also need updating

Yeah, I just noticed with the test failing. At least we know the change works, and what will need to be updated.

Let me grow this PR (and the one in the Kata Containers) a little bit so we avoid having to wait for this CI to finish to start doing the other work.

@katacontainersbot katacontainersbot added size/large Task of significant size and removed size/small Small and simple task labels Sep 19, 2023
@fidencio fidencio force-pushed the topic/CC-adapt-to-containerd-changes-in-the-kata-repo-versions-file branch from 64f497f to 2ee9f26 Compare September 19, 2023 13:47
@fidencio
Copy link
Member Author

/test

1 similar comment
@fidencio
Copy link
Member Author

/test

Copy link
Member

@stevenhorsman stevenhorsman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM assuming the tests are passing

fidencio and others added 3 commits September 19, 2023 22:25
The env var that was introduced in the previous commit, will allow us to
install the proper containerd version depending on what our tests will
need.

Depends-on: github.com/kata-containers/kata-containers#7998

Signed-off-by: Fabiano Fidêncio <[email protected]>
To support the v0.12.0 nydus-snapshotter, we need to update the config
files and the commandline to start nydus-snapshotter.

Fixes kata-containers#5770

Signed-off-by: ChengyuZhu6 <[email protected]>
This is needed to workaround the following issue:
kata-containers#5771

dragomball maintainers will help us to get this back in place later on.

Signed-off-by: Fabiano Fidêncio <[email protected]>
(cherry picked from commit 62afa00)
@fidencio fidencio force-pushed the topic/CC-adapt-to-containerd-changes-in-the-kata-repo-versions-file branch from 2ee9f26 to 87c7140 Compare September 19, 2023 20:26
@fidencio
Copy link
Member Author

/test

@fidencio
Copy link
Member Author

None of the changes here should directly impact TDX / SEV / SNP CIs, thus I'm going ahead and merging this one to avoid delaying even more v0.8.0 release.

@fidencio fidencio merged commit 6cf4306 into kata-containers:CCv0 Sep 19, 2023
11 of 14 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
size/large Task of significant size
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants