Merge pull request #21622 from pwittrock/nodee2essh

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-23 16:42:42 -08:00
13 changed files with 623 additions and 370 deletions

21
hack/e2e-node-test.sh Executable file
View File

@@ -0,0 +1,21 @@
#!/bin/bash
# Copyright 2016 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Provided for backwards compatibility
sudo -v
ginkgo "$(dirname $0)/../test/e2e_node/" -- --alsologtostderr --v 2 --node-name $(hostname) --build-services=true --start-services=true --stop-services=true
exit $?

View File

@@ -87,6 +87,7 @@ kube::golang::test_targets() {
examples/k8petstore/web-server/src
github.com/onsi/ginkgo/ginkgo
test/e2e/e2e.test
test/e2e_node/e2e_node.test
)
if [ -n "${KUBERNETES_CONTRIB:-}" ]; then
for contrib in "${KUBERNETES_CONTRIB}"; do

View File

@@ -28,6 +28,7 @@ bench-workers
bind-address
bind-pods-burst
bind-pods-qps
build-services
cadvisor-port
cert-dir
certificate-authority
@@ -162,6 +163,7 @@ ir-hawkular
jenkins-host
jenkins-jobs
k8s-build-output
k8s-bin-dir
keep-gogoproto
km-path
kube-api-burst
@@ -323,6 +325,7 @@ scheduler-name
schema-cache-dir
secure-port
serialize-image-pulls
server-start-timeout
service-account-key-file
service-account-lookup
service-account-private-key-file
@@ -344,10 +347,14 @@ skip-generated-rewrite
skip-munges
sort-by
source-file
ssh-env
ssh-keyfile
ssh-options
ssh-user
start-services
static-pods-config
stats-port
stop-services
storage-version
storage-versions
streaming-connection-idle-timeout