Skip to content

Update containerd test based on new bootstrapping logic. #7739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
Apr 17, 2018
Merged

Update containerd test based on new bootstrapping logic. #7739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jobs/env/ci-containerd-e2e-gce.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### job-env
# Envs for containerd.
LOG_DUMP_SYSTEMD_SERVICES=containerd containerd-installation containerd-monitor
KUBE_MASTER_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/master.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/test/configure.sh,pkg-prefix=/workspace/github.com/containerd/cri/test/containerd/pkg-prefix,deploy-path=/workspace/github.com/containerd/cri/test/containerd/deploy-path
KUBE_NODE_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/node.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/test/configure.sh,pkg-prefix=/workspace/github.com/containerd/cri/test/containerd/pkg-prefix,deploy-path=/workspace/github.com/containerd/cri/test/containerd/deploy-path
KUBE_MASTER_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/master.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/test/configure.sh,containerd-env=/workspace/github.com/containerd/cri/test/containerd/env
KUBE_NODE_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/node.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/test/configure.sh,containerd-env=/workspace/github.com/containerd/cri/test/containerd/env
KUBE_CONTAINER_RUNTIME=remote
KUBE_CONTAINER_RUNTIME_ENDPOINT=/run/containerd/containerd.sock
KUBE_CONTAINER_RUNTIME_NAME=containerd
Expand Down
4 changes: 2 additions & 2 deletions jobs/env/ci-cri-containerd-e2e-gce.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### job-env
# Envs for containerd.
LOG_DUMP_SYSTEMD_SERVICES=containerd containerd-installation containerd-monitor
KUBE_MASTER_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/master.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/test/configure.sh
KUBE_NODE_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/node.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/test/configure.sh
KUBE_MASTER_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/master.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/test/configure.sh,containerd-env=/workspace/github.com/containerd/cri/test/env
KUBE_NODE_EXTRA_METADATA=user-data=/workspace/github.com/containerd/cri/test/e2e/node.yaml,containerd-configure-sh=/workspace/github.com/containerd/cri/test/configure.sh,containerd-env=/workspace/github.com/containerd/cri/test/env
KUBE_CONTAINER_RUNTIME=remote
KUBE_CONTAINER_RUNTIME_ENDPOINT=/run/containerd/containerd.sock
KUBE_CONTAINER_RUNTIME_NAME=containerd
Expand Down