diff --git a/docs/testing.md b/docs/testing.md index 2f7ad09c7..7240f3f5c 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -2,10 +2,9 @@ CRI-Containerd Testing Guide ============================ This document assumes you have already setup the development environment (go, git, `cri-containerd` repo etc.). -Before sending pull requests you should at least make sure your changes have passed code verification, unit and CRI validation tests. +Before sending pull requests you should at least make sure your changes have passed code verification, unit, integration and CRI validation tests. ## Code Verification Code verification includes lint, code formatting, boilerplate check etc. - * Install tools used by code verification: ```shell make install.tools @@ -16,9 +15,16 @@ make verify ``` ## Unit Test Run all unit tests in `cri-containerd` repo. -``` +```shell make test ``` +## Integration Test +Run all integration tests in `cri-containerd` repo. +* [Install dependencies](../README.md#install-dependencies). +* Run integration test: +```shell +make test-integration +``` ## CRI Validation Test [CRI validation test](https://github.com/kubernetes/community/blob/master/contributors/devel/cri-validation.md) is a test framework for validating that a Container Runtime Interface (CRI) implementation such as `cri-containerd` meets all the requirements necessary to manage pod sandboxes, containers, images etc. @@ -39,28 +45,14 @@ make test-cri FOCUS=REGEXP_TO_FOCUS SKIP=REGEXP_TO_SKIP [More information](https://github.com/kubernetes-incubator/cri-tools) about CRI validation test. ## Node E2E Test [Node e2e test](https://github.com/kubernetes/community/blob/master/contributors/devel/e2e-node-tests.md) is a test framework testing Kubernetes node level functionalities such as managing pods, mounting volumes etc. It starts a local cluster with Kubelet and a few other minimum dependencies, and runs node functionality tests against the local cluster. - -* Setup Kubernetes development environment following [Kubernetes Development Guide](https://github.com/kubernetes/community/blob/master/contributors/devel/development.md). * [Install dependencies](../README.md#install-dependencies). -* Build and install `cri-containerd`: +* Run node e2e test: ```shell -make -sudo make install +make test-e2e-node ``` -* Start `containerd` in 1st terminal: +* Focus or skip specific node e2e test: ```shell -sudo containerd -``` -* Start `cri-containerd` in 2nd terminal: -```shell -sudo cri-containerd -v 2 --alsologtostderr +make test-e2e-node FOCUS=REGEXP_TO_FOCUS SKIP=REGEXP_TO_SKIP ``` -* Run node e2e test **from Kubernetes project directory** in 3rd terminal: -```shell -make test-e2e-node RUNTIME=remote CONTAINER_RUNTIME_ENDPOINT=/var/run/cri-containerd.sock -``` -*Note that `cri-containerd` is still in alpha, it can only pass part of node e2e tests now.* - - [More information](https://github.com/kubernetes/community/blob/master/contributors/devel/e2e-node-tests.md) about Kubernetes node e2e test.