summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com>2017-12-01 13:44:21 -0800
committerGitHub <noreply@github.com>2017-12-01 13:44:21 -0800
commit6bb954eacf76082896da9bda6ea3ccfc7d02d881 (patch)
treebc237bcb0207dbbc56609161186a8e4e1134f601
parent53862b19df50d7e6b475849e974e883dfa5b5881 (diff)
parent9716567964c90d9da0045dc96f2d3b5761ba0c1c (diff)
Merge pull request #1268 from yuexiao-wang/fix-multicluster
Automatic merge from submit-queue. Fix #1263: bad reference for push-federation-images in e2e-test Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn> Fix #1263 1. According to https://github.com/kubernetes/kubernetes/pull/42140, "build/push-federation-images.sh" shoud be "federation/develop/push-federation-images.sh" 2. " cluster/log-dump.sh" should be "federation/cluster/log-dump.sh"
-rw-r--r--contributors/devel/e2e-tests.md8
1 files changed, 3 insertions, 5 deletions
diff --git a/contributors/devel/e2e-tests.md b/contributors/devel/e2e-tests.md
index 96e35b07..1ee22022 100644
--- a/contributors/devel/e2e-tests.md
+++ b/contributors/devel/e2e-tests.md
@@ -1,7 +1,5 @@
# End-to-End Testing in Kubernetes
-Updated: 5/3/2016
-
**Table of Contents**
- [End-to-End Testing in Kubernetes](#end-to-end-testing-in-kubernetes)
@@ -336,7 +334,7 @@ Next, specify the docker repository where your ci images will be pushed.
* Push the federation container images
```sh
- $ build/push-federation-images.sh
+ $ federation/develop/push-federation-images.sh
```
#### Deploy federation control plane
@@ -387,8 +385,8 @@ to gather logs.
This script requires that the cluster provider supports ssh. Assuming it does,
running:
-```
-cluster/log-dump.sh <directory>
+```sh
+$ federation/cluster/log-dump.sh <directory>
```
will ssh to the master and all nodes and download a variety of useful logs to