github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #23766 from mikebrow/docs-minor-edit-testing-guide 

Automatic merge from submit-queue

minor edits to testing guide

Noted a few small issues going through the getting started testing guide.

Cheers, Mike

Signed-off-by: mikebrow <brownwm@us.ibm.com>
pull/6/head
k8s-merge-robot 2016-04-01 23:17:37 -07:00
parent c927790cc6 23fddb3a08
commit c7af842fac
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/devel/testing.md
View File

@ -32,11 +32,11 @@ Documentation for other releases can be found at
This assumes you already read the [development guide](development.md) to
install go, godeps, and configure your git client.
In order to send pull requests you need to make sure you changes pass
unit and integration tests.
Before sending pull requests you should at least make sure your changes have
passed both unit and integration tests.
Kubernetes only merges pull requests when e2e tests are passing, so it is often
a good idea to make sure these work as well.
Kubernetes only merges pull requests when unit, integration, and e2e tests are
passing, so it is often a good idea to make sure the e2e tests work as well.
## Unit tests
@ -155,13 +155,13 @@ Kubernetes includes a script to help install etcd on your machine.
# Option a) install inside kubernetes root
cd kubernetes
hack/install-etcd.sh # Installs in ./third_party/etcd
echo export PATH="$PATH:$(pwd)/third_party/etcd" >> .profile # Add to PATH
echo export PATH="$PATH:$(pwd)/third_party/etcd" >> ~/.profile # Add to PATH
# Option b) install manually
cd kubernetes
grep -E "image.*etcd" cluster/saltbase/etcd/etcd.manifest # Find version
# Install that version using yum/apt-get/etc
echo export PATH="$PATH:<LOCATION>" >> .profile # Add to PATH
echo export PATH="$PATH:<LOCATION>" >> ~/.profile # Add to PATH
```
### Run integration tests