This repository has been archived by the owner on Mar 9, 2022. It is now read-only.
Remove ctr cri load #1170
Merged
Remove ctr cri load #1170
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AkihiroSuda
approved these changes
Jun 12, 2019
mikebrow
reviewed
Jun 12, 2019
| @@ -23,13 +23,20 @@ CONTAINERD_FLAGS="--log-level=debug " | |||
|
|
|||
| # Use a configuration file for containerd. | |||
| CONTAINERD_CONFIG_FILE=${CONTAINERD_CONFIG_FILE:-""} | |||
| # The containerd root directory. | |||
There was a problem hiding this comment.
Suggest:
CONTAINERD_TEST_SUFFIX=$(CONTAINERD_TEST_SUFFIX:="-test"}
hack/test-utils.sh
Outdated
| @@ -39,10 +46,14 @@ test_setup() { | |||
| echo "containerd is not built" | |||
| exit 1 | |||
| fi | |||
| sudo pkill -x containerd | |||
| set -m | |||
| # Create containerd is a different process group | |||
|
LGTM |
jterry75
approved these changes
Jun 12, 2019
Signed-off-by: Lantao Liu <lantaol@google.com>
Signed-off-by: Lantao Liu <lantaol@google.com>
Signed-off-by: Lantao Liu <lantaol@google.com>
Random-Liu
force-pushed
the
remove-ctr-cri-load
branch
from
c69381f
to
72819d6
Compare
mikebrow
approved these changes
Jun 12, 2019
|
LGTM |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For #909.
Based on our discussion on slack, we think it is fine to remove
ctr cri loadin 1.3./cc @containerd/containerd-maintainers to confirm.
Note that this PR also change test containerd to use
/var/lib/containerd-testroot directory,/run/containerd-teststate directory and/run/containerd-test/containerd.socksocket. This is to avoid conflict with containerd shipped with Docker 18.09.